morciuch 2004/04/05 07:59:45
Modified: . project.xml project.properties maven.xml
Log:
Torque generation for Maven build - work in progress (see issue JS1-452).
The sources get generated but will not yet compile.
Revision Changes Path
1.30 +2 -2 jakarta-jetspeed/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 17 Mar 2004 20:04:40 -0000 1.29
+++ project.xml 5 Apr 2004 14:59:44 -0000 1.30
@@ -48,7 +48,7 @@
portal and also syndicate your own content.
</description>
<url>http://jakarta.apache.org/jetspeed/</url>
-
<issueTrackingUrl>http://nagoya.apache.org/bugzilla/index.html</issueTrackingUrl>
+
<issueTrackingUrl>http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10493</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/jetspeed/</siteDirectory>
<repository>
@@ -320,7 +320,7 @@
</dependency>
<dependency>
<id>torque</id>
- <version>3.0</version>
+ <version>3.1</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
1.9 +24 -0 jakarta-jetspeed/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/project.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.properties 29 Aug 2003 18:37:20 -0000 1.8
+++ project.properties 5 Apr 2004 14:59:45 -0000 1.9
@@ -30,3 +30,27 @@
maven.ui.banner.foreground = #fff
maven.ui.banner.border.top = #36c
maven.ui.banner.border.bottom = #36c
+
+# -------------------------------------------------------------------
+#
+# Torque Preferences
+#
+# -------------------------------------------------------------------
+
+schemaDirectory = ${maven.src.dir}/torque-schema
+torque.useClasspath = true
+torque.basePrefix = Base
+torque.addSaveMethod = true
+torque.addGetByNameMethod = true
+torque.complexObjectModel = true
+torque.addTimeStamp=true
+torque.addIntakeRetrievable=false
+
+project = jetspeed
+database = hypersonic
+#targetPackage = org.apache.jetspeed.om.torque
+torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
+torque.database.url = jdbc:hsqldb:hsql://localhost
+torque.database.driver = org.hsqldb.jdbcDriver
+torque.database.user = sa
+torque.database.password =
1.7 +26 -1 jakarta-jetspeed/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 17 Mar 2004 20:04:40 -0000 1.6
+++ maven.xml 5 Apr 2004 14:59:45 -0000 1.7
@@ -86,5 +86,30 @@
<exclude name="**/*.properties.merge"/>
</fileset>
</copy>
- </goal>
+ </goal>
+ <!-- ================================================================== -->
+ <!--C R E A T E T O R Q U E O M -->
+ <!-- ================================================================== -->
+ <preGoal name="java:compile">
+ <attainGoal name="torque:om"/>
+ </preGoal>
+ <!-- ================================================================== -->
+ <!--C L E A N - U P T O R Q U E O M -->
+ <!-- ================================================================== -->
+ <preGoal name="clean">
+ <delete failonerror="false">
+ <fileset dir="${maven.src.dir}/java"
includes="**/*.generation"/>
+ <fileset
dir="${maven.src.dir}/java/org/apache/jetspeed/om/apps/coffees">
+ <exclude name="CVS"/>
+ <exclude name="**.html"/>
+ <include name="**.java"/>
+ </fileset>
+ <fileset
dir="${maven.src.dir}/java/org/apache/jetspeed/om/apps/turbine">
+ <exclude name="CVS"/>
+ <exclude name="**.html"/>
+ <include name="**.java"/>
+ </fileset>
+ </delete>
+ <!-- Also, need to delete selected sources from security/turbine and
dbpsml folders -->
+ </preGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
