r1796 - in trunk/tomcat5/debian: . patches

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-01-23 14:39:28 +0000 (Mon, 23 Jan 2006)
New Revision: 1796

Added:
   trunk/tomcat5/debian/patches/20_ECJ_Target13_A.patch
   trunk/tomcat5/debian/patches/20_ECJ_Target13_B.patch
Modified:
   trunk/tomcat5/debian/README.Debian
   trunk/tomcat5/debian/changelog
   trunk/tomcat5/debian/rules
   trunk/tomcat5/debian/tomcat5.init
Log:
Update to kaffe transition upload.

Modified: trunk/tomcat5/debian/README.Debian
===================================================================
--- trunk/tomcat5/debian/README.Debian	2006-01-23 14:37:59 UTC (rev 1795)
+++ trunk/tomcat5/debian/README.Debian	2006-01-23 14:39:28 UTC (rev 1796)
@@ -51,7 +51,7 @@
   permissions in a new file in /etc/tomcat5/policy.d/ restart and re-enable 
   the security manager.
 
-  Disbaling the security manager is not recommended on production systems
+  Disabling the security manager is not recommended on production systems
   since a call to System.exit() in a servlet of JSP page would then stop the
   whole virtual machine that is running Tomcat.
 

Modified: trunk/tomcat5/debian/changelog
===================================================================
--- trunk/tomcat5/debian/changelog	2006-01-23 14:37:59 UTC (rev 1795)
+++ trunk/tomcat5/debian/changelog	2006-01-23 14:39:28 UTC (rev 1796)
@@ -1,3 +1,12 @@
+tomcat5 (5.0.30-9) unstable; urgency=low
+
+  * kaffe compiler transition
+    + Remove build.compiler jikes property
+    + Modify tomcat5.init to use default compiler instead of jikes
+  * Fix spelling error in README.Debian (closes: #346573)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 17 Jan 2006 11:50:52 +0100
+
 tomcat5 (5.0.30-8) unstable; urgency=low
 
   * Correct description to refer to tomcat5-webapps (closes: #336984)

Added: trunk/tomcat5/debian/patches/20_ECJ_Target13_A.patch
===================================================================
--- trunk/tomcat5/debian/patches/20_ECJ_Target13_A.patch	2006-01-23 14:37:59 UTC (rev 1795)
+++ trunk/tomcat5/debian/patches/20_ECJ_Target13_A.patch	2006-01-23 14:39:28 UTC (rev 1796)
@@ -0,0 +1,11 @@
+--- jakarta-tomcat-connectors/util/build.xml.orig	2006-01-17 11:56:31.000000000 +0100
++++ jakarta-tomcat-connectors/util/build.xml	2006-01-17 12:02:09.000000000 +0100
+@@ -61,7 +61,7 @@
+ 	       destdir="${tomcat-util.build}/classes"
+ 	       deprecation="off"
+ 	       debug="on"
+-	       target="1.1"
++	       target="1.3" source="1.3" nowarn="yes"
+ 	       optimize="off"
+ 	       verbose="off">
+             <classpath refid="compile.classpath"/>

Added: trunk/tomcat5/debian/patches/20_ECJ_Target13_B.patch
===================================================================
--- trunk/tomcat5/debian/patches/20_ECJ_Target13_B.patch	2006-01-23 14:37:59 UTC (rev 1795)
+++ trunk/tomcat5/debian/patches/20_ECJ_Target13_B.patch	2006-01-23 14:39:28 UTC (rev 1796)
@@ -0,0 +1,11 @@
+--- jakarta-tomcat-catalina/webapps/admin/build.xml.orig	2004-11-24 17:55:34.000000000 +0100
++++ jakarta-tomcat-catalina/webapps/admin/build.xml	2006-01-17 12:11:05.000000000 +0100
+@@ -200,7 +200,7 @@
+              destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
+              debug="${compile.debug}" deprecation="${compile.deprecation}"
+              optimize="${compile.optimize}"
+-             excludes="**/CVS/**">
++             excludes="**/CVS/**" target="1.3" source="1.3" nowarn="yes">
+       <classpath refid="admin.classpath" />
+     </javac>
+ 

Modified: trunk/tomcat5/debian/rules
===================================================================
--- trunk/tomcat5/debian/rules	2006-01-23 14:37:59 UTC (rev 1795)
+++ trunk/tomcat5/debian/rules	2006-01-23 14:39:28 UTC (rev 1796)
@@ -17,7 +17,6 @@
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
 
-DEB_ANT_COMPILER := jikes
 DEB_ANT_BUILD_TARGET   := build
 
 # Examples and documentation for the tomcat5 package

Modified: trunk/tomcat5/debian/tomcat5.init
===================================================================
--- trunk/tomcat5/debian/tomcat5.init	2006-01-23 14:37:59 UTC (rev 1795)
+++ trunk/tomcat5/debian/tomcat5.init	2006-01-23 14:39:28 UTC (rev 1796)
@@ -72,10 +72,7 @@
 	CATALINA_OPTS="-Djava.awt.headless=true -Xmx128M"
 fi
 
-# Set the JSP compiler to if we are using Kaffe and it is not set
-if [ -z "$JSP_COMPILER" -a "$JAVA_HOME" = "/usr/lib/kaffe" ]; then
-	JSP_COMPILER=jikes
-fi
+# Set the JSP compiler if set in the tomcat5.default file
 if [ -n "$JSP_COMPILER" ]; then
 	CATALINA_OPTS="$CATALINA_OPTS -Dbuild.compiler=$JSP_COMPILER"
 fi