[SCM] tomcat7: Servlet and JSP engine branch, exp/master, updated. debian/7.0.35-1_exp2-3-gfd31443

[Miguel Landaeta]

The following commit has been merged in the exp/master branch:
commit fd31443194c1908bd39a6533db5f9071f1263be6
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Mar 31 20:43:44 2013 -0300

    Prepare release 7.0.39-1~exp1

diff --git a/debian/changelog b/debian/changelog
index f2e34f8..abc768d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tomcat7 (7.0.39-1~exp1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Refresh patches:
+    - 0009-Use-java.security.policy-file-in-catalina.sh.patch
+  * Remove patches included in the upstream release:
+    - 0016_upstream_bug_54440.patch
+  * Bump Standards-Version to 3.9.4. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 31 Mar 2013 19:09:41 -0300
+
 tomcat7 (7.0.35-1~exp2) experimental; urgency=low
 
   * Switch from Commons DBCP to Tomcat JDBC Pool as default connection
diff --git a/debian/control b/debian/control
index 8ca6ac2..1846a07 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ DM-Upload-Allowed: yes
 Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
 Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java, javahelper,
  junit4, libjstl1.1-java, libjakarta-taglibs-standard-java
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-java/tomcat7.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/tomcat7.git
 Homepage: http://tomcat.apache.org
diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
index a516ce9..8337de7 100644
--- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
+++ b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
 
 --- a/bin/catalina.sh
 +++ b/bin/catalina.sh
-@@ -287,7 +287,7 @@
+@@ -285,7 +285,7 @@ if [ "$1" = "debug" ] ; then
          -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
          -sourcepath "$CATALINA_HOME"/../../java \
          -Djava.security.manager \
@@ -23,8 +23,8 @@ Forwarded: not-needed
          -Dcatalina.base="$CATALINA_BASE" \
          -Dcatalina.home="$CATALINA_HOME" \
          -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-@@ -314,7 +314,7 @@
-     eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \
+@@ -312,7 +312,7 @@ elif [ "$1" = "run" ]; then
+     eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
        -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \
        -Djava.security.manager \
 -      -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \
@@ -32,8 +32,8 @@ Forwarded: not-needed
        -Dcatalina.base=\"$CATALINA_BASE\" \
        -Dcatalina.home=\"$CATALINA_HOME\" \
        -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \
-@@ -378,7 +378,7 @@
-     eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \
+@@ -376,7 +376,7 @@ elif [ "$1" = "start" ] ; then
+     eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
        -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \
        -Djava.security.manager \
 -      -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \
diff --git a/debian/patches/0016_upstream_bug_54440.patch b/debian/patches/0016_upstream_bug_54440.patch
deleted file mode 100644
index 1d4e4d3..0000000
--- a/debian/patches/0016_upstream_bug_54440.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: upstream patch from upcoming 7.0.36 to allow precompilation 
- of JSPs; TagPluginManager.init() throws NPE when used in Ant <jasper> task
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54440
-Origin: https://issues.apache.org/bugzilla/attachment.cgi?id=29860
-Forwarded: not-needed
-
---- a/java/org/apache/jasper/JspC.java
-+++ b/java/org/apache/jasper/JspC.java
-@@ -1516,7 +1516,7 @@
-         URL urlsA[]=new URL[urls.size()];
-         urls.toArray(urlsA);
-         loader = new URLClassLoader(urlsA, this.getClass().getClassLoader());
--
-+        context.setClassLoader(loader);
-     }
- 
-     /**
---- a/java/org/apache/jasper/servlet/JspCServletContext.java
-+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
-@@ -77,6 +77,11 @@
-      */
-     protected URL myResourceBaseURL;
- 
-+
-+    /**
-+     * Class Loader
-+     */
-+    private ClassLoader loader;
- 
-     // ----------------------------------------------------------- Constructors
- 
-@@ -612,7 +617,11 @@
- 
-     @Override
-     public ClassLoader getClassLoader() {
--        return null;
-+        return loader;
-+    }
-+
-+    public void setClassLoader(ClassLoader loader) {
-+    	this.loader = loader;
-     }
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index b5733ae..74b48e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,4 @@
 0013-dont-look-for-build-properties-in-user-home.patch
 0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch
-0016_upstream_bug_54440.patch
 0017-use-jdbc-pool-default.patch

-- 
tomcat7: Servlet and JSP engine