taylor 2004/02/29 10:25:26
Modified: components/prefs maven.xml
components/registry maven.xml
Log:
Integrated Torque generated scripts into build
subprojects no longer create DDL
Revision Changes Path
1.4 +0 -45 jakarta-jetspeed-2/components/prefs/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 28 Feb 2004 16:35:43 -0000 1.3
+++ maven.xml 29 Feb 2004 18:25:26 -0000 1.4
@@ -20,49 +20,6 @@
<copy file="${basedir}/src/java/repository_prefs.xml"
tofile="${basedir}/../../portal/target/test-classes/repository_prefs.xml"/>
</goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE a DB SCRIPT -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.execute">
- <sql driver="${org.apache.jetspeed.database.driver}"
- classpathref="maven.dependency.classpath"
- url="${org.apache.jetspeed.database.url}"
- userid="${org.apache.jetspeed.database.user}"
- password="${org.apache.jetspeed.database.password}"
- src="${database.arg.script}">
- </sql>
- </goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE CREATE DB SQL SCRIPTS -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.create">
- <j:set var="database.arg.script"
value="${basedir}/src/sql/${database.default.name}/create-db.sql" />
- <attainGoal name="db.execute" />
- </goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE DROP DB SQL SCRIPTS -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.drop">
- <j:set var="database.arg.script"
value="${basedir}/src/sql/${database.default.name}/drop-db.sql" />
- <attainGoal name="db.execute" />
- </goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE RECREATE DB SQL SCRIPTS -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.recreate">
- <attainGoal name="db.drop" />
- <attainGoal name="db.create" />
- </goal>
-
-
<goal name="deployJar">
<attainGoal name="jar:install"/>
@@ -70,8 +27,6 @@
</goal>
<goal name="build_registry">
- <attainGoal name="db.recreate"/>
- <attainGoal name="db.test.recreate"/>
<attainGoal name="ojb.registry"/>
<attainGoal name="jar:install"/>
</goal>
1.10 +2 -48 jakarta-jetspeed-2/components/registry/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 29 Feb 2004 06:01:54 -0000 1.9
+++ maven.xml 29 Feb 2004 18:25:26 -0000 1.10
@@ -3,11 +3,11 @@
xmlns:define="jelly:define"
xmlns:reactor="reactor">
+<!--
<preGoal name="test:test">
- <!-- Create a DB for or tests -->
<attainGoal name="db.recreate"/>
</preGoal>
-
+-->
<goal name="deployJar">
<attainGoal name="jar:install"/>
@@ -22,52 +22,6 @@
<copy file="${basedir}/src/java/repository_registry.xml"
tofile="${basedir}/../../portal/src/java/repository_registry.xml"/>
<!-- <copy file="${basedir}/src/java/repository_registry.xml"
tofile="${basedir}/../../portal/src/test/repository_registry.xml"/> -->
</goal>
-
-
- <!-- ================================================================ -->
- <!-- EXECUTE a DB SCRIPT -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.execute">
- <sql driver="${org.apache.jetspeed.database.driver}"
- classpathref="maven.dependency.classpath"
- url="${org.apache.jetspeed.database.url}"
- userid="${org.apache.jetspeed.database.user}"
- password="${org.apache.jetspeed.database.password}"
- src="${database.arg.script}">
- </sql>
- </goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE CREATE DB SQL SCRIPTS -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.create">
- <j:set var="database.arg.script"
value="${basedir}/src/sql/${database.default.name}/create-db.sql" />
- <attainGoal name="db.execute" />
- <j:set var="database.arg.script"
value="${basedir}/../../portal/src/sql/${database.default.name}/create-db-phase3-ojb.sql"
/>
- <attainGoal name="db.execute" />
- </goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE DROP DB SQL SCRIPTS -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.drop">
- <j:set var="database.arg.script"
value="${basedir}/src/sql/${database.default.name}/drop-db.sql" />
- <attainGoal name="db.execute" />
- <j:set var="database.arg.script"
value="${basedir}/../../portal/src/sql/${database.default.name}/drop-db.sql" />
- <attainGoal name="db.execute" />
- </goal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE RECREATE DB SQL SCRIPTS -->
- <!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
- <!-- ================================================================ -->
- <goal name="db.recreate">
- <attainGoal name="db.drop" />
- <attainGoal name="db.create" />
- </goal>
<goal name="deployJar">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
