mpoeschl 2002/05/31 11:14:39
Modified: . project.xml build.xml
Log:
fix build
- fix jar names
- fix source path
- load torque templates from classpath
Revision Changes Path
1.34 +5 -5 jakarta-turbine-fulcrum/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 30 May 2002 21:02:28 -0000 1.33
+++ project.xml 31 May 2002 18:14:39 -0000 1.34
@@ -82,19 +82,19 @@
<name>bsf</name>
<type>required</type>
<version>2.2</version>
- <jar>bsf.jar</jar>
+ <jar>bsf-2.2.jar</jar>
</dependency>
<dependency>
<name>commons-collections</name>
<type>required</type>
- <version>1.0</version>
- <jar>commons-collections.jar</jar>
+ <version>2.0</version>
+ <jar>commons-collections-2.0.jar</jar>
</dependency>
<dependency>
<name>commons-codec</name>
<type>required</type>
<version>1.0</version>
- <jar>commons-codec.jar</jar>
+ <jar>commons-codec-1.0-dev.jar</jar>
</dependency>
<dependency>
<name>commons-email</name>
@@ -142,7 +142,7 @@
<name>jakarta-regexp</name>
<type>required</type>
<version>1.3-dev</version>
- <jar>jakarta-regexp-1.3-dev.jar</jar>
+ <jar>regexp-1.3-dev.jar</jar>
</dependency>
<dependency>
<name>javamail</name>
1.55 +49 -51 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 7 May 2002 22:50:01 -0000 1.54
+++ build.xml 31 May 2002 18:14:39 -0000 1.55
@@ -13,83 +13,83 @@
<property file="project.properties" />
<!-- maven:start -->
-
+
<!-- ================================================================== -->
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
-
- <target
+
+ <target
name="maven:site">
<ant antfile="${maven.home}/build-docs.xml" target="site"/>
</target>
-
- <target
+
+ <target
name="maven:update-jars">
<ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
</target>
- <target
+ <target
name="maven:jar">
<ant antfile="${maven.home}/build-maven.xml" target="jar"/>
</target>
-
- <target
+
+ <target
name="maven:install-jar">
<ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
</target>
-
- <target
+
+ <target
name="maven:env">
<ant antfile="${maven.home}/build-maven.xml" target="env"/>
</target>
-
- <target
+
+ <target
name="maven:docs">
<ant antfile="${maven.home}/build-docs.xml" target="docs"/>
</target>
-
- <target
+
+ <target
name="maven:test">
<ant antfile="${maven.home}/build-test.xml" target="test"/>
</target>
-
- <target
+
+ <target
name="maven:clean" depends="clean">
<ant antfile="${maven.home}/build-maven.xml" target="clean"/>
</target>
-
- <target
+
+ <target
name="maven:metrics">
<ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
</target>
-
- <target
+
+ <target
name="maven:dist"
depends="maven:compile">
<ant antfile="${maven.home}/build-maven.xml" target="dist"/>
</target>
-
- <target
+
+ <target
name="maven:deploy-site">
<ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
</target>
-
- <target
+
+ <target
name="maven:gump-descriptor">
<ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
</target>
-
- <target
+
+ <target
name="maven:javadocs">
<ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
</target>
-
- <target
+
+ <target
name="maven:compile">
<ant antfile="${maven.home}/build-maven.xml" target="compile"/>
</target>
- <target
+ <target
name="maven:init">
<ant antfile="${maven.home}/build-maven.xml" target="init"/>
</target>
@@ -103,17 +103,17 @@
<!-- this will soon be moved into the security services build. -->
<target name="check-om">
-
- <property
+
+ <property
name="omStatusFile"
value="${maven.prepareSourceDirectory}/report.turbine.om.generation"
/>
-
+
<uptodate
property="omGenerated"
targetfile="${omStatusFile}">
- <srcfiles
- dir="."
+ <srcfiles
+ dir="."
includes="turbine-schema.xml"
/>
</uptodate>
@@ -125,9 +125,9 @@
<!-- Generate Turbine SQL schema for supported DBs -->
<!-- ================================================================ -->
- <target
+ <target
name="init">
-
+
<taskdef
name="create-classpath"
classname="org.apache.maven.ant.CreateClasspath">
@@ -135,7 +135,7 @@
<pathelement location="${lib.repo}/maven.jar"/>
</classpath>
</taskdef>
-
+
<create-classpath
listFile="jars.list"
reference="classpath"
@@ -149,28 +149,26 @@
</target>
- <target
+ <target
name="om"
depends="check-om"
unless="omGenerated"
description="--> generates the Turbine OM/Peer classes">
-
- <!--
+
+ <!--
We could create a fileset in the project to manage this
but we should really only have one source directory.
-->
-
+
<copy todir="${maven.prepareSourceDirectory}" overwrite="yes">
- <fileset dir="src/core"/>
- <fileset dir="src/services"/>
- <fileset dir="src/util"/>
+ <fileset dir="src/java"/>
</copy>
<antcall target="security-om"/>
<antcall target="scheduler-om"/>
</target>
- <target
+ <target
name="security-om"
depends="init">
@@ -182,21 +180,21 @@
file="${schemaDirectory}/turbine-schema.xml"
filtering="yes"
/>
-
+
<torque-om
contextProperties="project.properties"
controlTemplate="${OMControlTemplate}"
outputDirectory="${maven.prepareSourceDirectory}"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="report.turbine.om.generation"
targetPackage="${securityPackage}"
xmlFile="${maven.prepareSourceDirectory}/turbine-schema.xml"
targetDatabase="${database}"
/>
-
+
</target>
- <target
+ <target
name="scheduler-om"
depends="init">
@@ -206,12 +204,12 @@
file="${schemaDirectory}/scheduler-schema.xml"
filtering="yes"
/>
-
+
<torque-om
contextProperties="project.properties"
controlTemplate="${OMControlTemplate}"
outputDirectory="${maven.prepareSourceDirectory}"
- templatePath="${templatePath}"
+ useClasspath="true"
outputFile="report.turbine.scheduler.generation"
targetPackage="${schedulerPackage}"
xmlFile="${maven.prepareSourceDirectory}/scheduler-schema.xml"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
