[gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files/5.5: jsr152_jsr154_examples_build_xml.patch main_tomcat_catalina_jasper_build_xml.patch

[William Thomson (wltjr)]

wltjr       07/09/08 18:28:31

  Added:                jsr152_jsr154_examples_build_xml.patch
                        main_tomcat_catalina_jasper_build_xml.patch
  Log:
  Bumped to latest release, unified multiple patch files into two, partly result of having to re-create patches. Dropped ~x86-fbsd keyword due to it missing on a dep per bug #191729.
  (Portage version: 2.1.3.7)

Revision  Changes    Path
1.1                  www-servers/tomcat/files/5.5/jsr152_jsr154_examples_build_xml.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/jsr152_jsr154_examples_build_xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/jsr152_jsr154_examples_build_xml.patch?rev=1.1&content-type=text/plain

Index: jsr152_jsr154_examples_build_xml.patch
===================================================================
diff -Naur apache-tomcat-5.5.25-src_orig/servletapi/jsr152/build.xml apache-tomcat-5.5.25-src/servletapi/jsr152/build.xml
--- apache-tomcat-5.5.25-src_orig/servletapi/jsr152/build.xml	2007-09-08 12:24:17.000000000 -0400
+++ apache-tomcat-5.5.25-src/servletapi/jsr152/build.xml	2007-09-08 14:14:30.000000000 -0400
@@ -37,6 +37,7 @@
 
   <path id="examples.classpath">
     <pathelement location="${jsp-api.build}/classes"/>
+    <pathelement location="${jsp-api.jar}"/>
     <pathelement location="${servlet-api.jar}"/>
     <pathelement location="${mail.jar}"/>
   </path>
@@ -244,7 +245,7 @@
   <target name="jar" depends="compile"
           description="Create jar">
 
-    <!-- Prepare Manifest -->
+    <!-- Prepare Manifest
     <copy tofile="${jsp-api.build}/manifest"
             file="src/etc/manifest" overwrite="yes">
       <filterset>
@@ -253,13 +254,12 @@
       </filterset>
     </copy>
 
-    <!-- Create JAR file -->
     <jar jarfile="${jsp-api.jar}"
          basedir="${jsp-api.build}/classes"
          manifest="${jsp-api.build}/manifest">
       <include name="javax/servlet/jsp/**" />
     </jar>
-
+-->
   </target>
 
   <target name="dist" depends="compile,examples,javadoc,jar"
diff -Naur apache-tomcat-5.5.25-src_orig/servletapi/jsr154/build.xml apache-tomcat-5.5.25-src/servletapi/jsr154/build.xml
--- apache-tomcat-5.5.25-src_orig/servletapi/jsr154/build.xml	2007-09-08 12:24:17.000000000 -0400
+++ apache-tomcat-5.5.25-src/servletapi/jsr154/build.xml	2007-09-08 14:10:08.000000000 -0400
@@ -34,6 +34,7 @@
   <property name="servlet-api.jar" value="${servlet-api.dist}/lib/servlet-api.jar"/>
   <path id="examples.classpath">
     <pathelement location="${servlet-api.build}/classes"/>
+    <pathelement location="${servlet-api.jar}"/>
   </path>
 
 
@@ -142,7 +143,7 @@
   <target name="jar" depends="compile"
           description="Create the jar">
 
-    <!-- Prepare Manifest -->
+    <!-- Prepare Manifest
     <copy tofile="${servlet-api.build}/manifest"
             file="src/etc/manifest" overwrite="yes">
       <filterset>
@@ -151,14 +152,13 @@
       </filterset>
     </copy>
 
-    <!-- Create JAR file -->
     <jar jarfile="${servlet-api.jar}"
          basedir="${servlet-api.build}/classes"
          manifest="${servlet-api.build}/manifest">
       <include name="javax/servlet/**"/>
       <exclude name="javax/servlet/jsp/**"/>
     </jar>
-
+-->
   </target>
 
   <target name="dist" depends="compile,examples,javadoc,jar"



1.1                  www-servers/tomcat/files/5.5/main_tomcat_catalina_jasper_build_xml.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/main_tomcat_catalina_jasper_build_xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/main_tomcat_catalina_jasper_build_xml.patch?rev=1.1&content-type=text/plain

Index: main_tomcat_catalina_jasper_build_xml.patch
===================================================================
diff -Naur apache-tomcat-5.5.25-src_orig/build/build.xml apache-tomcat-5.5.25-src/build/build.xml
--- apache-tomcat-5.5.25-src_orig/build/build.xml	2007-09-08 12:24:17.000000000 -0400
+++ apache-tomcat-5.5.25-src/build/build.xml	2007-09-08 12:57:43.000000000 -0400
@@ -161,6 +161,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"/>
 
@@ -179,9 +180,10 @@
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
             file="${tomcat-native.tar.gz}" />
 
-    <!-- <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 =================== -->
@@ -413,15 +415,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"/>
@@ -455,23 +456,6 @@
              addWebXmlMappings="true"
              outputDir="${ROOT.base}/WEB-INF/src" />
 
-    <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" />
-
-    <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="${ROOT.base}/WEB-INF/classes"
            optimize="off"
            debug="${compile.debug}"
@@ -492,62 +476,90 @@
       </classpath>
       <include name="**" />
     </javac>
+  </target>
 
-    <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"
+  <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="${jsp-examples.base}/WEB-INF/src"
+           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="${jsp-examples.base}/WEB-INF/lib">
+        <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"/>
-        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
       </classpath>
-      <include name="**" />
-      <exclude name="tags/**" />
+      <include name="admin/**" />
     </javac>
+  </target>
 
-    <javac destdir="${admin.base}/WEB-INF/classes"
+  <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>
+    </copy>
+    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
            optimize="off"
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            failonerror="false"
-           srcdir="${admin.base}/WEB-INF/src"
+           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="${admin.base}/WEB-INF/lib">
+        <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="admin/**" />
+      <include name="**" />
+      <exclude name="tags/**" />
     </javac>
   </target>
 
@@ -676,7 +688,6 @@
       <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="${tomcat-dbcp.jar}" />
@@ -694,6 +705,7 @@
       <param name="destdir" value="${base.path}"/>
     </antcall>
     <antcall target="build-jasper-compiler-jdt" />
+    -->
   </target>
 
   <target name="build-tomcat-dbcp">
@@ -773,14 +785,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>
@@ -798,6 +803,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" />
@@ -869,14 +885,7 @@
         filtering="true" />
 
     <!-- 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"
-         index="true">
-       <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"
          index="true">
@@ -915,9 +924,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 =================== -->
@@ -1060,11 +1079,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 =================== -->
@@ -1111,8 +1130,9 @@
     <!-- Copy Unix JSVC from commons-daemon -->
     <copy file="${commons-daemon.jsvc.tar.gz}"
         tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
+<!--
     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-
+-->
     <echo>Target: Webapps precompilation ...</echo>
 
     <antcall target="build-admin"/>
@@ -1213,11 +1233,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">
@@ -1899,11 +1919,10 @@
     <mkdir dir="${base.path}" />
 
     <!-- commons-digester needs ../LICENSE -->
-    <!-- That is ugly XXX needs a review -->
+    <!-- That is ugly XXX needs a review
     <copy file="LICENSE" tofile="../LICENSE"/>
     <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
 
-    <!-- Downdown any sub package or tools needed. -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-beanutils.loc}"/>
       <param name="destfile" value="${commons-beanutils.jar}"/>
@@ -1940,7 +1959,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>
@@ -1961,7 +1979,6 @@
       <param name="destfile" value="${commons-launcher.jar}"/>
     </antcall>
 
-    <!--
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-pool.loc}"/>
       <param name="destfile" value="${commons-pool.jar}"/>
@@ -1972,7 +1989,6 @@
       <param name="destfile" value="${commons-dbcp.jar}"/>
       <param name="destdir" value="${base.path}"/>
     </antcall>
-    -->
 
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-httpclient.loc}"/>
@@ -2000,7 +2016,7 @@
       <param name="destfile" value="${tomcat-native.tar.gz}"/>
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
-
+    -->
     <!-- Build the dependencies that are not yet released -->
     <antcall target="build-depends"/>
 
diff -Naur apache-tomcat-5.5.25-src_orig/build.xml apache-tomcat-5.5.25-src/build.xml
--- apache-tomcat-5.5.25-src_orig/build.xml	2007-09-08 12:24:17.000000000 -0400
+++ apache-tomcat-5.5.25-src/build.xml	2007-09-08 12:45:21.000000000 -0400
@@ -81,13 +81,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}"
@@ -96,7 +93,7 @@
       <arg value="${svnroot}/${current.loc}" />
       <arg value="${basedir}" />
     </exec>
-
+-->
   </target>
 
   <!-- *************** UTILITY TARGETS *************** -->
diff -Naur apache-tomcat-5.5.25-src_orig/container/catalina/build.xml apache-tomcat-5.5.25-src/container/catalina/build.xml
--- apache-tomcat-5.5.25-src_orig/container/catalina/build.xml	2007-09-08 12:24:17.000000000 -0400
+++ apache-tomcat-5.5.25-src/container/catalina/build.xml	2007-09-08 13:03:28.000000000 -0400
@@ -61,6 +61,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}"/>
@@ -92,6 +93,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}"/>
@@ -549,9 +551,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.25-src_orig/jasper/build.xml apache-tomcat-5.5.25-src/jasper/build.xml
--- apache-tomcat-5.5.25-src_orig/jasper/build.xml	2007-09-08 12:24:17.000000000 -0400
+++ apache-tomcat-5.5.25-src/jasper/build.xml	2007-09-08 13:02:30.000000000 -0400
@@ -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}"/>



-- 
gentoo-commits@g.o mailing list