larryi 2003/01/25 19:05:33
Modified: . build.xml
Log:
Update commons-logging default version and add commons-modeler
properties. Pass commons-modeler to http11 build.
Update tomcat-ant.jar build to use one jar task. I had strange rename
problems in my gump build on WinXP when using two jar tasks.
Revision Changes Path
1.192 +17 -10 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- build.xml 22 Oct 2002 06:57:29 -0000 1.191
+++ build.xml 26 Jan 2003 03:05:31 -0000 1.192
@@ -88,7 +88,7 @@
<property name="commons-pool.lib" location="${commons-pool.home}/dist"/>
<property name="commons-pool.jar"
location="${commons-pool.lib}/commons-pool.jar"/>
- <property name="commons-logging.home"
location="${jakarta-commons}/commons-logging-1.0.1" />
+ <property name="commons-logging.home"
location="${jakarta-commons}/commons-logging-1.0.2" />
<property name="commons-logging.lib" location="${commons-logging.home}" />
<property name="commons-logging.jar"
location="${commons-logging.lib}/commons-logging-api.jar" />
@@ -96,6 +96,10 @@
<property name="commons-collections.lib"
location="${commons-collections.home}/dist"/>
<property name="commons-collections.jar"
location="${commons-collections.lib}/commons-collections.jar"/>
+ <property name="commons-modeler.home"
location="${jakarta-commons}/commons-modeler-1.0" />
+ <property name="commons-modeler.lib" location="${commons-modeler.home}" />
+ <property name="commons-modeler.jar"
location="${commons-modeler.lib}/commons-modeler.jar" />
+
<property name="jtc.http11.home" location="${jakarta-tomcat-connectors}/http11"/>
<property name="jtc.http11.lib" location="${jtc.http11.home}/build/lib"/>
@@ -386,10 +390,13 @@
<property name="tomcat33.home" value="${tomcat.build}"/>
</ant>
- <ant dir="${jakarta-tomcat-connectors}/http11" inheritAll="false" />
+ <ant dir="${jakarta-tomcat-connectors}/http11" inheritAll="false">
+ <property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
+ </ant>
<ant dir="${jakarta-tomcat-connectors}/jk" target="build-jk">
<property name="tomcat33.home" value="${tomcat.build}"/>
+ <property name="servlet-api.jar" value="${basedir}/${servlet22.jar}"/>
</ant>
</target>
@@ -743,14 +750,14 @@
</classpath>
</javac>
<mkdir dir="${tomcat.build}/ant" />
- <jar jarfile="${tomcat.build}/ant/tomcat-ant.jar"
- basedir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/ant/*.class" />
- </jar>
- <jar jarfile="${tomcat.build}/ant/tomcat-ant.jar"
- basedir="src/share/org/apache/tomcat/ant"
- update="yes">
- <include name="META-INF/*.properties" />
+
+ <jar jarfile="${tomcat.build}/ant/tomcat-ant.jar">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/tomcat/ant/*.class"/>
+ </fileset>
+ <fileset dir="src/share/org/apache/tomcat/ant">
+ <include name="META-INF/*.properties"/>
+ </fileset>
</jar>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
