[patch] First run at converting 5.5.27 ebuild patch to apply to 5.5.31

31-main_tomcat_catalina_jasper_build_xml.patch (text/plain), 16.53 KB, created by Paul B. Henson on 2010-10-21 02:49:51 UTC

diff -Naur apache-tomcat-5.5.31-src_orig/build/build.xml apache-tomcat-5.5.31-src/build/build.xml
--- apache-tomcat-5.5.31-src_orig/build/build.xml	2010-09-04 12:54:42.000000000 -0700
+++ apache-tomcat-5.5.31-src/build/build.xml	2010-10-20 11:42:24.000000000 -0700
@@ -213,6 +213,7 @@
 
   <!-- ====================== DEPLOY: Copy Static Files =================== -->
   <target name="deploy-static" depends="init">
+<!--
     <copy file="${jsp-api.jar}"  todir="${tomcat.build}/common/lib"/>
     <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
 
@@ -231,9 +232,10 @@
 
     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
 
-    <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
-    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
+    <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
+-->
   </target>
 
   <!-- ====================== Build all components =================== -->
@@ -446,15 +448,14 @@
   <target name="build-webapps-precompile"
           depends="init" description="Precompile webapps" >
 
+    <antcall target="build-webapp-precompile-admin" />
+    <antcall target="build-webapp-precompile-examples" />
+
     <!-- JSPC -->
-    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
-    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
 
-    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
     <mkdir dir="${ROOT.base}/WEB-INF/src" />
     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
-    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
 
     <path id="jspc.classpath">
       <pathelement location="${java.home}/../lib/tools.jar"/>
@@ -489,25 +490,6 @@
              outputDir="${ROOT.base}/WEB-INF/src"
              javaEncoding="UTF-8" />
 
-    <jasper2
-             compile="false"
-             validateXml="false"
-             uriroot="${jsp-examples.base}"
-             webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-             addWebXmlMappings="true"
-             outputDir="${jsp-examples.base}/WEB-INF/src"
-             javaEncoding="UTF-8" />
-
-    <jasper2
-             package="admin"
-             compile="false"
-             validateXml="false"
-             uriroot="${admin.base}"
-             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-             addWebXmlMappings="true"
-             outputDir="${admin.base}/WEB-INF/src/admin"
-             javaEncoding="UTF-8" />
-
     <javac destdir="${ROOT.base}/WEB-INF/classes"
            optimize="off"
            debug="${compile.debug}"
@@ -530,65 +512,92 @@
       <include name="**" />
     </javac>
 
-    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-    <copy todir="${jsp-examples.base}/WEB-INF/classes">
-      <fileset dir="${jsp-examples.base}/WEB-INF/src">
-        <include name="**/*.class" />
-      </fileset>
-    </copy>
-
-    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-           optimize="off"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           failonerror="false"
-           srcdir="${jsp-examples.base}/WEB-INF/src"
-           excludes="**/*.smap"
-           encoding="UTF-8">
-      <classpath>
-        <pathelement location="${java.home}/../lib/tools.jar"/>
-        <fileset dir="${tomcat.build}/server/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${tomcat.build}/common/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <pathelement location="${tomcat.build}/classes"/>
-        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-      </classpath>
-      <include name="**" />
-      <exclude name="tags/**" />
-    </javac>
-
-    <javac destdir="${admin.base}/WEB-INF/classes"
-           optimize="off"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           failonerror="false"
-           srcdir="${admin.base}/WEB-INF/src"
-           excludes="**/*.smap"
-           encoding="UTF-8">
-      <classpath>
-        <pathelement location="${java.home}/../lib/tools.jar"/>
-        <fileset dir="${tomcat.build}/server/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${admin.base}/WEB-INF/lib">
-          <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${tomcat.build}/common/lib">
-          <include name="*.jar"/>
+   </target>
+ 
+   <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
+     <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
+     <mkdir dir="${admin.base}/WEB-INF/src/admin" />
+     <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
+       <classpath refid="jspc.classpath"/>
+     </taskdef>
+     <jasper2
+              package="admin"
+              compile="false"
+              validateXml="false"
+              uriroot="${admin.base}"
+              webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
+              addWebXmlMappings="true"
+              outputDir="${admin.base}/WEB-INF/src/admin" />
+     <javac destdir="${admin.base}/WEB-INF/classes"
+             optimize="off"
+             debug="${compile.debug}"
+             deprecation="${compile.deprecation}"
+             source="${compile.source}"
+             failonerror="false"
+            srcdir="${admin.base}/WEB-INF/src"
+         excludes="**/*.smap">
+        <classpath>
+          <pathelement location="${java.home}/../lib/tools.jar"/>
+          <fileset dir="${tomcat.build}/server/lib">
+            <include name="*.jar"/>
+          </fileset>
+         <fileset dir="${admin.base}/WEB-INF/lib">
+            <include name="*.jar"/>
+          </fileset>
+          <fileset dir="${tomcat.build}/common/lib">
+            <include name="*.jar"/>
+          </fileset>
+          <pathelement location="${tomcat.build}/classes"/>
+        </classpath>
+       <include name="admin/**" />
+      </javac>
+   </target>
+  
+   <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
+     <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
+     <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
+     <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
+       <classpath refid="jspc.classpath"/>
+     </taskdef>
+     <jasper2
+              compile="false"
+              validateXml="false"
+              uriroot="${jsp-examples.base}"
+          webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+              addWebXmlMappings="true"
+              outputDir="${jsp-examples.base}/WEB-INF/src" />
+      <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
+      <copy todir="${jsp-examples.base}/WEB-INF/classes">
+        <fileset dir="${jsp-examples.base}/WEB-INF/src">
+          <include name="**/*.class" />
         </fileset>
-        <pathelement location="${tomcat.build}/classes"/>
-      </classpath>
-      <include name="admin/**" />
-    </javac>
-  </target>
+      </copy>
+      <javac destdir="${jsp-examples.base}/WEB-INF/classes"
+             optimize="off"
+             debug="${compile.debug}"
+             deprecation="${compile.deprecation}"
+             source="${compile.source}"
+             failonerror="false"
+             srcdir="${jsp-examples.base}/WEB-INF/src"
+         excludes="**/*.smap">
+        <classpath>
+          <pathelement location="${java.home}/../lib/tools.jar"/>
+          <fileset dir="${tomcat.build}/server/lib">
+            <include name="*.jar"/>
+          </fileset>
+          <fileset dir="${jsp-examples.base}/WEB-INF/lib">
+            <include name="*.jar"/>
+          </fileset>
+          <fileset dir="${tomcat.build}/common/lib">
+            <include name="*.jar"/>
+          </fileset>
+          <pathelement location="${tomcat.build}/classes"/>
+          <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
+        </classpath>
+        <include name="**" />
+        <exclude name="tags/**" />
+      </javac>
+    </target>
 
   <target name="build-catalina" depends="init" 
           description="Builds catalina">
@@ -713,7 +722,7 @@
       <param name="sourcefile" value="${commons-collections-src.loc}"/>
       <param name="destfile" value="${tomcat-dbcp.jar}" />
     </antcall>
-    -->
+
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-pool-src.loc}"/>
       <param name="destfile" value="${commons-pool.home}/build.xml" />
@@ -731,6 +740,7 @@
       <param name="destdir" value="${base.path}"/>
     </antcall>
     <antcall target="build-jasper-compiler-jdt" />
+-->
   </target>
 
   <target name="build-tomcat-dbcp">
@@ -812,14 +822,7 @@
         </jar>
   </target>
 
-  <target name="build-webapps" depends="init"
-          description="build  webapps">
-
-    <echo>========== Building: webapps </echo>
-
-    <mkdir dir="${tomcat.build}/webapps" />
-    <mkdir dir="${tomcat.build}/server/webapps" />
-
+  <target name="build-examples" unless="examples.build.notrequired">
     <!-- The build files are far too difficult to hack - just build it and copy -->
     <ant dir="${api.home}/jsr154" target="dist">
     </ant>
@@ -837,6 +840,17 @@
         <exclude name="WEB-INF/tagPlugins.xml" />
       </fileset>
     </copy>
+  </target>
+
+  <target name="build-webapps" depends="init"
+          description="build  webapps">
+
+    <echo>========== Building: webapps </echo>
+
+    <mkdir dir="${tomcat.build}/webapps" />
+    <mkdir dir="${tomcat.build}/server/webapps" />
+
+    <antcall target="build-examples" />
 
     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
         <property name="webapps.build" value="${tomcat.build}/webapps" />
@@ -908,13 +922,7 @@
         filtering="true" encoding="ISO-8859-1" />
 
     <!-- Build JARs for webapps classes -->
-    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar">
-       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-          <include name="**/*.class" />
-          <include name="**/*.properties" />
-       </fileset>
-    </jar>
+    <antcall target="fix-admin-webapp" />
     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar">
        <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
@@ -949,9 +957,19 @@
          todir="${tomcat.build}/conf/Catalina/localhost" />
     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
          todir="${tomcat.build}/conf/Catalina/localhost" />
+  </target>
+
+  <target name="fix-admin-webapp" unless="admin.build.notrequired">
+    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
+    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
+         index="true">
+       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
+          <include name="**/*.class" />
+          <include name="**/*.properties" />
+       </fileset>
+    </jar>
     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
          todir="${tomcat.build}/conf/Catalina/localhost" />
-
   </target>
 
   <!-- ====================== Embed target =================== -->
@@ -1097,11 +1115,11 @@
   <!-- ====================== Compat target =================== -->
 
   <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
-
+<!--
     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
     <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
-
+-->
   </target>
 
   <!-- ====================== DEPLOY: Deploy Components =================== -->
@@ -1247,11 +1265,11 @@
   <target name="run-tester"
    description="Catalina Tests" depends="dist-tester">
 
-    <!-- For Java 1.4 -->
+    <!-- For Java 1.4
     <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
     <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
     <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
-
+    -->
     <parallel>
 
         <java classname="LauncherBootstrap" fork="yes">
@@ -1986,7 +2004,7 @@
           description="Download binary packages" >
     <mkdir dir="${base.path}" />
 
-    <!-- Download any sub package or tools needed. -->
+    <!-- Download any sub package or tools needed.
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-beanutils.loc}"/>
       <param name="destfile" value="${commons-beanutils.jar}"/>
@@ -2028,7 +2046,6 @@
     </antcall>
 
     <antcall target="downloadgz">
-      <!-- xerces2 brings 2 files, test for one of them -->
       <param name="sourcefile" value="${xerces.loc}"/>
       <param name="destfile" value="${xml-apis.jar}"/>
     </antcall>
@@ -2100,7 +2117,7 @@
       <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
-
+    -->
     <!-- Grab the JAF/Javamail dependencies if doing full release -->
     <antcall target="fulldist"/>
 
diff -Naur apache-tomcat-5.5.31-src_orig/build.xml apache-tomcat-5.5.31-src/build.xml
--- apache-tomcat-5.5.31-src_orig/build.xml	2010-09-04 12:54:42.000000000 -0700
+++ apache-tomcat-5.5.31-src/build.xml	2010-10-20 11:21:13.000000000 -0700
@@ -88,13 +88,10 @@
 
   <target name="checkout"
           description="Update or checkout required sources from SVN">
-
+<!--
     <echo level="info"
           message="If the checkout fails, see http://tomcat.apache.org/svn.html and http://subversion.tigris.org/faq.html#proxy" />
 
-    <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
-    <!--  hackish: inputstring="t${line.separator}" is t+<enter> for svn         -->
-    <!--  to temporarily accept the certificate of svn.apache.org.               -->
     <exec dir="${basedir}"
           executable="svn"
           inputstring="t${line.separator}"
@@ -103,7 +100,7 @@
       <arg value="${svnroot}/${trunk.loc}" />
       <arg value="${basedir}" />
     </exec>
-
+-->
   </target>
 
   <!-- *************** UTILITY TARGETS *************** -->
diff -Naur apache-tomcat-5.5.31-src_orig/container/catalina/build.xml apache-tomcat-5.5.31-src/container/catalina/build.xml
--- apache-tomcat-5.5.31-src_orig/container/catalina/build.xml	2010-09-04 12:54:44.000000000 -0700
+++ apache-tomcat-5.5.31-src/container/catalina/build.xml	2010-10-20 11:21:13.000000000 -0700
@@ -79,6 +79,7 @@
     <pathelement location="${jaas.jar}"/>
     <pathelement location="${javagroups.jar}"/>
     <pathelement location="${jcert.jar}"/>
+    <pathelement location="${jdt.jar}"/>
     <pathelement location="${jmx.jar}"/>
     <pathelement location="${jmx-remote.jar}"/>
     <pathelement location="${jndi.jar}"/>
@@ -110,6 +111,7 @@
     <pathelement location="${commons-modeler.jar}"/>
     <pathelement location="${jaas.jar}"/>
     <pathelement location="${jcert.jar}"/>
+    <pathelement location="${jdt.jar}"/>
     <pathelement location="${jmx.jar}"/>
     <pathelement location="${jndi.jar}"/>
     <pathelement location="${jnet.jar}"/>
@@ -568,9 +570,9 @@
            file="${commons-logging-api.jar}"/>
 <!--
     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
--->
     <copy todir="${catalina.build}/common/lib"
            file="${tomcat-dbcp.jar}" />
+-->
 
     <!-- Configuration Files -->
     <copy todir="${catalina.build}/conf">
diff -Naur apache-tomcat-5.5.31-src_orig/jasper/build.xml apache-tomcat-5.5.31-src/jasper/build.xml
--- apache-tomcat-5.5.31-src_orig/jasper/build.xml	2010-09-04 12:54:51.000000000 -0700
+++ apache-tomcat-5.5.31-src/jasper/build.xml	2010-10-20 11:21:13.000000000 -0700
@@ -47,6 +47,7 @@
     <pathelement location="${jsp-api.jar}"/>
     <pathelement location="${tools.jar}"/>
     <pathelement location="${jasper-compiler-jdt.jar}"/>
+    <pathelement location="${jdt.jar}"/>
     <pathelement location="${xerces.jar}"/>
     <pathelement location="${xercesImpl.jar}"/>
     <pathelement location="${xml-apis.jar}"/>