weaver 2004/02/23 16:48:04
Modified: components/registry maven.xml project.xml project.properties
Log:
-additional deps.
-adopted same copy and db creation logic that was used in services/registry
Revision Changes Path
1.2 +80 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 22 Feb 2004 22:47:55 -0000 1.1
+++ maven.xml 24 Feb 2004 00:48:04 -0000 1.2
@@ -11,5 +11,85 @@
<copy file="${basedir}/target/${maven.final.name}.jar"
todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
+
+ <!-- ================================================================ -->
+ <!-- Merge OJB desriptor with Jetspeed main OJB descriptor
-->
+ <!-- ================================================================ -->
+ <goal name="ojb.registry">
+ <copy file="${basedir}/src/java/repository_registry.xml"
tofile="${basedir}/../../portal/target/classes/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="${database.default.driver}"
+ classpathref="maven.dependency.classpath"
+ url="${database.default.url}"
+ userid="${database.default.username}"
+ password="${database.default.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>
+
+ <!-- ================================================================ -->
+ <!-- TEST DB SQL SCRIPTS -->
+ <!-- ================================================================ -->
+ <goal name="db.test.create">
+ <j:set var="database.default.url"
value="jdbc:hsqldb:${basedir}/../../portal/test/db/hsql/Registry" />
+ <attainGoal name="db.create" />
+ </goal>
+
+ <goal name="db.test.drop">
+ <j:set var="database.default.url"
value="jdbc:hsqldb:${basedir}/../../portal/test/db/hsql/Registry" />
+ <attainGoal name="db.drop" />
+ </goal>
+
+ <goal name="db.test.recreate">
+ <attainGoal name="db.test.drop" />
+ <attainGoal name="db.test.create" />
+ </goal>
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar"
todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+ <goal name="build_registry">
+ <attainGoal name="db.recreate"/>
+ <attainGoal name="db.test.recreate"/>
+ <attainGoal name="ojb.registry"/>
+ <attainGoal name="jar:install"/>
+</goal>
</project>
1.3 +35 -3 jakarta-jetspeed-2/components/registry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 23 Feb 2004 13:17:11 -0000 1.2
+++ project.xml 24 Feb 2004 00:48:04 -0000 1.3
@@ -219,6 +219,34 @@
<war.bundle.jar>false</war.bundle.jar>
</properties>
</dependency>
+ <dependency>
+ <id>groovy</id>
+ <version>1.0-beta-4-snapshot</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>asm</id>
+ <version>1.4.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>jta</id>
+ <jar>jta1.0.1.jar</jar>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>tyrex</id>
+ <version>1.0.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
@@ -227,9 +255,7 @@
<includes>
<include>**/Test*.java</include>
</includes>
- <excludes>
- <exclude>**/TestRegistry.java</exclude>
- </excludes>
+
<resources>
<resource>
<directory>${basedir}/src/test</directory>
@@ -237,6 +263,12 @@
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
</resources>
</unitTest>
1.2 +7 -1 jakarta-jetspeed-2/components/registry/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 22 Feb 2004 22:47:55 -0000 1.1
+++ project.properties 24 Feb 2004 00:48:04 -0000 1.2
@@ -9,4 +9,10 @@
maven.checkstyle.properties=${basedir}/../checkstyle.properties
-maven.compile.deprecation=on
\ No newline at end of file
+maven.compile.deprecation=on
+
+database.default.name=hsql
+database.default.driver=org.hsqldb.jdbcDriver
+database.default.url=jdbc:hsqldb:${basedir}/../../portal/src/webapp/WEB-INF/db/hsql/Registry
+database.default.username=sa
+database.default.password=
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
