geirm 01/05/10 21:13:18
Modified: build build.xml
Log:
support for changing from Configuration to ExtendedProperties from
commons.
No real diff other than adding the jar (versionless so we can update jar
w/o having to change build script... 6 of one, I guess...) and the
little section to extract only the .class from it that we need.
Revision Changes Path
1.32 +25 -6 jakarta-velocity/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 2001/04/24 17:52:29 1.31
+++ build.xml 2001/05/11 04:13:16 1.32
@@ -40,6 +40,7 @@
<property name="xerces.jar" value="lib/xerces-1.1.3.jar"/>
<property name="xalan.jar" value="lib/xalan_1_1_D01.jar"/>
<property name="junit.jar" value="lib/junit-3.2.jar"/>
+ <property name="collections.jar" value="lib/commons-collections.jar" />
<!-- Forum demo build information -->
<property name="demo.base" value="../examples/forumdemo"/>
@@ -230,14 +231,34 @@
</target>
+
+ <!-- ================================================================ -->
+ <!-- Gets the classes we need from Jakarta Commons collections -->
+ <!-- ================================================================ -->
+ <target name="collections-support">
+
+ <unzip src="${collections.jar}" dest="${build.dest}" />
+
+ <!-- we only want one file right now, the ExtendedProperties -->
+ <!-- keep jars svelte... -->
+
+ <delete>
+ <fileset dir="${build.dest}">
+ <include name="org/apache/commons/collections/*.class" />
+ <exclude name="org/apache/commons/collections/ExtendedProperties.class" />
+ </fileset>
+ </delete>
+
+ </target>
+
<!-- =================================================================== -->
<!-- Compiles the source directory and creates a .jar file -->
<!-- =================================================================== -->
- <target name="jar" depends="compile">
+ <target name="jar" depends="compile, collections-support">
<unzip src="${log.jar}" dest="${build.dest}"/>
<unzip src="${oro.jar}" dest="${build.dest}"/>
-
+
<delete dir="${build.dest}/meta-inf" quiet="true"/>
<jar jarfile="${build.dir}/${project}-${version}.jar">
@@ -255,13 +276,11 @@
<!-- Compiles the source directory and creates a .jar file of all -->
<!-- source AND code that requires j2ee (ex. DataSourceResourceLoader) -->
<!-- =================================================================== -->
- <target name="jar-j2ee" depends="compile-j2ee" if="J2EE.present">
+ <target name="jar-j2ee" depends="compile-j2ee, collections-support"
if="J2EE.present">
<unzip src="${log.jar}" dest="${build.dest}"/>
<unzip src="${oro.jar}" dest="${build.dest}"/>
- <delete dir="${build.dest}/meta-inf" quiet="true"/>
-
<jar jarfile="${build.dir}/${project}-j2ee-${version}.jar"
basedir="${build.dest}"
excludes="**/package.html"
@@ -272,7 +291,7 @@
<!-- =================================================================== -->
<!-- Compiles the source directory and creates a .jar file -->
<!-- =================================================================== -->
- <target name="jar-core" depends="compile">
+ <target name="jar-core" depends="compile, collections-support">
<unzip src="${log.jar}" dest="${build.dest}"/>
