This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository tomcat6.
commit 86c53efe1ebf51b615578a99b0f4d4352130998c Author: tony mancill <[email protected]> Date: Sat Aug 3 21:18:07 2013 -0700 freshen patches --- ...4-split-deploy-webapps-target-from-deploy-target.patch | 9 +++------ .../patches/0005-change-default-DBCP-factory-class.patch | 9 ++------- ...010-Use-java.security.policy-file-in-catalina.sh.patch | 13 +++++-------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch index f1bf628..eec4257 100644 --- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch +++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch @@ -6,11 +6,9 @@ Subject: [PATCH] split deploy-webapps target from deploy target build.xml | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) -diff --git a/build.xml b/build.xml -index a77f604..376f810 100644 --- a/build.xml +++ b/build.xml -@@ -469,7 +469,7 @@ +@@ -486,7 +486,7 @@ building a tomcat release.</echo> </target> @@ -19,7 +17,7 @@ index a77f604..376f810 100644 <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" file="${tomcat-native.tar.gz}" /> -@@ -506,6 +506,13 @@ +@@ -523,6 +523,13 @@ </fileset> </copy> @@ -33,7 +31,7 @@ index a77f604..376f810 100644 <!-- Copy other regular webapps --> <copy todir="${tomcat.build}/webapps"> <fileset dir="webapps"> -@@ -629,10 +636,6 @@ +@@ -647,10 +654,6 @@ </fileset> </txt2html> @@ -44,4 +42,3 @@ index a77f604..376f810 100644 </target> <target name="clean-depend" --- diff --git a/debian/patches/0005-change-default-DBCP-factory-class.patch b/debian/patches/0005-change-default-DBCP-factory-class.patch index 88612c8..358aaed 100644 --- a/debian/patches/0005-change-default-DBCP-factory-class.patch +++ b/debian/patches/0005-change-default-DBCP-factory-class.patch @@ -8,11 +8,9 @@ Subject: [PATCH] change default DBCP factory class webapps/docs/jndi-resources-howto.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/java/org/apache/naming/factory/Constants.java b/java/org/apache/naming/factory/Constants.java -index 22ef7aa..ab1d759 100644 --- a/java/org/apache/naming/factory/Constants.java +++ b/java/org/apache/naming/factory/Constants.java -@@ -49,7 +49,7 @@ public final class Constants { +@@ -49,7 +49,7 @@ Package + ".HandlerFactory"; public static final String DBCP_DATASOURCE_FACTORY = @@ -21,11 +19,9 @@ index 22ef7aa..ab1d759 100644 public static final String OPENEJB_EJB_FACTORY = Package + ".OpenEjbFactory"; -diff --git a/webapps/docs/jndi-resources-howto.xml b/webapps/docs/jndi-resources-howto.xml -index e721854..be94cd4 100644 --- a/webapps/docs/jndi-resources-howto.xml +++ b/webapps/docs/jndi-resources-howto.xml -@@ -656,9 +656,9 @@ conn.close(); +@@ -668,9 +668,9 @@ <code>driverName</code> parameters to match your actual database's JDBC driver and connection URL.</p> @@ -37,4 +33,3 @@ index e721854..be94cd4 100644 as follows:</p> <ul> <li><strong>driverClassName</strong> - Fully qualified Java class name --- diff --git a/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch index 28fb839..c9c3d26 100644 --- a/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch +++ b/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch @@ -12,11 +12,9 @@ Forwarded: not-needed bin/catalina.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/bin/catalina.sh b/bin/catalina.sh -index a023a1e..1c4ae68 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh -@@ -267,7 +267,7 @@ if [ "$1" = "debug" ] ; then +@@ -271,7 +271,7 @@ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ @@ -25,8 +23,8 @@ index a023a1e..1c4ae68 100755 -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -@@ -294,7 +294,7 @@ elif [ "$1" = "run" ]; then - exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ +@@ -298,7 +298,7 @@ + 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 \ @@ -34,8 +32,8 @@ index a023a1e..1c4ae68 100755 -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -@@ -327,7 +327,7 @@ elif [ "$1" = "start" ] ; then - "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ +@@ -362,7 +362,7 @@ + "$_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 \ @@ -43,4 +41,3 @@ index a023a1e..1c4ae68 100755 -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ --- -- Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/tomcat6.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
