henning 2003/03/20 08:43:04
Modified: . maven.xml project.properties
Added: src/schema scheduler-schema.xml turbine-schema.xml
Removed: . turbine-schema.xml scheduler-schema.xml
Log:
- Move Schema files to src/schema
- Update maven.xml to resemble turbine-2 for building the peers
- Make maven.xml copy the intake.dtd into the distribution
Revision Changes Path
1.11 +58 -21 jakarta-turbine-fulcrum/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 12 Jan 2003 19:43:48 -0000 1.10
+++ maven.xml 20 Mar 2003 16:43:04 -0000 1.11
@@ -11,43 +11,80 @@
file="src/java/org/apache/fulcrum/avalon-roles.xml"
tofile="target/classes/org/apache/fulcrum/avalon-roles.xml"/>
+ <!-- Copy the Intake DTD file to the distribution -->
+ <copy file="intake.dtd"
+
tofile="${maven.build.dest}/org/apache/fulcrum/intake/transform/intake.dtd"/>
+
<!-- Setup where Torque generates the files to. -->
<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}"/>
+ <attainGoal name="scheduler-om"/>
+ <attainGoal name="db-security-om"/>
+
+ <!-- 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>
+
+ <!-- ================================================== -->
+ <!-- Prepare the OM Sources for Torque -->
+ <!-- ================================================== -->
+
+ <goal name="copy-om">
+ <attainGoal name="copy-scheduler-om"/>
+ <attainGoal name="copy-db-security-om"/>
+ </goal>
+
+ <goal name="copy-scheduler-om">
+ <filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
+ <filter token="EXTRA_USER_COLUMNS" value="${scheduler.extra.user.columns}"/>
+ <copy
+ file="src/schema/scheduler-schema.xml"
+ tofile="${torque.schema.dir}/scheduler-schema.xml"
+ filtering="yes"/>
+ </goal>
+
+ <goal name="copy-db-security-om">
<filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
<filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
<copy
- file="turbine-schema.xml"
+ file="src/schema/turbine-schema.xml"
tofile="${torque.schema.dir}/turbine-schema.xml"
filtering="yes"/>
- <attainGoal name="torque:om"/>
+ </goal>
- <!-- Reset the Torque uptodate check flag. -->
- <j:set var="torque.internal.om.uptodate" value="${null}"/>
+ <!-- ================================================== -->
+ <!-- Build Peers for the Scheduler -->
+ <!-- ================================================== -->
+ <goal name="scheduler-om">
+
+ <attainGoal name="copy-scheduler-om"/>
- <!-- 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"/>
<attainGoal name="torque:om"/>
- <!-- 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>
+ </goal>
+
+ <!-- ================================================== -->
+ <!-- Build Peers for Torque Security -->
+ <!-- ================================================== -->
+ <goal name="db-security-om">
+
+ <attainGoal name="copy-db-security-om"/>
+
+ <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}"/>
+ <attainGoal name="torque:om"/>
+
+ </goal>
+
</project>
1.10 +3 -5 jakarta-turbine-fulcrum/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.properties 12 Jan 2003 19:43:48 -0000 1.9
+++ project.properties 20 Mar 2003 16:43:04 -0000 1.10
@@ -13,17 +13,15 @@
#
# -------------------------------------------------------------------
-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
torque.runOnlyOnSchemaChange = true
-security.database.name = default
-security.package = org.apache.fulcrum.security.impl.db.entity
-
scheduler.database.name = default
scheduler.package = org.apache.fulcrum.schedule
+
+security.database.name = default
+security.package = org.apache.fulcrum.security.impl.db.entity
1.1 jakarta-turbine-fulcrum/src/schema/scheduler-schema.xml
Index: scheduler-schema.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd";>
<!-- ==================================================================== -->
<!-- -->
<!-- S C H E D U L E R T U R B I N E S C H E M A -->
<!-- -->
<!-- ==================================================================== -->
<!-- This is the the XML schema used by Torque to generate the necessary -->
<!-- sources used to create/initialize the Turbine scheduler service. -->
<!-- Torque will create the SQL for the database, and the Peer-based -->
<!-- Object Model. -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a> -->
<!-- @version $Id: scheduler-schema.xml,v 1.1 2003/03/20 16:43:04 henning Exp $ -->
<!-- ==================================================================== -->
<database name="@DATABASE_DEFAULT@">
<table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntry">
<column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="JOB_SECOND" javaName="Second" default="-1"
required="true" type="INTEGER"/>
<column name="JOB_MINUTE" javaName="Minute" default="-1"
required="true" type="INTEGER"/>
<column name="JOB_HOUR" javaName="Hour" default="-1"
required="true" type="INTEGER"/>
<column name="WEEK_DAY" default="-1" required="true" type="INTEGER"/>
<column name="DAY_OF_MONTH" default="-1" required="true" type="INTEGER"/>
<column name="TASK" required="true" size="99" type="VARCHAR"/>
<column name="EMAIL" size="99" type="VARCHAR"/>
<column name="JOB_PROPERTY" javaName="Property" type="VARBINARY"/>
</table>
</database>
1.1 jakarta-turbine-fulcrum/src/schema/turbine-schema.xml
Index: turbine-schema.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd";>
<!-- ==================================================================== -->
<!-- -->
<!-- B A S E T U R B I N E S C H E M A -->
<!-- -->
<!-- ==================================================================== -->
<!-- This is the the XML schema used by Torque to generate the necessary -->
<!-- sources used to create/initialize the base Turbine system. Torque -->
<!-- will create the SQL for the database required by Turbine, and the -->
<!-- Peer-based Object Model used by Turbine internally to manage -->
<!-- users and security. -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a> -->
<!-- @version $Id: turbine-schema.xml,v 1.1 2003/03/20 16:43:04 henning Exp $ -->
<!-- ==================================================================== -->
<database name="@DATABASE_DEFAULT@">
<table name="TURBINE_PERMISSION" idMethod="idbroker">
<column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="PERMISSION_NAME" required="true" size="99" type="VARCHAR"
javaName="Name"/>
<unique>
<unique-column name="PERMISSION_NAME"/>
</unique>
</table>
<table name="TURBINE_ROLE" idMethod="idbroker">
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="ROLE_NAME" required="true" size="99" type="VARCHAR"
javaName="Name"/>
<unique>
<unique-column name="ROLE_NAME"/>
</unique>
</table>
<table name="TURBINE_GROUP" idMethod="idbroker">
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="99"
javaName="Name"/>
<unique>
<unique-column name="GROUP_NAME"/>
</unique>
</table>
<table name="TURBINE_ROLE_PERMISSION">
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
<foreign-key foreignTable="TURBINE_ROLE">
<reference local="ROLE_ID" foreign="ROLE_ID"/>
</foreign-key>
<foreign-key foreignTable="TURBINE_PERMISSION">
<reference local="PERMISSION_ID" foreign="PERMISSION_ID"/>
</foreign-key>
</table>
<table name="TURBINE_USER" idMethod="idbroker">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="LOGIN_NAME" required="true" size="32" type="VARCHAR"
javaName="UserName"/>
<column name="PASSWORD_VALUE" required="true" size="32" type="VARCHAR"
javaName="Password"/>
<column name="FIRST_NAME" required="true" size="99" type="VARCHAR"/>
<column name="LAST_NAME" required="true" size="99" type="VARCHAR"/>
<column name="EMAIL" size="99" type="VARCHAR"/>
<column name="CONFIRM_VALUE" size="99" type="VARCHAR" javaName="Confirmed"/>
<column name="MODIFIED" type="TIMESTAMP"/>
<column name="CREATED" type="TIMESTAMP" javaName="CreateDate"/>
<column name="LAST_LOGIN" type="TIMESTAMP"/>
<column name="OBJECTDATA" type="VARBINARY"/>
@EXTRA_USER_COLUMNS@
<unique>
<unique-column name="LOGIN_NAME"/>
</unique>
</table>
<table name="TURBINE_USER_GROUP_ROLE">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<foreign-key foreignTable="TURBINE_USER">
<reference local="USER_ID" foreign="USER_ID"/>
</foreign-key>
<foreign-key foreignTable="TURBINE_GROUP">
<reference local="GROUP_ID" foreign="GROUP_ID"/>
</foreign-key>
<foreign-key foreignTable="TURBINE_ROLE">
<reference local="ROLE_ID" foreign="ROLE_ID"/>
</foreign-key>
</table>
</database>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
