quintonm 2003/02/13 14:24:38
Modified: . project.properties maven.xml project.xml
Log:
The build process will now use the torque plugin
to generate the OM classes for the scheduler. This
only works if you are using maven beta-8 though...
Revision Changes Path
1.13 +0 -4 jakarta-turbine-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.properties 29 Jan 2003 17:51:48 -0000 1.12
+++ project.properties 13 Feb 2003 22:24:37 -0000 1.13
@@ -42,7 +42,3 @@
scheduler.database.name = default
scheduler.package=org.apache.turbine.services.schedule
-
-# The next line should not be needed. I just could not get the torque plugin
-# working correctly without them!!!!
-torque.targetPackage = ${scheduler.package}
1.5 +1 -4 jakarta-turbine-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 29 Jan 2003 17:51:48 -0000 1.4
+++ maven.xml 13 Feb 2003 22:24:38 -0000 1.5
@@ -16,7 +16,6 @@
</postGoal>
- <!-- This goal will be comments out until it is working properly.
<preGoal name="java:compile">
<copy todir="target/src">
@@ -25,8 +24,7 @@
<j:set var="torque.project" value="scheduler"/>
<j:set var="torque.schema.om.includes" value="scheduler-schema.xml"/>
- <j:set var="torque.targetPackage" value="test"/>
- <j:set var="targetPackage" value="test"/>
+ <j:set var="torque.targetPackage" value="${scheduler.package}"/>
<filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
<filter token="EXTRA_USER_COLUMNS" value="${scheduler.extra.user.columns}"/>
<copy
@@ -36,6 +34,5 @@
<attainGoal name="torque:om"/>
</preGoal>
- -->
</project>
1.98 +1 -3 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- project.xml 12 Feb 2003 16:30:51 -0000 1.97
+++ project.xml 13 Feb 2003 22:24:38 -0000 1.98
@@ -613,7 +613,7 @@
</dependencies>
<build>
- <sourceDirectory>src/java</sourceDirectory>
+ <sourceDirectory>target/src</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
@@ -625,9 +625,7 @@
<integrationUnitTestSourceDirectory/>
<integrationUnitTest/>
<aspectSourceDirectory/>
- <testResources/>
- <jars/>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
