taylor 2004/02/29 10:25:46 Modified: portal maven.xml project.xml Log: Integrated Torque generated scripts into build subprojects no longer create ddl Revision Changes Path 1.53 +2 -55 jakarta-jetspeed-2/portal/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- maven.xml 29 Feb 2004 05:10:03 -0000 1.52 +++ maven.xml 29 Feb 2004 18:25:46 -0000 1.53 @@ -19,15 +19,12 @@ ignoreFailures="false"/> </preGoal> - <!-- Always rbuild the DB befure we test --> + <!-- Always rbuild the DB befure we test <preGoal name="test:test"> <attainGoal name="db.recreate" /> </preGoal> +--> - <preGoal name="test:single"> - <attainGoal name="db.recreate" /> - </preGoal> - <!-- <goal name="jaxb:portlet" description="Generate java classes from protlet API schema"> @@ -218,56 +215,6 @@ </java> </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="./src/sql/${database.default.name}/create-db-phase3-ojb.sql" /> - <attainGoal name="db.execute" /> - <j:set var="database.arg.script" value="./src/sql/${database.default.name}/create-db.sql" /> - <attainGoal name="db.execute" /> - <j:set var="database.arg.script" value="./src/sql/${database.default.name}/create-db-phase2.sql" /> - <attainGoal name="db.execute" /> - <j:set var="database.arg.script" value="./src/sql/${database.default.name}/create-prefs-schema.sql" /> - <attainGoal name="db.execute" /> - <j:set var="database.arg.script" value="./src/sql/${database.default.name}/populate-db-default.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="./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> - - <!-- ================================================================ --> <!-- Deploy to Catalina and Expand --> 1.43 +0 -2 jakarta-jetspeed-2/portal/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- project.xml 29 Feb 2004 05:10:03 -0000 1.42 +++ project.xml 29 Feb 2004 18:25:46 -0000 1.43 @@ -400,8 +400,6 @@ <!-- Excluded due to persistence plugin issues --> <exclude>org/apache/jetspeed/security/Test*.java</exclude> <!-- End Excluded due to persistence plugin issues --> - - <exclude>org/apache/jetspeed/spi/services/prefs/TestUtils.java</exclude> </excludes> <includes> <include>**/Test*.java</include>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]