jericho 2002/07/28 03:20:34
Modified: . build.xml
Log:
- Make possible to change in build.properties file.
it means, defined xxx.lib
- Change the jaxp path to ./lib by default.
Revision Changes Path
1.169 +41 -29 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- build.xml 17 Jul 2002 13:52:20 -0000 1.168
+++ build.xml 28 Jul 2002 10:20:34 -0000 1.169
@@ -29,35 +29,48 @@
<property name="project" value="jakarta-slide" />
<property name="final.name" value="${project}-${version}" />
<property name="final-src.name" value="${project}-src-${version}" />
- <property name="testsuite.name"
value="${project}-webdav-testsuite-${version}" />
+ <property name="testsuite.name"
+ value="${project}-webdav-testsuite-${version}" />
<!-- =================================================================== -->
<!-- Dependencies Properties -->
<!-- =================================================================== -->
- <property name="servlet.home"
- value="../jakarta-servletapi/" />
- <property name="servlet.jar"
- value="${servlet.home}/lib/servlet.jar" />
- <property name="jdom.jar" value="./lib/jdom-dev.jar"/>
- <property name="jaxp.home" value="../jaxp"/>
- <property name="xmlapi.jar" value="${jaxp.home}/crimson.jar"/>
- <property name="xmlparser.jar" value="${jaxp.home}/crimson.jar"/>
- <property name="jaxp.jar" value="${jaxp.home}/jaxp.jar"/>
- <property name="ant.home" value="../jakarta-ant/dist"/>
- <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
- <property name="junit.jar" value="./lib/junit.jar"/>
- <property name="jndi.jar" value="./lib/jndi.jar"/>
- <property name="jta.jar" value="./lib/jta.jar"/>
- <property name="jdbc20ext.jar" value="./lib/jdbc2_0-stdext.jar"/>
- <property name="log4j.jar" value="./lib/log4j.jar"/>
- <property name="hsqldb.jar" value="./lib/hsqldb.jar"/>
+ <property name="servlet.lib" value="./lib"/>
+ <property name="servlet.jar" value="${servlet.lib}/servlet.jar"/>
+ <property name="jdom.lib" value="./lib"/>
+ <property name="jdom.jar" value="${jdom.lib}/jdom-dev.jar"/>
+ <property name="jaxp.lib" value="./lib"/>
+ <property name="xmlapi.jar" value="${jaxp.lib}/crimson.jar"/>
+ <property name="xmlparser.jar" value="${jaxp.lib}/crimson.jar"/>
+ <property name="jaxp.jar" value="${jaxp.lib}/jaxp.jar"/>
+ <property name="ant.lib" value="../ant/lib"/>
+ <property name="ant.jar" value="${ant.lib}/ant.jar"/>
+ <property name="junit.lib" value="./lib"/>
+ <property name="junit.jar" value="${junit.lib}/junit.jar"/>
+ <property name="jndi.lib" value="./lib"/>
+ <property name="jndi.jar" value="${jndi.lib}/jndi.jar"/>
+ <property name="jta.lib" value="./lib"/>
+ <property name="jta.jar" value="${jta.lib}/jta.jar"/>
+ <property name="jdbc20ext.lib" value="./lib"/>
+ <property name="jdbc20ext.jar"
+ value="${jdbc20ext.lib}/jdbc2_0-stdext.jar"/>
+ <property name="log4j.lib" value="./lib"/>
+ <property name="log4j.jar" value="${log4j.lib}/log4j.jar"/>
+ <property name="hsqldb.lib" value="./lib"/>
+ <property name="hsqldb.jar" value="${hsqldb.lib}/hsqldb.jar"/>
<property name="hsqldb.license" value="./lib/hsqldb.license"/>
<property name="antlr.jar" value="./lib/antlr.jar"/>
<property name="antlr-tools.jar" value="./lib/antlr-tools.jar"/>
- <property name="commons-dbcp.jar" value="./lib/commons-dbcp.jar"/>
- <property name="commons-pool.jar" value="./lib/commons-pool.jar"/>
- <property name="commons-modeler.jar" value="./lib/commons-modeler.jar"/>
+ <property name="commons-dbcp.lib" value="./lib"/>
+ <property name="commons-dbcp.jar"
+ value="${commons-dbcp.lib}/commons-dbcp.jar"/>
+ <property name="commons-pool.lib" value="./lib"/>
+ <property name="commons-pool.jar"
+ value="${commons-pool.lib}/commons-pool.jar"/>
+ <property name="commons-modeler.lib" value="./lib"/>
+ <property name="commons-modeler.jar"
+ value="${commons-pool.lib}/commons-modeler.jar"/>
<property name="catalina.dist" value="../jakarta-tomcat-4.0/dist" />
<property name="naming.jar"
value="${catalina.dist}/common/lib/naming-common.jar"/>
@@ -65,13 +78,11 @@
value="${catalina.dist}/common/lib/naming-resources.jar"/>
<property name="catalina.jar"
value="${catalina.dist}/server/lib/catalina.jar"/>
- <property name="struts.home" value="../jakarta-struts/dist"/>
- <property name="struts.lib" value="${struts.home}/lib"/>
+ <property name="struts.lib" value="../jakarta-struts/dist/lib"/>
<property name="struts.jar" value="${struts.lib}/struts.jar"/>
- <property name="jstl.home"
+ <property name="jstl.lib"
value="../jakarta-taglibs/dist/standard"/>
- <property name="jstl.jar"
- value="${jstl.home}/standard.jar"/>
+ <property name="jstl.jar" value="${jstl.lib}/standard.jar"/>
<property name="commons-httpclient.jar"
value="lib/commons-httpclient.jar"/>
@@ -83,7 +94,8 @@
<property name="slide.dist" value="./dist" />
<property name="webdavclient.build" value="${slide.build}/client" />
<property name="webdavclient.dist" value="${slide.dist}/client" />
- <property name="testsuite.dist" value="${slide.dist}/webdav-testsuite" />
+ <property name="testsuite.dist"
+ value="${slide.dist}/webdav-testsuite" />
<property name="webapp.dist" value="${slide.dist}/slide/webapp" />
<property name="slide.archive" value="./${final.name}" />
<property name="slide-src.archive" value="./${final-src.name}" />
@@ -1362,7 +1374,7 @@
<target name="jmx-wrapper" depends="wrappers" if="jmx.present">
<copy file="src/wrappers/jmx/mbeans-descriptors.xml"
- tofile="${slide.build}/classes/wrappers/jmx//mbeans-descriptors.xml" />
+ tofile="${slide.build}/classes/wrappers/jmx/mbeans-descriptors.xml" />
<jar jarfile="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF">
@@ -1498,7 +1510,7 @@
<include name="slide-taglib-struts.jar"/>
<include name="slide-taglib-common.jar"/>
</zipfileset>
- <zipfileset dir="${struts.home}/lib" prefix="WEB-INF/lib">
+ <zipfileset dir="${struts.lib}" prefix="WEB-INF/lib">
<include name="struts.jar"/>
</zipfileset>
</war>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
