jfarcand 2003/03/13 13:00:29
Modified: . build.xml
catalina build.xml
Log:
Try to fix the build.xml. I have commented out some ant call for now. Will review it
later tonigh. Two bug fixed:
- commons-loggings where not copied at the right place
- the conf/* was not copied
Now it build/starts. Please review or revert :-)
Revision Changes Path
1.103 +2 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- build.xml 13 Mar 2003 19:32:56 -0000 1.102
+++ build.xml 13 Mar 2003 21:00:29 -0000 1.103
@@ -10,7 +10,6 @@
<!-- If not set explicitely in one of the user overrides, set it here
-->
- <property name="base.path" location="../repository" />
<property file="build.properties.default"/>
@@ -442,6 +441,8 @@
<property name="commons-logging.jar"
location="${tomcat.build}/server/lib/commons-logging.jar" />
<property name="build.home" value="${tomcat.build}" />
</ant>
+ <move todir="${tomcat.build}/common/lib/"
file="${tomcat.build}/commons-logging-api.jar" />
+ <move todir="${tomcat.build}/server/lib/"
file="${tomcat.build}/commons-logging.jar"/>
</target>
<target name="build-commons-modeler" unless="commons-modeler.build.notrequired" >
1.46 +3 -1 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.xml 13 Mar 2003 19:24:07 -0000 1.45
+++ build.xml 13 Mar 2003 21:00:29 -0000 1.46
@@ -557,7 +557,9 @@
<chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
<!-- Common Extensions -->
+<!--
<copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
+-->
<copy todir="${catalina.build}/common/lib"
file="${commons-collections.jar}"/>
@@ -900,7 +902,7 @@
<!-- ====================== DEPLOY: Create Catalina JARs ================ -->
- <target name="catalina-jars"
depends="deploy-prepare,flags,flags.display,build-catalina"
+ <target name="catalina-jars"
depends="build-static,deploy-prepare,flags,flags.display,build-catalina"
description="Build catalina jars">
<!-- Catalina Bootstrap JAR File -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
