Package: libspring-2.5-java Version: 2.5.6.SEC01-8 Severity: wishlist Tags: patch
Hi, I just needed support for Portlet API in Spring, so since libportlet-api-2.0-spec-java is available in Debian it should be possible to have this functionality in Spring Debian package. I just prepared a package for some workstations that I administer so maybe the attached debdiff could be useful to you. Regards, -- Miguel Landaeta, miguel at miguel.cc secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/ "Faith means not wanting to know what is true." -- Nietzsche -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-3-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8) Shell: /bin/sh linked to /bin/bash
diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/changelog libspring-2.5-java-2.5.6.SEC01/debian/changelog --- libspring-2.5-java-2.5.6.SEC01/debian/changelog 2010-02-26 14:58:25.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/changelog 2010-04-21 22:46:26.000000000 -0430 @@ -1,3 +1,10 @@ +libspring-2.5-java (2.5.6.SEC01-8.1) unstable; urgency=low + + * Team upload. + * Enable support for Portlet API. (Closes: #XXXXXX). + + -- Miguel Landaeta <[email protected]> Wed, 21 Apr 2010 22:46:21 -0430 + libspring-2.5-java (2.5.6.SEC01-8) unstable; urgency=low * New libspring-webmvc-struts-2.5-java binary package diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/classpath-debian libspring-2.5-java-2.5.6.SEC01/debian/classpath-debian --- libspring-2.5-java-2.5.6.SEC01/debian/classpath-debian 2009-12-12 08:25:19.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/classpath-debian 2010-04-18 19:00:09.000000000 -0430 @@ -47,6 +47,7 @@ usr/share/java/ibatis.jar usr/share/java/glassfish-appserv-jstl.jar usr/share/java/testng.jar +usr/share/java/portlet-api.jar # buildtiger usr/share/tomcat6/lib/catalina.jar diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/control libspring-2.5-java-2.5.6.SEC01/debian/control --- libspring-2.5-java-2.5.6.SEC01/debian/control 2010-02-26 14:58:25.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/control 2010-04-21 22:43:21.000000000 -0430 @@ -13,7 +13,7 @@ libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java, libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java, glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, aspectj (>= 1.6.4), libjasperreports-java, - maven-repo-helper + maven-repo-helper, libportlet-api-2.0-spec-java Standards-Version: 3.8.4 Homepage: http://springframework.org/about Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/ @@ -113,6 +113,17 @@ This package provide spring-webmvc-struts.jar : integrate a Struts application with Spring +Package: libspring-webmvc-portlet-2.5-java +Architecture: all +Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-webmvc-2.5-java, libportlet-api-2.0-spec-java, libcommons-fileupload-java +Description: modular Java/J2EE application framework - Portlet MVC + Spring is a layered Java/J2EE application framework offering a lot of freedom + to Java developers yet providing well documented and easy-to-use solutions for + common practices in the industry. + . + This package provide spring-webmvc-portlet.jar : support development of Portlet + applications with Spring + Package: libspring-test-2.5-java Architecture: all Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-core-2.5-java diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/main.excludes libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/main.excludes --- libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/main.excludes 2010-02-26 14:58:25.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/main.excludes 2010-04-18 19:00:09.000000000 -0430 @@ -20,7 +20,3 @@ org/springframework/web/context/request/Faces* # no Caucho package in Debbian org/springframework/remoting/caucho/** - -# spring-webmvc-portlet -# Portlet RI is not DFSG-free -org/springframework/web/portlet/** diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/mainmock.excludes libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/mainmock.excludes --- libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/mainmock.excludes 2009-08-10 17:45:55.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/mainmock.excludes 1969-12-31 20:00:00.000000000 -0400 @@ -1,3 +0,0 @@ -# spring-webmvc-portlet -# Portlet RI is not DFSG-free -org/springframework/mock/web/portlet/** diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/tiger.excludes libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/tiger.excludes --- libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/tiger.excludes 2009-09-22 18:16:54.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/excludesfiles/tiger.excludes 2010-04-18 19:00:09.000000000 -0430 @@ -10,7 +10,3 @@ # spring-web # JSF RI is not DFSG-free org/springframework/web/jsf/** - -# spring-webmvc-portlet -# Portlet RI is not DFSG-free -org/springframework/web/portlet/** diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/patches/02_read_excludefile_build_xml.diff libspring-2.5-java-2.5.6.SEC01/debian/patches/02_read_excludefile_build_xml.diff --- libspring-2.5-java-2.5.6.SEC01/debian/patches/02_read_excludefile_build_xml.diff 2009-12-12 09:37:20.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/patches/02_read_excludefile_build_xml.diff 2010-04-18 19:00:09.000000000 -0430 @@ -20,14 +20,6 @@ </javac> </target> -@@ -370,6 +372,7 @@ - <classpath refid="all-libs"/> - <classpath location="${junit38.jar}"/> - <classpath location="${target.classes.dir}"/> -+ <excludesfile name="debian/excludesfiles/mainmock.excludes"/> - </javac> - - <!-- Pick up logging config from test directory --> @@ -393,6 +396,7 @@ <classpath refid="all-libs"/> <classpath location="${junit4.jar}"/> diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/patches/14_portlet_api.diff libspring-2.5-java-2.5.6.SEC01/debian/patches/14_portlet_api.diff --- libspring-2.5-java-2.5.6.SEC01/debian/patches/14_portlet_api.diff 1969-12-31 20:00:00.000000000 -0400 +++ libspring-2.5-java-2.5.6.SEC01/debian/patches/14_portlet_api.diff 2010-04-21 22:46:05.000000000 -0430 @@ -0,0 +1,530 @@ +Description: compatibility fixes for Portlet API 2.0 +Author: Miguel Landaeta <[email protected]> +Forwarded: no +diff --git a/mock/org/springframework/mock/web/portlet/MockActionRequest.java b/mock/org/springframework/mock/web/portlet/MockActionRequest.java +index 5ea5cf8..0632daa 100644 +--- a/mock/org/springframework/mock/web/portlet/MockActionRequest.java ++++ b/mock/org/springframework/mock/web/portlet/MockActionRequest.java +@@ -23,6 +23,9 @@ import java.io.InputStream; + import java.io.InputStreamReader; + import java.io.Reader; + import java.io.UnsupportedEncodingException; ++import java.util.Map; ++ ++import javax.servlet.http.Cookie; + + import javax.portlet.ActionRequest; + import javax.portlet.PortalContext; +@@ -128,4 +131,24 @@ public class MockActionRequest extends MockPortletRequest implements ActionReque + return (this.content != null ? content.length : -1); + } + ++ public String getWindowID() { ++ throw new UnsupportedOperationException("getWindowID"); ++ } ++ ++ public Cookie[] getCookies() { ++ throw new UnsupportedOperationException("getCookies"); ++ } ++ ++ public Map getPrivateParameterMap() { ++ throw new UnsupportedOperationException("getPrivateParameterMap"); ++ } ++ ++ public Map getPublicParameterMap() { ++ throw new UnsupportedOperationException("getPublicParameterMap"); ++ } ++ ++ public String getMethod() { ++ throw new UnsupportedOperationException("getMethod"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockActionResponse.java b/mock/org/springframework/mock/web/portlet/MockActionResponse.java +index 58c65df..c08203f 100644 +--- a/mock/org/springframework/mock/web/portlet/MockActionResponse.java ++++ b/mock/org/springframework/mock/web/portlet/MockActionResponse.java +@@ -17,6 +17,7 @@ + package org.springframework.mock.web.portlet; + + import java.io.IOException; ++import java.io.Serializable; + import java.util.Collections; + import java.util.Iterator; + import java.util.Map; +@@ -29,6 +30,8 @@ import javax.portlet.PortletModeException; + import javax.portlet.WindowState; + import javax.portlet.WindowStateException; + ++import javax.xml.namespace.QName; ++ + import org.springframework.core.CollectionFactory; + import org.springframework.util.Assert; + import org.springframework.util.CollectionUtils; +@@ -160,5 +163,25 @@ public class MockActionResponse extends MockPortletResponse implements ActionRes + return Collections.unmodifiableMap(this.renderParameters); + } + ++ public void sendRedirect(String location, String renderUrlParamName) throws IOException { ++ throw new UnsupportedOperationException("sendRedirect"); ++ } ++ ++ public void removePublicRenderParameter(String name) { ++ throw new UnsupportedOperationException("removePublicRenderParameter"); ++ } ++ ++ public void setEvent(QName name, Serializable value) { ++ throw new UnsupportedOperationException("setEvent"); ++ } ++ ++ public void setEvent(String name, Serializable value) { ++ throw new UnsupportedOperationException("setEvent"); ++ } ++ ++ public String getNamespace() { ++ throw new UnsupportedOperationException("getNamespace"); ++ } ++ + + } +diff --git a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java +index 7505eaf..b9b98ea 100644 +--- a/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java ++++ b/mock/org/springframework/mock/web/portlet/MockMultipartActionRequest.java +@@ -64,4 +64,8 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul + return Collections.unmodifiableMap(this.multipartFiles); + } + ++ public String getMethod() { ++ throw new UnsupportedOperationException("getMethod"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java +index a5c0e04..9cdc2ac 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletConfig.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletConfig.java +@@ -21,6 +21,7 @@ import java.util.HashMap; + import java.util.Locale; + import java.util.Properties; + import java.util.ResourceBundle; ++import java.util.Map; + + import javax.portlet.PortletConfig; + import javax.portlet.PortletContext; +@@ -111,4 +112,28 @@ public class MockPortletConfig implements PortletConfig { + return this.initParameters.keys(); + } + ++ public Enumeration getPublicRenderParameterNames() { ++ throw new UnsupportedOperationException("getPublicRenderParameterNames"); ++ } ++ ++ public String getDefaultNamespace() { ++ throw new UnsupportedOperationException("getDefaultNamespace"); ++ } ++ ++ public Enumeration getPublishingEventQNames() { ++ throw new UnsupportedOperationException("getPublishingEventQNames"); ++ } ++ ++ public Enumeration getProcessingEventQNames() { ++ throw new UnsupportedOperationException("getProcessingEventQNames"); ++ } ++ ++ public Enumeration getSupportedLocales() { ++ throw new UnsupportedOperationException("getSupportedLocales"); ++ } ++ ++ public Map getContainerRuntimeOptions() { ++ throw new UnsupportedOperationException("getContainerRuntimeOptions"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletContext.java b/mock/org/springframework/mock/web/portlet/MockPortletContext.java +index b823ad1..75b3c61 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletContext.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletContext.java +@@ -251,4 +251,8 @@ public class MockPortletContext implements PortletContext { + return portletContextName; + } + ++ public Enumeration getContainerRuntimeOptions() { ++ throw new UnsupportedOperationException("getContainerRuntimeOptions"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java +index 8c62d7b..8c66b9b 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletRequest.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletRequest.java +@@ -38,6 +38,8 @@ import javax.portlet.PortletRequest; + import javax.portlet.PortletSession; + import javax.portlet.WindowState; + ++import javax.servlet.http.Cookie; ++ + import org.springframework.util.Assert; + import org.springframework.util.CollectionUtils; + +@@ -468,4 +470,20 @@ public class MockPortletRequest implements PortletRequest { + return serverPort; + } + ++ public String getWindowID() { ++ throw new UnsupportedOperationException("getWindowID"); ++ } ++ ++ public Cookie[] getCookies() { ++ throw new UnsupportedOperationException("getCookies"); ++ } ++ ++ public Map getPrivateParameterMap() { ++ throw new UnsupportedOperationException("getPrivateParameterMap"); ++ } ++ ++ public Map getPublicParameterMap() { ++ throw new UnsupportedOperationException("getPublicParameterMap"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java +index 071206f..cc57d60 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java +@@ -22,6 +22,8 @@ import javax.portlet.PortletException; + import javax.portlet.PortletRequestDispatcher; + import javax.portlet.RenderRequest; + import javax.portlet.RenderResponse; ++import javax.portlet.PortletRequest; ++import javax.portlet.PortletResponse; + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; +@@ -64,4 +66,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher { + } + } + ++ public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException { ++ throw new UnsupportedOperationException("forward"); ++ } ++ ++ public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException { ++ throw new UnsupportedOperationException("include"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java +index d047c05..834892c 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletResponse.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletResponse.java +@@ -23,6 +23,11 @@ import java.util.Set; + import javax.portlet.PortalContext; + import javax.portlet.PortletResponse; + ++import javax.servlet.http.Cookie; ++ ++import org.w3c.dom.Element; ++import org.w3c.dom.DOMException; ++ + import org.springframework.util.Assert; + + /** +@@ -107,4 +112,20 @@ public class MockPortletResponse implements PortletResponse { + return path; + } + ++ public Element createElement(String tagName) throws DOMException { ++ throw new UnsupportedOperationException("createElement"); ++ } ++ ++ public void addProperty(String key, Element element) { ++ throw new UnsupportedOperationException("addProperty"); ++ } ++ ++ public void addProperty(Cookie cookie) { ++ throw new UnsupportedOperationException("addProperty"); ++ } ++ ++ public String getNamespace() { ++ throw new UnsupportedOperationException("getNamespace"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletSession.java b/mock/org/springframework/mock/web/portlet/MockPortletSession.java +index 6888af2..31508cc 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletSession.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletSession.java +@@ -18,6 +18,7 @@ package org.springframework.mock.web.portlet; + + import java.util.Enumeration; + import java.util.Hashtable; ++import java.util.Map; + + import javax.portlet.PortletContext; + import javax.portlet.PortletSession; +@@ -186,4 +187,12 @@ public class MockPortletSession implements PortletSession { + return portletContext; + } + ++ public Map getAttributeMap() { ++ throw new UnsupportedOperationException("getAttributeMap"); ++ } ++ ++ public Map getAttributeMap(int scope) { ++ throw new UnsupportedOperationException("getAttributeMap"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockPortletURL.java b/mock/org/springframework/mock/web/portlet/MockPortletURL.java +index 2e60b5f..20caefc 100644 +--- a/mock/org/springframework/mock/web/portlet/MockPortletURL.java ++++ b/mock/org/springframework/mock/web/portlet/MockPortletURL.java +@@ -17,6 +17,8 @@ + package org.springframework.mock.web.portlet; + + import java.io.UnsupportedEncodingException; ++import java.io.IOException; ++import java.io.Writer; + import java.net.URLEncoder; + import java.util.Collections; + import java.util.Iterator; +@@ -190,4 +192,32 @@ public class MockPortletURL implements PortletURL { + } + } + ++ public PortletMode getPortletMode() { ++ throw new UnsupportedOperationException("getPortletMode"); ++ } ++ ++ public WindowState getWindowState() { ++ throw new UnsupportedOperationException("getWindowState"); ++ } ++ ++ public void removePublicRenderParameter(String name) { ++ throw new UnsupportedOperationException("removePublicRenderParameter"); ++ } ++ ++ public void setProperty(String key, String value) { ++ throw new UnsupportedOperationException("setProperty"); ++ } ++ ++ public void addProperty(String key, String value) { ++ throw new UnsupportedOperationException("addProperty"); ++ } ++ ++ public void write(Writer out) throws IOException { ++ throw new UnsupportedOperationException("write"); ++ } ++ ++ public void write(Writer out, boolean escapeXML) throws IOException { ++ throw new UnsupportedOperationException("write"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java +index 5bb8c54..595a607 100644 +--- a/mock/org/springframework/mock/web/portlet/MockRenderRequest.java ++++ b/mock/org/springframework/mock/web/portlet/MockRenderRequest.java +@@ -67,4 +67,8 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque + super(portalContext, portletContext); + } + ++ public String getETag() { ++ throw new UnsupportedOperationException("getETag"); ++ } ++ + } +diff --git a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java +index c63e9a4..d956196 100644 +--- a/mock/org/springframework/mock/web/portlet/MockRenderResponse.java ++++ b/mock/org/springframework/mock/web/portlet/MockRenderResponse.java +@@ -24,10 +24,13 @@ import java.io.PrintWriter; + import java.io.UnsupportedEncodingException; + import java.io.Writer; + import java.util.Locale; ++import java.util.Collection; + + import javax.portlet.PortalContext; + import javax.portlet.PortletURL; + import javax.portlet.RenderResponse; ++import javax.portlet.CacheControl; ++import javax.portlet.ResourceURL; + + import org.springframework.web.util.WebUtils; + +@@ -213,4 +216,16 @@ public class MockRenderResponse extends MockPortletResponse implements RenderRes + return includedUrl; + } + ++ public void setNextPossiblePortletModes(Collection portletModes) { ++ throw new UnsupportedOperationException("setNextPossiblePortletModes"); ++ } ++ ++ public CacheControl getCacheControl() { ++ throw new UnsupportedOperationException("getCacheControl"); ++ } ++ ++ public ResourceURL createResourceURL() { ++ throw new UnsupportedOperationException("createResourceURL"); ++ } ++ + } +diff --git a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java +index 323ff7e..e045cb7 100644 +--- a/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java ++++ b/src/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java +@@ -20,6 +20,7 @@ import java.util.Collections; + import java.util.Enumeration; + import java.util.Locale; + import java.util.ResourceBundle; ++import java.util.Map; + + import javax.portlet.Portlet; + import javax.portlet.PortletConfig; +@@ -162,6 +163,30 @@ public class SimplePortletPostProcessor + public ResourceBundle getResourceBundle(Locale locale) { + return portletConfig == null ? null : portletConfig.getResourceBundle(locale); + } ++ ++ public Map getContainerRuntimeOptions() { ++ throw new UnsupportedOperationException("getContainerRuntimeOptions"); ++ } ++ ++ public Enumeration getSupportedLocales() { ++ throw new UnsupportedOperationException("getSupportedLocales"); ++ } ++ ++ public Enumeration getProcessingEventQNames() { ++ throw new UnsupportedOperationException("getProcessingEventQNames"); ++ } ++ ++ public Enumeration getPublishingEventQNames() { ++ throw new UnsupportedOperationException("getPublishingEventQNames"); ++ } ++ ++ public String getDefaultNamespace() { ++ throw new UnsupportedOperationException("getDefaultNamespace"); ++ } ++ ++ public Enumeration getPublicRenderParameterNames() { ++ throw new UnsupportedOperationException("getPublicRenderParameterNames"); ++ } + } + + } +diff --git a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java +index a9bc271..ed0378e 100644 +--- a/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java ++++ b/src/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java +@@ -26,6 +26,8 @@ import java.util.Set; + + import javax.portlet.ActionRequest; + ++import javax.servlet.http.Cookie; ++ + import org.springframework.web.multipart.MultipartFile; + import org.springframework.web.portlet.util.ActionRequestWrapper; + +@@ -161,4 +163,12 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen + throw new IllegalStateException("Multipart request not initialized"); + } + ++ public String getMethod() { ++ throw new UnsupportedOperationException("getMethod"); ++ } ++ ++ public Cookie[] getCookies() { ++ throw new UnsupportedOperationException("getCookies"); ++ } ++ + } +diff --git a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java +index 470bdfb..b0bb33a 100644 +--- a/src/org/springframework/web/portlet/mvc/PortletWrappingController.java ++++ b/src/org/springframework/web/portlet/mvc/PortletWrappingController.java +@@ -20,6 +20,7 @@ import java.util.Enumeration; + import java.util.Locale; + import java.util.Properties; + import java.util.ResourceBundle; ++import java.util.Map; + + import javax.portlet.ActionRequest; + import javax.portlet.ActionResponse; +@@ -203,6 +204,29 @@ public class PortletWrappingController extends AbstractController + return (portletConfig != null ? portletConfig.getResourceBundle(locale) : null); + } + ++ public Map getContainerRuntimeOptions() { ++ throw new UnsupportedOperationException("getContainerRuntimeOptions"); ++ } ++ ++ public Enumeration getSupportedLocales() { ++ throw new UnsupportedOperationException("getSupportedLocales"); ++ } ++ ++ public Enumeration getProcessingEventQNames() { ++ throw new UnsupportedOperationException("getProcessingEventQNames"); ++ } ++ ++ public Enumeration getPublishingEventQNames() { ++ throw new UnsupportedOperationException("getPublishingEventQNames"); ++ } ++ ++ public String getDefaultNamespace() { ++ throw new UnsupportedOperationException("getDefaultNamespace"); ++ } ++ ++ public Enumeration getPublicRenderParameterNames() { ++ throw new UnsupportedOperationException("getPublicRenderParameterNames"); ++ } + } + + } +diff --git a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java +index 3993af1..74f92f7 100644 +--- a/src/org/springframework/web/portlet/util/ActionRequestWrapper.java ++++ b/src/org/springframework/web/portlet/util/ActionRequestWrapper.java +@@ -75,4 +75,8 @@ public class ActionRequestWrapper extends PortletRequestWrapper implements Actio + return this.actionRequest.getContentLength(); + } + ++ public String getMethod() { ++ throw new UnsupportedOperationException("getMethod"); ++ } ++ + } +diff --git a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java +index 9c65318..1694992 100644 +--- a/src/org/springframework/web/portlet/util/PortletRequestWrapper.java ++++ b/src/org/springframework/web/portlet/util/PortletRequestWrapper.java +@@ -30,6 +30,8 @@ import javax.portlet.WindowState; + + import org.springframework.util.Assert; + ++import javax.servlet.http.Cookie; ++ + /** + * Simple wrapper for a {...@link javax.portlet.PortletRequest}, delegating all + * calls to the underlying request. +@@ -194,4 +196,20 @@ public class PortletRequestWrapper implements PortletRequest { + return this.portletRequest.getServerPort(); + } + ++ public Map getPublicParameterMap() { ++ throw new UnsupportedOperationException("getPublicParameterMap"); ++ } ++ ++ public Map getPrivateParameterMap() { ++ throw new UnsupportedOperationException("getPrivateParameterMap"); ++ } ++ ++ public Cookie[] getCookies() { ++ throw new UnsupportedOperationException("getCookies"); ++ } ++ ++ public String getWindowID() { ++ throw new UnsupportedOperationException("getWindowID"); ++ } ++ + } diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/patches/series libspring-2.5-java-2.5.6.SEC01/debian/patches/series --- libspring-2.5-java-2.5.6.SEC01/debian/patches/series 2010-02-26 14:58:25.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/patches/series 2010-04-18 21:13:55.000000000 -0430 @@ -10,3 +10,4 @@ 11_servlet_jsp_api.diff 12_aspectj_164.diff 13_tiles_22.diff +14_portlet_api.diff diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/poms/spring-webmvc-portlet-2.5.xml libspring-2.5-java-2.5.6.SEC01/debian/poms/spring-webmvc-portlet-2.5.xml --- libspring-2.5-java-2.5.6.SEC01/debian/poms/spring-webmvc-portlet-2.5.xml 1969-12-31 20:00:00.000000000 -0400 +++ libspring-2.5-java-2.5.6.SEC01/debian/poms/spring-webmvc-portlet-2.5.xml 2010-04-21 22:22:06.000000000 -0430 @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<project + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc-portlet</artifactId> + <packaging>jar</packaging> + <name>Spring Framework: Web MVC Portlet</name> + <version>2.5.6.SEC01</version> + <description>Spring Framework: Web MVC Portlet</description> + <url>http://www.springframework.org</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection> + <developerConnection>scm:cvs:ext:[email protected]:/cvsroot/springframework:spring</developerConnection> + <url>http://springframework.cvs.sourceforge.net/springframework/</url> + </scm> + <organization> + <name>Spring Framework</name> + <url>http://www.springframework.org/</url> + </organization> + <dependencies> +<!-- External Dependencies --> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> +<!-- Spring Dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>spring-beans</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>spring-context</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>spring-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>spring-web</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>local</id> + <name>Spring Release Repository</name> + <url>file:///Users/benhale/brm/repos/repo</url> + </repository> + <snapshotRepository> + <id>spring-snapshot</id> + <name>Spring Snapshot Repository</name> + <url>s3://maven.springframework.org/snapshot</url> + </snapshotRepository> + </distributionManagement> +</project> diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/README.Debian libspring-2.5-java-2.5.6.SEC01/debian/README.Debian --- libspring-2.5-java-2.5.6.SEC01/debian/README.Debian 2010-02-26 14:58:25.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/README.Debian 2010-04-18 19:00:09.000000000 -0430 @@ -36,14 +36,6 @@ [not-in-debian] no Caucho package in Debbian org/springframework/remoting/caucho/** -* spring-webmvc-portlet - [non-free] Portlet RI is not DFSG-free - org/springframework/web/portlet/** - -* spring-test - [non-free] Portlet RI is not DFSG-free - org/springframework/mock/web/portlet/** - * spring-tx [non-free] IBM Websphere is non-free org/springframework/transaction/jta/WebSphereUowTransactionManager.java diff -Nru libspring-2.5-java-2.5.6.SEC01/debian/rules libspring-2.5-java-2.5.6.SEC01/debian/rules --- libspring-2.5-java-2.5.6.SEC01/debian/rules 2010-02-26 14:58:25.000000000 -0430 +++ libspring-2.5-java-2.5.6.SEC01/debian/rules 2010-04-18 21:38:49.000000000 -0430 @@ -7,7 +7,7 @@ MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content MODULES = aop beans context context-support core jdbc jms orm test tx web webmvc \ - webmvc-struts + webmvc-struts webmvc-portlet JAVA_HOME := /usr/lib/jvm/default-java ANT := CLASSPATH=/usr/share/java/jarjar.jar JAVA_HOME=$(JAVA_HOME) ant
