remm 2004/09/01 03:10:49
Modified: . build.xml
jasper2 build.xml
coyote build.xml
catalina/src/conf catalina.properties
catalina build.xml
webapps/admin build.xml
Log:
- Update packaging with new i18n bundles.
- The release targets are not up to date with that yet.
Revision Changes Path
1.203 +66 -7 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- build.xml 29 Aug 2004 18:14:40 -0000 1.202
+++ build.xml 1 Sep 2004 10:10:48 -0000 1.203
@@ -198,9 +198,9 @@
<property name="jk.build" value="${tomcat.build}"/>
+ <!--
<property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
<property name="tomcat-jk2.jar"
value="${tomcat.build}/server/lib/tomcat-ajp.jar" />
- <!--
<property name="tomcat-jk.jar"
value="${tomcat.build}/server/lib/tomcat-jk.jar" />
<property name="tomcat-jkconfig.jar"
value="${tomcat.build}/server/lib/jkconfig.jar" />
<property name="tomcat-jkshm.jar"
value="${tomcat.build}/server/lib/jkshm.jar" />
@@ -212,6 +212,17 @@
<copy file="${jtc.home}/jk/conf/jk2.properties"
todir="${tomcat.build}/conf" />
+ <!-- Protocol handlers - AJP -->
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/jk/**" />
+ <exclude name="org/apache/jk/ant/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
</target>
<target name="build-tomcatcoyote"
@@ -223,11 +234,26 @@
<property name="catalina.home" value="${tomcat.build}"/>
<property name="build.home" value="${tomcat.build}"/>
<property name="tomcat5.detect" value="true"/>
+ <!--
<property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
+ -->
<property name="tomcat-util.jar"
value="${tomcat.build}/server/lib/tomcat-util.jar"/>
<property name="servlet.jar" value="${servlet-api.jar}"/>
</ant>
+
+ <!-- Coyote API -->
+ <delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar" index="true">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/coyote/*" />
+ <include name="org/apache/coyote/memory/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
</target>
<target name="build-tomcathttp11"
@@ -237,10 +263,23 @@
<ant dir="${jtc.home}/http11" target="compile-only">
<property name="build.home" value="${tomcat.build}"/>
+ <!--
<property name="tomcat-http11.jar"
value="${tomcat.build}/server/lib/tomcat-http11.jar"/>
<property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
+ -->
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
</ant>
+
+ <!-- Protocol handlers - HTTP -->
+ <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar" index="true">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/coyote/http11/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
</target>
<target name="build-jasper"
@@ -466,6 +505,8 @@
<antcall target="build-jasper"/>
+ <antcall target="build-i18n"/>
+
<!-- Correct permissions and line endings on "bin" scripts -->
<fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/>
<fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/>
@@ -473,6 +514,30 @@
</target>
+ <target name="build-i18n">
+
+ <!-- i18n JARs -->
+ <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-es.jar">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="**/LocalStrings_es.properties" />
+ <exclude name="**/tomcat4/**" />
+ </fileset>
+ </jar>
+ <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-fr.jar">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="**/LocalStrings_fr.properties" />
+ <exclude name="**/tomcat4/**" />
+ </fileset>
+ </jar>
+ <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-ja.jar">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="**/LocalStrings_ja.properties" />
+ <exclude name="**/tomcat4/**" />
+ </fileset>
+ </jar>
+
+ </target>
+
<!-- ====================== Build dependent code =================== -->
<!--
@@ -747,7 +812,6 @@
<copy todir="embed/lib" file="${commons-modeler.jar}"/>
<copy todir="embed/lib" file="${commons-beanutils.jar}"/>
<copy todir="embed/lib" file="${commons-collections.jar}"/>
- <copy todir="embed/lib" file="${regexp.jar}"/>
<copy todir="embed/lib" file="${jasper-compiler-jdt.jar}"/>
@@ -1764,11 +1828,6 @@
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-fileupload.loc}"/>
<param name="destfile" value="${commons-fileupload.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${regexp.loc}"/>
- <param name="destfile" value="${regexp.jar}"/>
</antcall>
<antcall target="downloadgz">
1.30 +6 -0 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 31 Aug 2004 23:52:59 -0000 1.29
+++ build.xml 1 Sep 2004 10:10:48 -0000 1.30
@@ -147,6 +147,9 @@
<exclude name="org/apache/jasper/Constants.class" />
<exclude name="org/apache/jasper/JasperException.class" />
<include name="org/apache/jasper/*.class" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
@@ -160,6 +163,9 @@
<include name="org/apache/jasper/runtime/**" />
<include name="org/apache/jasper/security/**" />
<include name="org/apache/jasper/util/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
1.30 +1 -4 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 17 Aug 2004 03:16:59 -0000 1.29
+++ build.xml 1 Sep 2004 10:10:48 -0000 1.30
@@ -223,9 +223,6 @@
<classpath refid="compile.classpath"/>
<include name="org/apache/coyote/tomcat5/**" />
</javac>
- <copy todir="${build.home}/classes" filtering="on">
- <fileset dir="${source.home}" excludes="**/*.java"/>
- </copy>
</target>
<target name="jar.tomcat5" depends="static,compile.shared,compile.tomcat5" >
1.11 +1 -1 jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
Index: catalina.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- catalina.properties 18 May 2004 16:33:24 -0000 1.10
+++ catalina.properties 1 Sep 2004 10:10:48 -0000 1.11
@@ -29,7 +29,7 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.home}/common/classes,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar
+common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar
#
# List of comma-separated paths defining the contents of the "server"
1.69 +58 -27 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- build.xml 31 Aug 2004 23:52:39 -0000 1.68
+++ build.xml 1 Sep 2004 10:10:48 -0000 1.69
@@ -518,7 +518,18 @@
<copy todir="${catalina.build}/common/lib" file="${commons-pool.jar}"/>
</target>
<target name="copy-tomcat-util.jar">
+ <!--
<copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
+ -->
+ <jar jarfile="${tomcat-util.jar}"
+ index="true">
+ <fileset dir="${catalina.build}/classes">
+ <include name="org/apache/tomcat/util/**"/>
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
</target>
<target name="copy-xerces2.jars">
<copy todir="${catalina.build}/common/endorsed" file="${xercesImpl.jar}"/>
@@ -558,7 +569,9 @@
file="src/temp/README.txt"/>
<!-- Catalina Server Libraries -->
+ <!--
<copy todir="${catalina.build}/server/lib" file="${regexp.jar}"/>
+ -->
</target>
@@ -655,8 +668,10 @@
<property name="jmx.jar" value="${jmx.jar}"/>
</ant>
+ <!--
<copy todir="${catalina.deploy}/server/lib"
file="${tomcat-coyote.jar}"/>
+ -->
</target>
@@ -671,8 +686,10 @@
<property name="jmx.jar" value="${jmx.jar}"/>
</ant>
+ <!--
<copy tofile="${catalina.deploy}/server/lib/tomcat-ajp.jar"
file="${tomcat-jk2.jar}"/>
+ -->
<copy todir="${catalina.deploy}/conf"
file="${jk2.properties}"/>
@@ -687,9 +704,10 @@
<property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
<property name="jmx.jar" value="${jmx.jar}"/>
</ant>
-
+ <!--
<copy todir="${catalina.deploy}/server/lib"
file="${tomcat-http11.jar}"/>
+ -->
</target>
@@ -805,6 +823,7 @@
<mkdir dir="${catalina.deploy}/logs"/>
<mkdir dir="${catalina.deploy}/common/classes"/>
<mkdir dir="${catalina.deploy}/common/endorsed"/>
+ <mkdir dir="${catalina.deploy}/common/i18n"/>
<mkdir dir="${catalina.deploy}/common/lib"/>
<mkdir dir="${catalina.deploy}/server/classes"/>
<mkdir dir="${catalina.deploy}/server/lib"/>
@@ -878,6 +897,10 @@
<include name="org/apache/catalina/launcher/CatalinaLaunchFilter.class" />
<include name="org/apache/naming/JndiPermission.class" />
<include name="org/apache/tomcat/util/compat/*" />
+
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
@@ -889,7 +912,8 @@
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/**" />
- <include name="org/apache/coyote/tomcat5/**" />
+ <include name="org/apache/catalina/servlets/Constants.class" />
+ <include name="org/apache/catalina/servlets/LocalStrings.properties" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
@@ -965,31 +989,24 @@
<include name="org/apache/catalina/valves/RequestDumperValve.class" />
<include name="org/apache/catalina/valves/RequestFilterValve.class" />
- </fileset>
- </jar>
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
- <!-- i18n JARs -->
- <jar jarfile="${catalina.deploy}/server/lib/catalina-i18n-es.jar">
- <fileset dir="${classes.dir}">
- <include name="**/LocalStrings_es.properties" />
- </fileset>
- </jar>
- <jar jarfile="${catalina.deploy}/server/lib/catalina-i18n-fr.jar">
- <fileset dir="${classes.dir}">
- <include name="**/LocalStrings_fr.properties" />
- </fileset>
- </jar>
- <jar jarfile="${catalina.deploy}/server/lib/catalina-i18n-ja.jar">
- <fileset dir="${classes.dir}">
- <include name="**/LocalStrings_ja.properties" />
</fileset>
</jar>
<!-- Catalina Ant Tasks JAR File -->
<jar jarfile="${catalina.deploy}/server/lib/catalina-ant.jar">
<fileset dir="${classes.dir}">
- <include name="org/apache/catalina/ant/**" />
+
+ <include name="org/apache/catalina/ant/**" />
<include name="org/apache/catalina/util/Base64.class" />
+
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+
</fileset>
</jar>
@@ -1004,6 +1021,11 @@
<!--
<exclude name="org/apache/naming/JndiPermission.class" />
-->
+
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+
</fileset>
</jar>
@@ -1012,6 +1034,9 @@
<jar jarfile="${catalina.deploy}/common/lib/naming-java.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/java/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
@@ -1022,21 +1047,24 @@
<include name="org/apache/naming/factory/**" />
<exclude name="org/apache/naming/factory/Constants.class" />
<exclude name="org/apache/naming/factory/ResourceLinkFactory.class" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
<!-- Naming - Resources JAR File -->
<jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">
<fileset dir="${classes.dir}">
+ <include name="org/apache/naming/NameParserImpl.class" />
+ <include
name="org/apache/naming/NamingContextBindingsEnumeration.class" />
+ <include name="org/apache/naming/NamingContextEnumeration.class" />
+ <include name="org/apache/naming/NamingEntry.class" />
+ <include name="org/apache/naming/StringManager.class" />
<include name="org/apache/naming/resources/*" />
- </fileset>
- </jar>
-
- <!-- Servlets - Common Files -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-common.jar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/servlets/Constants.class" />
- <include name="org/apache/catalina/servlets/*.properties" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
@@ -1065,6 +1093,9 @@
<jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar"
index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/ssi/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
</fileset>
</jar>
1.14 +1 -0 jakarta-tomcat-catalina/webapps/admin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 16 Aug 2004 23:31:25 -0000 1.13
+++ build.xml 1 Sep 2004 10:10:48 -0000 1.14
@@ -189,6 +189,7 @@
<copy
tofile="${webapps.build}/${webapp.name}/WEB-INF/lib/commons-collections.jar"
file="${commons-collections.jar}"/>
<copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib"
file="${commons-digester.jar}"/>
+ <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${regexp.jar}"/>
<copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
