prickett 2002/10/09 00:26:58
Modified: periodicity maven.xml project.xml
periodicity/conf/build build.torque.default.properties
build.torque.properties
Log:
Fixed axion get task to ignore errors and use the timestamp
Added a java compile postGoal to delete the om directory
Added a dependency on village version 1.5.3
Added a dependency on commons-lang 1.0-b1
Added a dependency on log4j 1.2.6
Added a dependency on commons-collections 2.0
Added a Unit Test Source Directory to the project
Added a Get Database Connection Test
Changed the value for torque.java.dir to src/java
Changed the torque.targetPackage to org.apache.commons.periodicity.om
Revision Changes Path
1.9 +9 -1 jakarta-commons-sandbox/periodicity/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 8 Oct 2002 01:14:32 -0000 1.8
+++ maven.xml 9 Oct 2002 07:26:58 -0000 1.9
@@ -21,12 +21,20 @@
<postGoal name="java:prepare-filesystem">
<mkdir dir="${maven.repo.local}/${periodicity.axion.db.name}/jars"/>
<get
src="http://www.ibiblio.org/maven/${periodicity.axion.db.name}/jars/${periodicity.axion.db.name}-${periodicity.axion.database.default.version}.jar";
-
dest="${maven.repo.local}/${periodicity.axion.db.name}/jars/${periodicity.axion.db.name}-${periodicity.axion.database.default.version}.jar"/>
+
dest="${maven.repo.local}/${periodicity.axion.db.name}/jars/${periodicity.axion.db.name}-${periodicity.axion.database.default.version}.jar"
+ ignoreerrors="true" usetimestamp="true"/>
</postGoal>
<preGoal name="java:compile">
<ant antfile="build-legacy.xml" target="om"/>
</preGoal>
+
+ <postGoal name="java:compile">
+ <delete>
+ <fileset dir="src/java/org/apache/commons/periodicity/om"
+ includes="**/*"/>
+ </delete>
+ </postGoal>
<goal name="view-derived-properties">
<echo>derived.db.url.scheme="${derived.db.url.scheme}"</echo>
1.8 +24 -1 jakarta-commons-sandbox/periodicity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 8 Oct 2002 01:14:32 -0000 1.7
+++ project.xml 9 Oct 2002 07:26:58 -0000 1.8
@@ -80,12 +80,35 @@
<id>axion</id>
<version>${periodicity.axion.database.version}</version>
</dependency>
+ <dependency>
+ <id>village</id>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <id>commons-lang</id>
+ <version>1.0-b1</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.6</version>
+ </dependency>
+ <dependency>
+ <id>commons-collections</id>
+ <version>2.0</version>
+ </dependency>
</dependencies>
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
- <sourceDirectory>${maven.build.dir}/generated_java_code</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+
<aspectSourceDirectory/>
<jars/>
</build>
1.2 +1 -1
jakarta-commons-sandbox/periodicity/conf/build/build.torque.default.properties
Index: build.torque.default.properties
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.torque.default.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.torque.default.properties 5 Oct 2002 01:35:57 -0000 1.1
+++ build.torque.default.properties 9 Oct 2002 07:26:58 -0000 1.2
@@ -50,7 +50,7 @@
torque.useClasspath = ${useClasspath}
torque.doc.dir = ${torque.output.dir}/doc
-torque.java.dir = ${torque.output.dir}/java
+torque.java.dir = src/java
torque.javadoc.dir = ${torque.output.dir}/javadoc
torque.ojb.dir = ${torque.output.dir}/ojb
torque.sql.dir = ${torque.output.dir}/sql
1.2 +1 -1
jakarta-commons-sandbox/periodicity/conf/build/build.torque.properties
Index: build.torque.properties
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/conf/build/build.torque.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.torque.properties 5 Oct 2002 01:35:57 -0000 1.1
+++ build.torque.properties 9 Oct 2002 07:26:58 -0000 1.2
@@ -90,7 +90,7 @@
# Still considered experimental.
# -------------------------------------------------------------------
-torque.targetPackage = org.apache.torque
+torque.targetPackage = org.apache.commons.periodicity.om
torque.addGetByNameMethod = true
torque.addIntakeRetrievable = false
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
