Attachment 587439 Details for Bug 826102 – Add portlet-2.0-api support

[patch] Add portlet-2.0-api support

0001-Add-portlet-2.0-api-support-required-by-springframew.patch (text/plain), 5.51 KB, created by gil cattaneo on 2012-05-29 15:33:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-29 15:33:34 UTC

Size: 5.51 KB

patch

obsolete

>From 0808c79d78b7e18fe833ca76c8c05d0e5e783a99 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 29 May 2012 15:30:53 +0200
>Subject: [PATCH] Add portlet-2.0-api support (required by springframework)
>
>---
> apache-commons-fileupload-1.2.2-portlet20.patch |   63 +++++++++++++++++++++++
> apache-commons-fileupload.spec                  |   27 +++++++---
> 2 files changed, 81 insertions(+), 9 deletions(-)
> create mode 100644 apache-commons-fileupload-1.2.2-portlet20.patch
>
>diff --git a/apache-commons-fileupload-1.2.2-portlet20.patch b/apache-commons-fileupload-1.2.2-portlet20.patch
>new file mode 100644
>index 0000000..20d660b
>--- /dev/null
>+++ b/apache-commons-fileupload-1.2.2-portlet20.patch
>@@ -0,0 +1,63 @@
>+diff -Nru src/test/org/apache/commons/fileupload/MockPortletRequest.java src/test/org/apache/commons/fileupload-gil/MockPortletRequest.java
>+--- src/test/org/apache/commons/fileupload/MockPortletRequest.java	2010-07-14 23:28:52.000000000 +0200
>++++ src/test/org/apache/commons/fileupload-gil/MockPortletRequest.java	2012-05-29 15:17:56.000000000 +0200
>+@@ -27,6 +27,7 @@
>+ import javax.portlet.PortletRequest;
>+ import javax.portlet.PortletSession;
>+ import javax.portlet.WindowState;
>++import javax.servlet.http.Cookie;
>+ 
>+ /**
>+  * A mock portlet request, useful for unit testing and offline utilities
>+@@ -313,4 +314,24 @@
>+         return null;
>+     }
>+     
>++    public Map<String, String[]> getPublicParameterMap() {
>++        // TODO
>++        throw new UnsupportedOperationException("Not supported.");
>++    }
>++
>++    public Map<String, String[]> getPrivateParameterMap() {
>++        // TODO
>++        throw new UnsupportedOperationException("Not supported.");
>++    }
>++    
>++    public Cookie[] getCookies() {
>++        // TODO
>++        throw new UnsupportedOperationException("Not supported.");
>++    }
>++
>++    public String getWindowID() {
>++        // TODO
>++        throw new UnsupportedOperationException("Not supported.");
>++    }
>++    
>+ }
>+diff -Nru src/test/org/apache/commons/fileupload/MockPortletSession.java src/test/org/apache/commons/fileupload-gil/MockPortletSession.java
>+--- src/test/org/apache/commons/fileupload/MockPortletSession.java	2010-07-14 23:28:52.000000000 +0200
>++++ src/test/org/apache/commons/fileupload-gil/MockPortletSession.java	2012-05-29 15:07:35.000000000 +0200
>+@@ -18,6 +18,7 @@
>+ 
>+ import java.util.Enumeration;
>+ import java.util.Hashtable;
>++import java.util.Map;
>+ import javax.portlet.PortletContext;
>+ import javax.portlet.PortletSession;
>+ 
>+@@ -168,4 +169,15 @@
>+         // TODO Auto-generated method stub
>+         return null;
>+     }
>++
>++    public Map<String, Object> getAttributeMap(int scope) {
>++        // TODO
>++        throw new UnsupportedOperationException("Not supported.");
>++    }
>++
>++    public Map<String, Object> getAttributeMap() {
>++        // TODO
>++        throw new UnsupportedOperationException("Not supported.");
>++    }
>++
>+ }
>diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec
>index 1ea6ee1..b9c142f 100644
>--- a/apache-commons-fileupload.spec
>+++ b/apache-commons-fileupload.spec
>@@ -3,7 +3,7 @@
> 
> Name:             apache-%{short_name}
> Version:          1.2.2
>-Release:          4%{?dist}
>+Release:          5%{?dist}
> Summary:          This package provides an api to work with html file upload
> License:          ASL 2.0
> Group:            Development/Libraries
>@@ -12,7 +12,9 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
> BuildArch:        noarch
> 
> # Portlets are not in Fedora yet
>-Patch0:           %{name}-remove-portlet.patch
>+#P atch0:           % {name}-remove-portlet.patch
>+
>+Patch1:           %{name}-%{version}-portlet20.patch
> 
> BuildRequires:    java-devel >= 1:1.6.0
> BuildRequires:    junit >= 0:3.8.1
>@@ -31,12 +33,12 @@ BuildRequires:    maven-release-plugin
> BuildRequires:    maven-resources-plugin
> #Should be replaced by maven-surefire-plugin after f15 branch
> BuildRequires:    maven-surefire-maven-plugin
>-
>+BuildRequires:    portlet-2.0-api
> 
> Requires:         java >= 1:1.6.0
> Requires:         jpackage-utils
> Requires:         apache-commons-io
>-
>+Requires:         portlet-2.0-api
> 
> Provides:         jakarta-%{short_name} = 1:%{version}-%{release}
> Obsoletes:        jakarta-%{short_name} < 1:1.2.1-2
>@@ -66,15 +68,19 @@ sed -i 's/\r//' LICENSE.txt
> sed -i 's/\r//' NOTICE.txt
> 
> # Remove portlet stuff
>-%patch0 -p0
>-rm -rf src/java/org/apache/commons/fileupload/portlet
>-rm -f src/test/org/apache/commons/fileupload/*Portlet*
>+#%p atch0 -p0
>+#rm -rf src/java/org/apache/commons/fileupload/portlet
>+#rm -f src/test/org/apache/commons/fileupload/*Portlet*
>+
>+%patch1 -p0
>+# fix gId
>+sed -i "s|<groupId>portlet-api</groupId>|<groupId>javax.portlet</groupId>|" pom.xml
> 
> # -----------------------------------------------------------------------------
> 
> %build
>-mvn-rpmbuild install javadoc:javadoc
>-
>+# fix build with generics support
>+mvn-rpmbuild -Dmaven.compile.source=1.5 -Dmaven.compile.target=1.5 install javadoc:javadoc
> # -----------------------------------------------------------------------------
> 
> %install
>@@ -114,6 +120,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> # -----------------------------------------------------------------------------
> 
> %changelog
>+* Tue May 29 2012 gil cattaneo <puntogil@libero.it> 1.2.2-5
>+- Add portlet-2.0-api support (required by springframework).
>+
> * Fri Mar  2 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> 1.2.2-4
> - Fix build and update to latest guidelines
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 826102: 587439