leif 2003/05/28 23:15:06
Modified: datasource build.xml default.properties
Log:
Break the classes directory up so that each jar has its own directory. This is
necessary to get the collection of Meta data working correctly.
Revision Changes Path
1.51 +54 -8 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- build.xml 27 May 2003 15:13:20 -0000 1.50
+++ build.xml 29 May 2003 06:15:05 -0000 1.51
@@ -108,6 +108,8 @@
<target name="compile" depends="prepare, dependencies" description="Compiles
the source code">
<mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.classes.cluster}"/>
+ <mkdir dir="${build.classes.ids}"/>
<mkdir dir="${build.src}"/>
<!-- Compile all classes excluding the tests. -->
@@ -119,10 +121,30 @@
target="1.2">
<classpath refid="project.class.path" />
<include name="**/*.java"/>
+ <exclude name="**/cluster/*.java"/>
+ <exclude name="**/ids/*.java"/>
<exclude
name="org/apache/avalon/excalibur/datasource/J2eeDataSource.java"
unless="j2ee.present"/>
</javac>
+ <javac srcdir="${java.dir}"
+ destdir="${build.classes.cluster}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/cluster/*.java"/>
+ </javac>
+ <javac srcdir="${java.dir}"
+ destdir="${build.classes.ids}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/ids/*.java"/>
+ </javac>
<!-- generate fortress meta descriptors -->
<taskdef name="fortress-collect-meta"
@@ -131,17 +153,45 @@
</taskdef>
<fortress-collect-meta destdir="${build.classes}">
- <fileset dir="${java.dir}"/>
+ <fileset dir="${java.dir}">
+ <exclude name="**/cluster/*.java"/>
+ <exclude name="**/ids/*.java"/>
+ </fileset>
+ </fortress-collect-meta>
+ <fortress-collect-meta destdir="${build.classes.cluster}">
+ <fileset dir="${java.dir}">
+ <include name="**/cluster/*.java"/>
+ </fileset>
+ </fortress-collect-meta>
+ <fortress-collect-meta destdir="${build.classes.ids}">
+ <fileset dir="${java.dir}">
+ <include name="**/ids/*.java"/>
+ </fileset>
</fortress-collect-meta>
<!-- copy resources to same location as .class files -->
<copy todir="${build.classes}">
<fileset dir="${java.dir}">
<exclude name="**/*.java"/>
+ <exclude name="**/cluster/**"/>
+ <exclude name="**/ids/**"/>
+ <exclude name="**/package.html"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.classes.cluster}">
+ <fileset dir="${java.dir}">
+ <exclude name="**/*.java"/>
+ <include name="**/cluster/**"/>
+ <exclude name="**/package.html"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.classes.ids}">
+ <fileset dir="${java.dir}">
+ <exclude name="**/*.java"/>
+ <include name="**/ids/**"/>
<exclude name="**/package.html"/>
</fileset>
</copy>
-
</target>
<!-- Compiles the unit test source code -->
@@ -211,8 +261,6 @@
<attribute name="Implementation-Version" value="${package-version}"/>
</manifest>
<exclude name="**/test/**"/>
- <exclude name="**/cluster/**"/>
- <exclude name="**/ids/**"/>
<zipfileset dir="${build.conf}" prefix="META-INF/">
<include name="LICENSE.txt"/>
</zipfileset>
@@ -220,7 +268,7 @@
<!-- excalibur-datasource-clister jar -->
<jar jarfile="${build.lib}/${jar.cluster.name}"
- basedir="${build.classes}"
+ basedir="${build.classes.cluster}"
compress="${build.compress}">
<manifest>
<attribute name="Extension-Name" value="${name}"/>
@@ -229,7 +277,6 @@
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
<attribute name="Implementation-Version" value="${package-version}"/>
</manifest>
- <include name="**/cluster/**"/>
<zipfileset dir="${build.conf}" prefix="META-INF/">
<include name="LICENSE.txt"/>
</zipfileset>
@@ -237,7 +284,7 @@
<!-- excalibur-datasource-ids jar -->
<jar jarfile="${build.lib}/${jar.ids.name}"
- basedir="${build.classes}"
+ basedir="${build.classes.ids}"
compress="${build.compress}">
<manifest>
<attribute name="Extension-Name" value="${name}"/>
@@ -246,7 +293,6 @@
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
<attribute name="Implementation-Version" value="${package-version}"/>
</manifest>
- <include name="**/ids/**"/>
<zipfileset dir="${build.conf}" prefix="META-INF/">
<include name="LICENSE.txt"/>
</zipfileset>
1.31 +2 -0 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- default.properties 27 May 2003 15:13:20 -0000 1.30
+++ default.properties 29 May 2003 06:15:06 -0000 1.31
@@ -98,6 +98,8 @@
build.lib = ${build.dir}/lib
build.conf = ${build.dir}/conf
build.classes = ${build.dir}/classes
+build.classes.cluster = ${build.dir}/classes.cluster
+build.classes.ids = ${build.dir}/classes.ids
build.tests = ${build.dir}/tests
build.reports = ${build.dir}/reports
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
