[pkg-java] r16922 - in trunk/libstruts1.2-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Wed Jun 26 12:26:49 UTC 2013
Author: ebourg-guest
Date: 2013-06-26 12:26:49 +0000 (Wed, 26 Jun 2013)
New Revision: 16922
Added:
trunk/libstruts1.2-java/debian/patches/03_servlet-api-3.0.patch
Modified:
trunk/libstruts1.2-java/debian/ant.properties
trunk/libstruts1.2-java/debian/changelog
trunk/libstruts1.2-java/debian/control
trunk/libstruts1.2-java/debian/copyright
trunk/libstruts1.2-java/debian/libstruts1.2-java.install
trunk/libstruts1.2-java/debian/patches/series
trunk/libstruts1.2-java/debian/rules
Log:
Transition to the Servlet API 3.0 (Closes: #713195)
Removed Michael Koch from the uploaders list (Closes: #654095)
Updated Standards-Version to 3.9.4 (no changes)
Use canonical URLs for the Vcs-* fields
Removed the redundant Priority field declared on the binary package
debian/copyright: Updated to the copyright format 1.0
Modified: trunk/libstruts1.2-java/debian/ant.properties
===================================================================
--- trunk/libstruts1.2-java/debian/ant.properties 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/ant.properties 2013-06-26 12:26:49 UTC (rev 16922)
@@ -1,4 +1,5 @@
-compile.target=1.3
+compile.source=1.5
+compile.target=1.5
commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
commons-digester.jar=/usr/share/java/commons-digester.jar
commons-fileupload.jar=/usr/share/java/commons-fileupload.jar
@@ -7,6 +8,6 @@
jakarta-oro.jar=/usr/share/java/oro.jar
jdbc20ext.jar=/usr/share/java/jdbc2_0-stdext.jar
jsp.jar=/usr/share/java/jsp-api-2.1.jar
-servlet.jar=/usr/share/java/servlet-api-2.5.jar
+servlet.jar=/usr/share/java/servlet-api-3.0.jar
antlr.jar=/usr/share/java/antlr.jar
struts.el.home=contrib/struts-el
Modified: trunk/libstruts1.2-java/debian/changelog
===================================================================
--- trunk/libstruts1.2-java/debian/changelog 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/changelog 2013-06-26 12:26:49 UTC (rev 16922)
@@ -1,3 +1,14 @@
+libstruts1.2-java (1.2.9-6) unstable; urgency=low
+
+ * Transition to the Servlet API 3.0 (Closes: #713195)
+ * Removed Michael Koch from the uploaders list (Closes: #654095)
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * Use canonical URLs for the Vcs-* fields
+ * Removed the redundant Priority field declared on the binary package
+ * debian/copyright: Updated to the copyright format 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 26 Jun 2013 14:25:21 +0200
+
libstruts1.2-java (1.2.9-5) unstable; urgency=low
* Team upload.
Modified: trunk/libstruts1.2-java/debian/control
===================================================================
--- trunk/libstruts1.2-java/debian/control 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/control 2013-06-26 12:26:49 UTC (rev 16922)
@@ -2,17 +2,37 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.8), default-jdk, ant, ant-optional, libxerces2-java, libxalan2-java, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java, antlr
-Standards-Version: 3.9.2
-Homepage: http://struts.apache.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libstruts1.2-java
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant,
+ ant-optional,
+ antlr,
+ cdbs (>= 0.4.8),
+ debhelper (>= 7),
+ default-jdk,
+ libcommons-beanutils-java (>= 1.7.0),
+ libcommons-digester-java (>= 1.7),
+ libcommons-fileupload-java (>= 1.0),
+ libcommons-logging-java,
+ libcommons-validator-java (>= 1.1.4),
+ liboro-java,
+ libservlet3.0-java,
+ libxalan2-java,
+ libxerces2-java
+Standards-Version: 3.9.4
+Homepage: http://struts.apache.org
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libstruts1.2-java
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libstruts1.2-java/
Package: libstruts1.2-java
Architecture: all
-Priority: optional
-Depends: ${misc:Depends}, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java
+Depends: libcommons-beanutils-java (>= 1.7.0),
+ libcommons-digester-java (>= 1.7),
+ libcommons-fileupload-java (>= 1.0),
+ libcommons-logging-java,
+ libcommons-validator-java (>= 1.1.4),
+ liboro-java,
+ libservlet3.0-java,
+ ${misc:Depends}
Description: Java Framework for MVC web applications
The core of the Struts framework is a flexible control layer based on standard
technologies like Servlets, JavaBeans, ResourceBundles, and Extensible
@@ -25,4 +45,4 @@
interact with any standard data access technology, including Enterprise Java
Beans (EJB), JDBC, and Object Relational Bridge. For the View, Struts works
well with JavaServer Pages (JSP), including JSTL and JSF, as well as Velocity
- Templates, XSLT, and other presentation systems.
+ Templates, XSLT, and other presentation systems.
Modified: trunk/libstruts1.2-java/debian/copyright
===================================================================
--- trunk/libstruts1.2-java/debian/copyright 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/copyright 2013-06-26 12:26:49 UTC (rev 16922)
@@ -1,10 +1,10 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: libstruts1.2-java
-Maintainer: http://struts.apache.org/1.x/
-Source: http://www.apache.org/dist/struts/source/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Struts
+Upstream-Contact: Struts Developers <dev at struts.apache.org>
+Source: http://struts.apache.org/development/1.x/
Files: *
-Copyright: 2000-2010, Apache Software Foundation
+Copyright: 2000-2010, The Apache Software Foundation
License: Apache-2.0
On Debian systems the text of the Apache-2.0 license can be found in
/usr/share/common-licenses/Apache-2.0.
Modified: trunk/libstruts1.2-java/debian/libstruts1.2-java.install
===================================================================
--- trunk/libstruts1.2-java/debian/libstruts1.2-java.install 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/libstruts1.2-java.install 2013-06-26 12:26:49 UTC (rev 16922)
@@ -1,4 +1,4 @@
-target/library/struts.jar /usr/share/struts1.2/
target/library/*.dtd /usr/share/struts1.2/
target/library/*.tld /usr/share/struts1.2/
target/library/*.xml /usr/share/struts1.2/
+target/library/struts.jar /usr/share/struts1.2/
Added: trunk/libstruts1.2-java/debian/patches/03_servlet-api-3.0.patch
===================================================================
--- trunk/libstruts1.2-java/debian/patches/03_servlet-api-3.0.patch (rev 0)
+++ trunk/libstruts1.2-java/debian/patches/03_servlet-api-3.0.patch 2013-06-26 12:26:49 UTC (rev 16922)
@@ -0,0 +1,248 @@
+Description: Ensures the compatiblity with the Servlet API 3.0
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
++++ b/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
+@@ -53,7 +53,7 @@
+ * and just after the Action is performed, the request is set back to the original
+ * HttpServletRequest object.
+ */
+-public class MultipartRequestWrapper implements HttpServletRequest {
++public class MultipartRequestWrapper extends javax.servlet.http.HttpServletRequestWrapper {
+
+ /** Logging instance */
+ private static final Log log = LogFactory.getLog(MultipartRequestWrapper.class);
+@@ -69,6 +69,7 @@
+ protected HttpServletRequest request;
+
+ public MultipartRequestWrapper(HttpServletRequest request) {
++ super(request);
+ this.request = request;
+ this.parameters = new HashMap();
+ }
+@@ -141,139 +142,6 @@
+ return request;
+ }
+
+- //WRAPPER IMPLEMENTATIONS OF SERVLET REQUEST METHODS
+- public Object getAttribute(String name) {
+- return request.getAttribute(name);
+- }
+- public Enumeration getAttributeNames() {
+- return request.getAttributeNames();
+- }
+- public String getCharacterEncoding() {
+- return request.getCharacterEncoding();
+- }
+- public int getContentLength() {
+- return request.getContentLength();
+- }
+- public String getContentType() {
+- return request.getContentType();
+- }
+- public ServletInputStream getInputStream() throws IOException {
+- return request.getInputStream();
+- }
+- public String getProtocol() {
+- return request.getProtocol();
+- }
+- public String getScheme() {
+- return request.getScheme();
+- }
+- public String getServerName() {
+- return request.getServerName();
+- }
+- public int getServerPort() {
+- return request.getServerPort();
+- }
+- public BufferedReader getReader() throws IOException {
+- return request.getReader();
+- }
+- public String getRemoteAddr() {
+- return request.getRemoteAddr();
+- }
+- public String getRemoteHost() {
+- return request.getRemoteHost();
+- }
+- public void setAttribute(String name, Object o) {
+- request.setAttribute(name, o);
+- }
+- public void removeAttribute(String name) {
+- request.removeAttribute(name);
+- }
+- public Locale getLocale() {
+- return request.getLocale();
+- }
+- public Enumeration getLocales() {
+- return request.getLocales();
+- }
+- public boolean isSecure() {
+- return request.isSecure();
+- }
+- public RequestDispatcher getRequestDispatcher(String path) {
+- return request.getRequestDispatcher(path);
+- }
+- public String getRealPath(String path) {
+- return request.getRealPath(path);
+- }
+-
+- //WRAPPER IMPLEMENTATIONS OF HTTPSERVLETREQUEST METHODS
+- public String getAuthType() {
+- return request.getAuthType();
+- }
+- public Cookie[] getCookies() {
+- return request.getCookies();
+- }
+- public long getDateHeader(String name) {
+- return request.getDateHeader(name);
+- }
+- public String getHeader(String name) {
+- return request.getHeader(name);
+- }
+- public Enumeration getHeaders(String name) {
+- return request.getHeaders(name);
+- }
+- public Enumeration getHeaderNames() {
+- return request.getHeaderNames();
+- }
+- public int getIntHeader(String name) {
+- return request.getIntHeader(name);
+- }
+- public String getMethod() {
+- return request.getMethod();
+- }
+- public String getPathInfo() {
+- return request.getPathInfo();
+- }
+- public String getPathTranslated() {
+- return request.getPathTranslated();
+- }
+- public String getContextPath() {
+- return request.getContextPath();
+- }
+- public String getQueryString() {
+- return request.getQueryString();
+- }
+- public String getRemoteUser() {
+- return request.getRemoteUser();
+- }
+- public boolean isUserInRole(String user) {
+- return request.isUserInRole(user);
+- }
+- public Principal getUserPrincipal() {
+- return request.getUserPrincipal();
+- }
+- public String getRequestedSessionId() {
+- return request.getRequestedSessionId();
+- }
+- public String getRequestURI() {
+- return request.getRequestURI();
+- }
+- public String getServletPath() {
+- return request.getServletPath();
+- }
+- public HttpSession getSession(boolean create) {
+- return request.getSession(create);
+- }
+- public HttpSession getSession() {
+- return request.getSession();
+- }
+- public boolean isRequestedSessionIdValid() {
+- return request.isRequestedSessionIdValid();
+- }
+- public boolean isRequestedSessionIdFromURL() {
+- return request.isRequestedSessionIdFromURL();
+- }
+- public boolean isRequestedSessionIdFromUrl() {
+- return request.isRequestedSessionIdFromUrl();
+- }
+-
+ //SERVLET 2.3 METHODS
+
+ /**
+@@ -288,85 +156,4 @@
+ }
+ return map;
+ }
+-
+- /**
+- * Use Reflection to invoke Servlet 2.3 <i>setCharacterEncoding</i>
+- * method on the wrapped Request.
+- */
+- public void setCharacterEncoding(String encoding) {
+- invokeRequestMethod("setCharacterEncoding", new Object[] {encoding});
+- }
+-
+- /**
+- * Use Reflection to invoke Servlet 2.3 <i>getRequestURL</i>
+- * method on the wrapped Request.
+- */
+- public StringBuffer getRequestURL() {
+- return (StringBuffer)invokeRequestMethod("getRequestURL", null);
+- }
+-
+- /**
+- * Use Reflection to invoke Servlet 2.3 <i>isRequestedSessionIdFromCookie</i>
+- * method on the wrapped Request.
+- */
+- public boolean isRequestedSessionIdFromCookie() {
+- Object result = invokeRequestMethod("isRequestedSessionIdFromCookie", null);
+- return (result == null) ? false : ((Boolean)result).booleanValue();
+- }
+-
+- //SERVLET 2.4 METHODS
+-
+- /**
+- * Use Reflection to invoke Servlet 2.4 <i>getLocalAddr</i>
+- * method on the wrapped Request.
+- */
+- public String getLocalAddr() {
+- return (String)invokeRequestMethod("getLocalAddr", null);
+- }
+-
+- /**
+- * Use Reflection to invoke Servlet 2.4 <i>getLocalName</i>
+- * method on the wrapped Request.
+- */
+- public String getLocalName() {
+- return (String)invokeRequestMethod("getLocalName", null);
+- }
+-
+- /**
+- * Use Reflection to invoke Servlet 2.4 <i>getLocalPort</i>
+- * method on the wrapped Request.
+- */
+- public int getLocalPort() {
+- Object result = invokeRequestMethod("getLocalPort", null);
+- return (result == null) ? 0 : ((Integer)result).intValue();
+- }
+-
+- /**
+- * Use Reflection to invoke Servlet 2.4 <i>getRemotePort</i>
+- * method on the wrapped Request.
+- */
+- public int getRemotePort() {
+- Object result = invokeRequestMethod("getRemotePort", null);
+- return (result == null) ? 0 : ((Integer)result).intValue();
+- }
+-
+- /**
+- * Convenience method which uses reflection to invoke a method
+- * on the Request.
+- */
+- private Object invokeRequestMethod(String name, Object[] args) {
+- try {
+- return MethodUtils.invokeExactMethod(request, name, args);
+- } catch (NoSuchMethodException e) {
+- if (log.isDebugEnabled()) {
+- log.debug("Method '" +name + "' not defined for javax.servlet.http.HttpServletRequest");
+- }
+- } catch (InvocationTargetException e) {
+- log.error("Error invoking method '" +name + "' ", e.getTargetException());
+- } catch (IllegalAccessException e) {
+- log.error("Error invoking method '" +name + "' ", e);
+- }
+- return null;
+- }
+-
+ }
Modified: trunk/libstruts1.2-java/debian/patches/series
===================================================================
--- trunk/libstruts1.2-java/debian/patches/series 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/patches/series 2013-06-26 12:26:49 UTC (rev 16922)
@@ -1,2 +1,3 @@
01_build_javac_target.patch
02_CVE-2008-2025.patch
+03_servlet-api-3.0.patch
Modified: trunk/libstruts1.2-java/debian/rules
===================================================================
--- trunk/libstruts1.2-java/debian/rules 2013-06-26 10:40:44 UTC (rev 16921)
+++ trunk/libstruts1.2-java/debian/rules 2013-06-26 12:26:49 UTC (rev 16922)
@@ -5,9 +5,8 @@
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_JARS := xercesImpl xml-apis xalan2 $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-apache-regexp.jar
+DEB_JARS := xercesImpl xml-apis xalan2 ant-launcher ant-trax ant-apache-regexp
DEB_INSTALL_DIRS_libstruts1.2-java := /usr/share/java /usr/share/struts1.2
DEB_INSTALL_DOCS_libstruts1.2-java := NOTICE.txt STATUS.txt src/tiles-documentation src/examples src/example
More information about the pkg-java-commits
mailing list