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 05:01:39 UTC
cvs commit: jakarta-turbine-fulcrum maven.xml project.properties
stephenh 2003/01/11 20:01:39
Modified: . maven.xml project.properties
Log:
Moved maven.xml to use the Torque maven plugin (available from Torque's cvs, in src/maven-plugin, run 'maven plugin:install') and in the process removed all of the properties that are default and got Fulcrum to compile successfully with a clean target.
Revision Changes Path
1.9 +26 -128 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 9 Jan 2003 07:14:32 -0000 1.8
+++ maven.xml 12 Jan 2003 04:01:39 -0000 1.9
@@ -1,148 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<project
+ default="java:jar"
xmlns:j="jelly:core"
- xmlns:m="maven">
+ xmlns:m="jelly:maven">
- <postGoal name="java:compile">
+ <preGoal name="java:compile">
+ <!-- Make sure avalon-roles.xml gets in the distribution. -->
<copy
file="src/java/org/apache/fulcrum/avalon-roles.xml"
- tofile="target/classes/org/apache/fulcrum/avalon-roles.xml"
- />
- </postGoal>
-
- <!-- ================================================================== -->
- <!-- T O R Q U E G E N E R A T I O N P R E G O A L -->
- <!-- ================================================================== -->
- <!-- This preGoal is executed before the the compilation goal so that -->
- <!-- the sources for the security service and the scheduler. -->
- <!-- ================================================================== -->
-
- <preGoal name="java:compile">
-
- <attainGoal name="check-om"/>
-
- <path id="maven.compile.src.set">
- <pathelement location="${pom.build.SourceDirectory}"/>
- </path>
-
- <j:if test="${omGenerated != 'true'}">
-
- <echo>Generating sources ...</echo>
+ tofile="target/classes/org/apache/fulcrum/avalon-roles.xml"/>
- <!--
- 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">
+ <!-- Setup where Torque generates the files to. -->
+ <copy todir="target/src" overwrite="yes">
<fileset dir="src/java"/>
</copy>
- <attainGoal name="security-om"/>
- <attainGoal name="scheduler-om"/>
-
- </j:if>
-
- </preGoal>
-
- <!-- ================================================================== -->
- <!-- C H E C K O M -->
- <!-- ================================================================== -->
-
- <!-- this will soon be moved into the security services build. -->
-
- <goal name="check-om">
-
- <property
- name="omStatusFile"
- value="${maven.prepareSourceDirectory}/report.turbine.om.generation"
- />
-
- <j:set var="omGenerated" value="false"/>
-
- <uptodate
- property="omGenerated"
- targetfile="${omStatusFile}">
- <srcfiles
- dir="."
- includes="turbine-schema.xml"
- />
- </uptodate>
-
- </goal>
-
- <goal
- name="init-taskdef">
-
- <taskdef name="torque-om"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="maven.dependency.classpath"/>
- </taskdef>
-
- </goal>
-
- <goal
- name="security-om"
- prereqs="init-taskdef">
-
-<echo>
-+--------------------------------------------------------------------
-|
-| G E N E R A T I N G S E C U R I T Y S O U R C E S
-|
-+--------------------------------------------------------------------
-</echo>
-
+ <!-- Now generate the security service. -->
+ <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}"/>
- <!-- is there a way to load this from an xml file? -->
<filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
<copy
- todir="${maven.prepareSourceDirectory}"
- file="${schemaDirectory}/turbine-schema.xml"
+ file="turbine-schema.xml"
+ tofile="${torque.schema.dir}/turbine-schema.xml"
filtering="yes"
- />
-
- <torque-om
- contextProperties="project.properties"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${maven.prepareSourceDirectory}"
- useClasspath="true"
- outputFile="report.turbine.om.generation"
- targetPackage="${securityPackage}"
- xmlFile="${maven.prepareSourceDirectory}/turbine-schema.xml"
- targetDatabase="${database}"
- />
-
- </goal>
-
- <goal
- name="scheduler-om"
- prereqs="init-taskdef">
-
-<echo>
-+--------------------------------------------------------------------
-|
-| G E N E R A T I N G S C H E D U L E R S O U R C E S
-|
-+--------------------------------------------------------------------
-</echo>
+ overwrite="yes"/>
+ <attainGoal name="torque:om"/>
+ <!-- Now generate the scheduler service. -->
+ <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}"/>
<copy
- todir="${maven.prepareSourceDirectory}"
- file="${schemaDirectory}/scheduler-schema.xml"
+ file="scheduler-schema.xml"
+ tofile="${torque.schema.dir}/scheduler-schema.xml"
filtering="yes"
- />
-
- <torque-om
- contextProperties="project.properties"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${maven.prepareSourceDirectory}"
- useClasspath="true"
- outputFile="report.turbine.scheduler.generation"
- targetPackage="${schedulerPackage}"
- xmlFile="${maven.prepareSourceDirectory}/scheduler-schema.xml"
- />
+ overwrite="yes"/>
+ <attainGoal name="torque:om"/>
- </goal>
+ <j:set var="sourcesPresent" value="true"/>
+ <path id="maven.compile.src.set" location="target/src"/>
+ </preGoal>
</project>
1.8 +10 -42 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.properties 6 Jan 2003 20:49:19 -0000 1.7
+++ project.properties 12 Jan 2003 04:01:39 -0000 1.8
@@ -4,17 +4,6 @@
# display the date on the site
maven.xdoc.date = left
-# ------------------------------------------------------------------------
-# P R E P A R E S O U R C E S
-# ------------------------------------------------------------------------
-maven.delegatorBuildFile = build.xml
-maven.prepareSourceDirectory = target/src
-maven.prepareSourceTarget = om
-maven.jarResources.basedir = ${basedir}/target/src
-
-src.dir = src
-build.src = src/java
-
# -------------------------------------------------------------------
#
# T O R Q U E C O N F I G U R A T I O N
@@ -23,37 +12,16 @@
# system
# -------------------------------------------------------------------
-# FIXME: torque properties should be loaded from torque.dir
-# If you rename the jakarta-turbine-torque module after checkout,
-# you'll have to change this value.
-torque.dir = ${basedir}/../jakarta-turbine-torque
-
-database=mysql
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addIntakeRetrievable=true
-basePrefix=Base
-torque.saveException = Exception
-
-schemaDirectory=.
-
-outputDirectory=${build.src}/sql
-
-SQLControlTemplate = sql/base/Control.vm
-OMControlTemplate = om/Control.vm
-IntakeControlTemplate = intake/Control.vm
-ServiceControlTemplate = service/Control.vm
-idTableControlTemplate = sql/id-table/Control.vm
-DataDTDControlTemplate = data/Control.vm
-DataDumpControlTemplate = data/dump/Control.vm
-DataSQLControlTemplate = sql/load/Control.vm
-securityControlTemplate = sql/security/Control.vm
+torque.jar = torque-3.0.jar
+torque.database = mysql
+torque.java.dir = target/src
+torque.schema.dir = target
+torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
+torque.contextProperties = project.properties
+torque.useClasspath = true
-securityPackage=org.apache.fulcrum.security.impl.db.entity
-schedulerPackage=org.apache.fulcrum.schedule
security.database.name = default
-scheduler.database.name = default
-security.extra.user.columns=
+security.package = org.apache.fulcrum.security.impl.db.entity
-torque.retrievableInterface = org.apache.fulcrum.intake.Retrievable
+scheduler.database.name = default
+scheduler.package = org.apache.fulcrum.schedule
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>