packages: java-servletapi5/jakarta-servletapi5-target.patch - updated for 5...

[pawelz]

Author: pawelz                       Date: Wed Aug 19 07:06:45 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 5.5.28

---- Files affected:
packages/java-servletapi5:
   jakarta-servletapi5-target.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-servletapi5/jakarta-servletapi5-target.patch
diff -u packages/java-servletapi5/jakarta-servletapi5-target.patch:1.1 packages/java-servletapi5/jakarta-servletapi5-target.patch:1.2
--- packages/java-servletapi5/jakarta-servletapi5-target.patch:1.1	Fri Dec  7 20:58:05 2007
+++ packages/java-servletapi5/jakarta-servletapi5-target.patch	Wed Aug 19 09:06:40 2009
@@ -1,6 +1,6 @@
---- apache-tomcat-5.5.23-src/servletapi/jsr152/build.xml~	2007-03-05 17:27:59.000000000 +0200
-+++ apache-tomcat-5.5.23-src/servletapi/jsr152/build.xml	2007-12-07 21:46:47.837358940 +0200
-@@ -3,6 +3,9 @@
+--- jsr152/build.xml.orig	2009-07-24 21:37:01.000000000 +0200
++++ jsr152/build.xml	2009-08-19 08:49:39.000000000 +0200
+@@ -20,6 +20,9 @@
  
    <!-- =================== Environmental Properties ======================= -->
  
@@ -10,45 +10,45 @@
    <!-- Load user property definition overrides -->
    <property file="build.properties"/>
    <property file="${user.home}/build.properties"/>
-@@ -71,6 +74,8 @@
+@@ -88,6 +91,8 @@
      <javac srcdir="src/share" destdir="${jsp-api.build}/classes"
             debug="${compile.debug}" deprecation="${compile.deprecation}"
          optimize="${compile.optimize}"
-+          source="${compile.source}"
-+          target="${compile.target}"
-        classpath="${servlet-api.jar}" />
++	  source="${compile.source}"
++	  target="${compile.target}"
+        classpath="${servlet-api.jar}"
+         encoding="ISO-8859-1"/>
  
-     <!-- Associated property files -->
-@@ -113,6 +118,8 @@
+@@ -131,6 +136,8 @@
      <javac  srcdir="src/ant" destdir="${jsp-api.build}/ant"
              debug="${compile.debug}" deprecation="${compile.deprecation}"
              optimize="${compile.optimize}" 
-+            source="${compile.source}"
-+            target="${compile.target}"
-             classpath="${ant.home}/lib/ant.jar" />
++	    source="${compile.source}"
++	    target="${compile.target}"
+             classpath="${ant.home}/lib/ant.jar"
+             encoding="ISO-8859-1"/>
      <jar jarfile="${jsp-anttask.jar}"  basedir="${jsp-api.build}/ant"  />
-     <taskdef    name="txt2html" classname="task.Txt2Html"
-@@ -205,6 +212,8 @@
+@@ -224,6 +231,8 @@
               destdir="${jsp-api.build}/examples/WEB-INF/classes"
               debug="${compile.debug}" deprecation="${compile.deprecation}"
               optimize="${compile.optimize}"
-+             source="${compile.source}"
-+             target="${compile.target}"
-              excludes="**/CVS/**">
++	     source="${compile.source}"
++	     target="${compile.target}"
+              excludes="**/CVS/**"
+              encoding="ISO-8859-1">
        <classpath refid="examples.classpath" />
-     </javac>
-@@ -213,6 +222,8 @@
+@@ -233,6 +242,8 @@
               destdir="${jsp-api.build}/examples/plugin/applet"
               debug="${compile.debug}" deprecation="${compile.deprecation}"
               optimize="${compile.optimize}"
-+             source="${compile.source}"
-+             target="${compile.target}"
-              excludes="**/CVS/**">
++	     source="${compile.source}"
++	     target="${compile.target}"
+              excludes="**/CVS/**"
+              encoding="ISO-8859-1">
        <classpath refid="examples.classpath" />
-     </javac>
---- apache-tomcat-5.5.23-src/servletapi/jsr154/build.xml~	2007-03-05 17:28:00.000000000 +0200
-+++ apache-tomcat-5.5.23-src/servletapi/jsr154/build.xml	2007-12-07 21:49:34.840081313 +0200
-@@ -11,6 +11,8 @@
+--- jsr154/build.xml.orig	2009-07-24 21:37:02.000000000 +0200
++++ jsr154/build.xml	2009-08-19 08:51:53.000000000 +0200
+@@ -28,6 +28,8 @@
    <property name="compile.debug"       value="true"/>
    <property name="compile.deprecation" value="false"/>
    <property name="compile.optimize"    value="true"/>
@@ -57,21 +57,21 @@
    <property name="implementation.revision" value="public_draft"/>
    <property name="servlet-api.build"    value="build"/>
    <property name="servlet-api.dist"     value="dist"/>
-@@ -64,6 +66,8 @@
-     <!-- Java classes -->
+@@ -82,6 +84,8 @@
      <javac srcdir="src/share" destdir="${servlet-api.build}/classes"
             debug="${compile.debug}" deprecation="${compile.deprecation}"
-+          source="${compile.source}"
-+          target="${compile.target}"
-         optimize="${compile.optimize}"/>
+         optimize="${compile.optimize}"
++	  source="${compile.source}"
++	  target="${compile.target}"
+         encoding="ISO-8859-1"/>
  
      <!-- Associated property files -->
-@@ -111,6 +115,8 @@
+@@ -129,6 +133,8 @@
               destdir="${servlet-api.build}/examples/WEB-INF/classes"
               debug="${compile.debug}" deprecation="${compile.deprecation}"
               optimize="${compile.optimize}"
-+             source="${compile.source}"
-+             target="${compile.target}"
-              excludes="**/CVS/**">
++	     source="${compile.source}"
++	     target="${compile.target}"
+              excludes="**/CVS/**"
+              encoding="ISO-8859-1">
        <classpath refid="examples.classpath" />
-     </javac>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-servletapi5/jakarta-servletapi5-target.patch?r1=1.1&r2=1.2&f=u