tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina build.xml
Date Mon, 16 Aug 2004 23:52:12 GMT
remm        2004/08/16 16:52:11

  Modified:    .        build.xml build.properties.default tomcat.nsi
               jasper2  build.xml
               catalina/src/share/org/apache/catalina/startup
                        TldConfig.java
               catalina build.xml
  Log:
  - Move dependencies and stuff around.
  - Add download for JDT (the poor server is going to suffer ...), with repackaging (the JDT
JAR is quite big, and
    we only need a fraction of it). The JDT packaging isn't very good overall, and unfortunately
there's a 14MB download
    to end up with a 900KB JAR in the end.
  - Move JMX and Xerces to the compat bundle.
  
  Revision  Changes    Path
  1.197     +39 -9     jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.196
  retrieving revision 1.197
  diff -u -r1.196 -r1.197
  --- build.xml	13 Aug 2004 07:22:22 -0000	1.196
  +++ build.xml	16 Aug 2004 23:52:11 -0000	1.197
  @@ -57,7 +57,10 @@
     <property name="webapps.dist"     value="${catalina.home}/webapps/dist"/>
     <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
     <property name="tomcat-dbcp.jar" 
  -       value="${tomcat-dbcp.home}/naming-factory-dbcp-${commons-dbcp.version}.jar"/>
  +       value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
  +  <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
  +  <property name="jasper-compiler-jdt.jar" 
  +       value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
     
     <!-- Some compilers will disable debugging if true. And it doesn't do anything 
          in most cases -->
  @@ -140,7 +143,6 @@
   
       <copy todir="${tomcat.build}/bin" 
              file="${commons-logging-api.jar}" />
  -    <copy tofile="${tomcat.build}/bin/jmx.jar" file="${jmx.jar}" />
   
       <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
   
  @@ -148,8 +150,9 @@
       <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" 
               failonerror="false" />
   
  -    <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 =================== -->
  @@ -514,7 +517,14 @@
         <param name="destfile" value="${tomcat-dbcp.jar}" />
       </antcall>
   
  -   <antcall target="build-tomcat-dbcp" />
  +    <antcall target="build-tomcat-dbcp" />
  +
  +    <antcall target="downloadzip">
  +      <param name="sourcefile" value="${jdt.loc}"/>
  +      <param name="destfile" value="${jdt.jar}"/>
  +      <param name="destdir" value="${base.path}"/>
  +    </antcall>
  +    <antcall target="build-jasper-compiler-jdt" />
     </target>
   
     <target name="build-tomcat-dbcp">
  @@ -573,6 +583,24 @@
       </jar>
     </target>
   
  +	  <target name="build-jasper-compiler-jdt">
  +	   <mkdir dir="${jasper-compiler-jdt.home}"/>
  +	   <antcall target="-build-jasper-compiler-jdt">
  +	      <param name="basedir" value="${jasper-compiler-jdt.home}" />
  +	   </antcall>
  +	  </target>
  +
  +	  <target name="-build-jasper-compiler-jdt">
  +	  	<unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
  +	  	<jar destfile="${jasper-compiler-jdt.jar}" index="true">
  +	  		<fileset dir="${jasper-compiler-jdt.home}">
  +	  			<include name="org/eclipse/jdt/core/compiler/**"/>
  +	  			<include name="org/eclipse/jdt/internal/compiler/**"/>
  +	  			<include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
  +	  		</fileset>
  +	  	</jar>
  +	  </target>
  +	
     <target name="build-webapps" depends="init"
             description="build  webapps">
   
  @@ -714,8 +742,7 @@
       <copy todir="embed/lib" file="${jmx.jar}"/>
       <copy todir="embed/lib" file="${regexp.jar}"/>
   
  -    <copy todir="embed/lib" file="${ant.jar}"/>
  -    <copy todir="embed/lib" file="${ant-launcher.jar}"/> 
  +    <copy todir="embed/lib" file="${jdt.jar}"/>
   
       <copy todir="embed/lib">
         <fileset dir="build/server/lib">
  @@ -849,8 +876,10 @@
          </fileset>
       </jar>
   
  +  	<!--
       <copy todir="${tomcat.deployer}/lib" file="${xercesImpl.jar}"/>
       <copy todir="${tomcat.deployer}/lib" file="${xml-apis.jar}"/>
  +    -->
   
       <copy todir="${tomcat.deployer}">
         <fileset dir="${basedir}/resources/deployer" />
  @@ -870,10 +899,11 @@
   
     <!-- ====================== Compat target =================== -->
   
  -  <target name="compat" description="Create compatibility binaries for JREs before 1.4"
>
  +  <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>
   
  @@ -927,7 +957,7 @@
   
       <antcall target="build-admin"/>
   
  -    <ant dir="."   target="build-webapps-precompile" /> 
  +    <ant dir="." target="build-webapps-precompile" />
   
     </target>
   
  
  
  
  1.134     +8 -1      jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- build.properties.default	10 Aug 2004 22:42:37 -0000	1.133
  +++ build.properties.default	16 Aug 2004 23:52:11 -0000	1.134
  @@ -131,6 +131,13 @@
   xerces.loc=${base-xml.loc}/xerces-j/binaries/Xerces-J-bin.2.6.2.tar.gz
   
   
  +# ----- Eclipse JDT, version 3.0 or later -----
  +jdt.home=${base.path}/eclipse/plugins/org.eclipse.jdt.core_3.0.0
  +jdt.lib=${jdt.home}
  +jdt.jar=${jdt.lib}/jdtcore.jar
  +jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.0-200406251208/eclipse-JDT-3.0.zip
  +
  +
   # --------------------------------------------------
   #              CORE OPTIONAL LIBRARIES
   # --------------------------------------------------
  
  
  
  1.46      +2 -2      jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- tomcat.nsi	22 May 2004 20:43:35 -0000	1.45
  +++ tomcat.nsi	16 Aug 2004 23:52:11 -0000	1.46
  @@ -132,7 +132,7 @@
     IfSilent +2 0
     !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
   
  -  CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
  +;  CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
     ClearErrors
   
     Call configure
  
  
  
  1.27      +3 -2      jakarta-tomcat-jasper/jasper2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	16 Jun 2004 18:05:12 -0000	1.26
  +++ build.xml	16 Aug 2004 23:52:11 -0000	1.27
  @@ -29,6 +29,7 @@
       <pathelement location="${servlet-api.jar}"/>
       <pathelement location="${jsp-api.jar}"/>
       <pathelement location="${tools.jar}"/>
  +    <pathelement location="${jasper-compiler-jdt.jar}"/>
       <pathelement location="${xerces.jar}"/>
       <pathelement location="${xercesImpl.jar}"/>
       <pathelement location="${xml-apis.jar}"/>
  @@ -85,7 +86,7 @@
   
     <!-- =================== BUILD: Copy Launcher Files ===================== -->
     <target name="copy-launcher.jars" if="copy.launcher.jars">
  -    <copy todir="${jasper.build}/common/lib" file="${ant.jar}"/>
  +    <!-- <copy todir="${jasper.build}/common/lib" file="${ant.jar}"/> -->
       <copy todir="${jasper.build}/bin" file="${commons-daemon-launcher.jar}"/>
       <copy todir="${jasper.build}/bin" file="${commons-daemon-launcher-bootstrap.class}"/>
       <copy todir="${jasper.build}/bin">
  @@ -248,7 +249,7 @@
             tofile="${jasper.deploy}/common/lib/jasper-runtime.jar" />
   
       <!-- Copy JARs -->
  -    <copy todir="${jasper.deploy}/common/lib" file="${ant.jar}"/>
  +    <copy todir="${jasper.deploy}/common/lib" file="${jasper-compiler-jdt.jar}"/>
       <copy todir="${jasper.deploy}/common/lib" file="${jsp-api.jar}"/>
       <copy todir="${jasper.deploy}/common/lib" file="${commons-el.jar}"/>
   
  
  
  
  1.42      +3 -1      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- TldConfig.java	31 Jul 2004 17:13:53 -0000	1.41
  +++ TldConfig.java	16 Aug 2004 23:52:11 -0000	1.42
  @@ -93,8 +93,9 @@
           noTldJars.add("commons-logging.jar");
           noTldJars.add("commons-collections.jar");
           noTldJars.add("commons-el.jar");
  -        noTldJars.add("jakarta-regexp-1.2.jar");
  +        noTldJars.add("jakarta-regexp-1.3.jar");
           noTldJars.add("jasper-compiler.jar");
  +        noTldJars.add("jasper-compiler-jdt.jar");
           noTldJars.add("jasper-runtime.jar");
           noTldJars.add("jmx.jar");
           noTldJars.add("jmx-tools.jar");
  @@ -102,6 +103,7 @@
           noTldJars.add("naming-common.jar");
           noTldJars.add("naming-resources.jar");
           noTldJars.add("naming-factory.jar");
  +        noTldJars.add("naming-factory-dbcp.jar");
           noTldJars.add("naming-java.jar");
           noTldJars.add("servlet-api.jar");
           noTldJars.add("servlets-default.jar");
  
  
  
  1.66      +3 -3      jakarta-tomcat-catalina/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- build.xml	12 Aug 2004 04:53:10 -0000	1.65
  +++ build.xml	16 Aug 2004 23:52:11 -0000	1.66
  @@ -42,7 +42,7 @@
     <property name="tomcat-http11.jar"
              value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
     <property name="tomcat-dbcp.jar" 
  -           value="${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar"/>
  +           value="${base.path}/tomcat-deps/naming-factory-dbcp.jar"/>
     <!-- Construct Catalina classpath -->
     <path id="catalina.classpath">
       <pathelement location="${activation.jar}"/>
  @@ -504,7 +504,7 @@
       <copy tofile="${catalina.build}/bin/jmx.jar" file="${jmx.jar}"/>
     </target>
     <target name="copy-launcher.jars" if="copy.launcher.jars">
  -    <copy todir="${catalina.build}/common/lib" file="${ant.jar}"/>
  +    <!-- <copy todir="${catalina.build}/common/lib" file="${ant.jar}"/> -->
       <copy todir="${catalina.build}/bin" file="${commons-launcher.jar}"/>
       <copy todir="${catalina.build}/bin" file="${commons-launcher.bootstrap.class}"/>
       <copy todir="${catalina.build}/bin">
  @@ -527,7 +527,7 @@
   
   
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="build-static" depends="flags,flags.display,build-prepare,copy-fileupload.jar,copy-jmx.jar,copy-launcher.jars,copy-modeler.jar,copy-xerces2.jars">
  +  <target name="build-static" depends="flags,flags.display,build-prepare,copy-fileupload.jar,copy-launcher.jars,copy-modeler.jar">
   
       <!-- Executable Commands -->
       <copy todir="${catalina.build}/bin">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message