You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by st...@apache.org on 2003/01/12 20:43:48 UTC
cvs commit: jakarta-turbine-fulcrum project.properties maven.xml
stephenh 2003/01/12 11:43:48
Modified: . project.properties maven.xml
Log:
Fixed to re-add the functionality of only generating om classes after a schema change.
Revision Changes Path
1.9 +4 -2 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.properties 12 Jan 2003 04:01:39 -0000 1.8
+++ project.properties 12 Jan 2003 19:43:48 -0000 1.9
@@ -8,8 +8,9 @@
#
# T O R Q U E C O N F I G U R A T I O N
#
-# used to generate the om/peer classes for the Turbine-db-security
-# system
+# used to generate the om/peer classes for the security db
+# implementation and scheduler
+#
# -------------------------------------------------------------------
torque.jar = torque-3.0.jar
@@ -19,6 +20,7 @@
torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
torque.contextProperties = project.properties
torque.useClasspath = true
+torque.runOnlyOnSchemaChange = true
security.database.name = default
security.package = org.apache.fulcrum.security.impl.db.entity
1.10 +14 -7 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 12 Jan 2003 04:01:39 -0000 1.9
+++ maven.xml 12 Jan 2003 19:43:48 -0000 1.10
@@ -12,11 +12,12 @@
tofile="target/classes/org/apache/fulcrum/avalon-roles.xml"/>
<!-- Setup where Torque generates the files to. -->
- <copy todir="target/src" overwrite="yes">
+ <copy todir="target/src">
<fileset dir="src/java"/>
</copy>
<!-- Now generate the security service. -->
+ <j:set var="torque.project" value="security"/>
<j:set var="torque.schema.om.includes" value="turbine-schema.xml"/>
<j:set var="torque.targetPackage" value="${security.package}"/>
<filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
@@ -24,23 +25,29 @@
<copy
file="turbine-schema.xml"
tofile="${torque.schema.dir}/turbine-schema.xml"
- filtering="yes"
- overwrite="yes"/>
+ filtering="yes"/>
<attainGoal name="torque:om"/>
+ <!-- Reset the Torque uptodate check flag. -->
+ <j:set var="torque.internal.om.uptodate" value="${null}"/>
+
<!-- Now generate the scheduler service. -->
+ <j:set var="torque.project" value="scheduler"/>
<j:set var="torque.schema.om.includes" value="scheduler-schema.xml"/>
<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
file="scheduler-schema.xml"
tofile="${torque.schema.dir}/scheduler-schema.xml"
- filtering="yes"
- overwrite="yes"/>
+ filtering="yes"/>
<attainGoal name="torque:om"/>
- <j:set var="sourcesPresent" value="true"/>
- <path id="maven.compile.src.set" location="target/src"/>
+ <!-- Hack for Maven bug when compiling with a clean target. -->
+ <j:if test="${sourcesPresent != 'true'}">
+ <j:set var="sourcesPresent" value="true"/>
+ <path id="maven.compile.src.set" location="target/src"/>
+ </j:if>
</preGoal>
</project>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>