[SCM] tomcat7: Servlet and JSP engine branch, master, updated. upstream/7.0.23-1-gd91cfaf

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit d91cfaf05134f8f457338960e5ea6e5a29f8a051
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Nov 27 21:06:15 2011 -0430

    Refresh patches

diff --git a/debian/changelog b/debian/changelog
index c3e8984..2f3d633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.23-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 27 Nov 2011 19:44:37 -0430
+
 tomcat7 (7.0.22-1) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
index 6e840a0..b63dd41 100644
--- a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
+++ b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
@@ -10,8 +10,8 @@ Subject: [PATCH] set UTF-8 as default character encoding
 +++ b/conf/server.xml
 @@ -69,6 +69,7 @@
      -->
-     <Connector port="8080" protocol="HTTP/1.1" 
-                connectionTimeout="20000" 
+     <Connector port="8080" protocol="HTTP/1.1"
+                connectionTimeout="20000"
 +               URIEncoding="UTF-8"
                 redirectPort="8443" />
      <!-- A "Connector" using the shared thread pool-->
diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
index eae542f..5ad653e 100644
--- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
+++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
@@ -8,26 +8,26 @@ Subject: [PATCH] add JARs below /var to class loader
 
 --- a/conf/catalina.properties
 +++ b/conf/catalina.properties
-@@ -44,7 +44,7 @@
- #     "foo/*.jar": Add all the JARs of the specified folder as class 
+@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
+ #     "foo/*.jar": Add all the JARs of the specified folder as class
  #                  repositories
  #     "foo/bar.jar": Add bar.jar as a class repository
 -common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
 +common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/tomcat7/common/classes,/var/lib/tomcat7/common/*.jar
  
  #
- # List of comma-separated paths defining the contents of the "server" 
-@@ -57,7 +57,7 @@
- #     "foo/*.jar": Add all the JARs of the specified folder as class 
+ # List of comma-separated paths defining the contents of the "server"
+@@ -57,7 +57,7 @@ common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/l
+ #     "foo/*.jar": Add all the JARs of the specified folder as class
  #                  repositories
  #     "foo/bar.jar": Add bar.jar as a class repository
 -server.loader=
 +server.loader=/var/lib/tomcat7/server/classes,/var/lib/tomcat7/server/*.jar
  
  #
- # List of comma-separated paths defining the contents of the "shared" 
-@@ -71,7 +71,7 @@
- #     "foo/bar.jar": Add bar.jar as a class repository 
+ # List of comma-separated paths defining the contents of the "shared"
+@@ -71,7 +71,7 @@ server.loader=
+ #     "foo/bar.jar": Add bar.jar as a class repository
  # Please note that for single jars, e.g. bar.jar, you need the URL form
  # starting with file:.
 -shared.loader=
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index e64a704..7e9b207 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -5,15 +5,15 @@ Last-Update: 2011-05-16
 
 --- tomcat7-7.0.14.orig/build.xml
 +++ tomcat7-7.0.14/build.xml
-@@ -472,7 +472,7 @@
-     </checkstyle>
+@@ -482,7 +482,7 @@
+     </copy>
    </target>
  
--  <target name="compile" depends="build-prepare,download-compile,validate">
-+  <target name="compile" depends="build-prepare">
- 
-     <!-- Add the builtin catalina.properties -->
-     <copy todir="java/org/apache/catalina/startup"
+-  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
++  <target name="compile" depends="build-prepare,compile-prepare">
+     <!-- Compile internal server components -->
+     <javac srcdir="java" destdir="${tomcat.classes}"
+            debug="${compile.debug}"
 @@ -767,12 +767,14 @@
    <target name="deploy" depends="package,build-docs,deploy-webapps"
            description="Default. Builds a working Tomcat instance">

-- 
tomcat7: Servlet and JSP engine