weaver 2004/02/27 09:55:04
Modified: components/registry maven.xml project.properties
components/rdbms project.properties
components/persistence project.properties maven.xml
components/jetspeed project.properties
components/prefs project.properties maven.xml
Log:
removed all HSQL specific references from the project.
Building will now require the user to start the test HSQL server for "allBuild"
and the production server for inatallProductionDb and any deployment goals
Revision Changes Path
1.8 +14 -50 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 24 Feb 2004 17:26:15 -0000 1.7
+++ maven.xml 27 Feb 2004 17:55:03 -0000 1.8
@@ -5,6 +5,12 @@
<!-- Target of maven test:single test -->
<property name='testcase'
value='org.apache.jetspeed.components.TestComponentManager'/>
+
+ <preGoal name="test:test">
+ <!-- Create a DB for or tests -->
+ <attainGoal name="db.recreate"/>
+ </preGoal>
+
<goal name="deployJar">
<attainGoal name="jar:install"/>
@@ -26,11 +32,11 @@
<!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
<!-- ================================================================ -->
<goal name="db.execute">
- <sql driver="${database.default.driver}"
+ <sql driver="${org.apache.jetspeed.database.driver}"
classpathref="maven.dependency.classpath"
- url="${database.default.url}"
- userid="${database.default.username}"
- password="${database.default.password}"
+ url="${org.apache.jetspeed.database.url}"
+ userid="${org.apache.jetspeed.database.user}"
+ password="${org.apache.jetspeed.database.password}"
src="${database.arg.script}">
</sql>
</goal>
@@ -66,58 +72,16 @@
<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.create.server">
- <j:set var="database.default.url" value="jdbc:hsqldb:hsql://127.0.0.1:9001" />
- <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.drop.server">
- <j:set var="database.default.url" value="jdbc:hsqldb:hsql://127.0.0.1:9001" />
- <attainGoal name="db.drop" />
- </goal>
-
- <goal name="db.test.recreate">
- <attainGoal name="db.test.drop" />
- <attainGoal name="db.test.create" />
- </goal>
-
- <goal name="db.test.recreate.server">
- <attainGoal name="db.test.drop.server" />
- <attainGoal name="db.test.create.server" />
- </goal>
-
- <goal name="deployJar">
+
+ <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>
-
- <goal name="build.registry.server">
- <attainGoal name="db.recreate"/>
- <attainGoal name="db.test.recreate.server"/>
+ <goal name="build.registry">
<attainGoal name="ojb.registry"/>
<attainGoal name="jar:install"/>
- </goal>
-
+ </goal>
</project>
1.3 +12 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 24 Feb 2004 00:48:04 -0000 1.2
+++ project.properties 27 Feb 2004 17:55:03 -0000 1.3
@@ -3,7 +3,7 @@
# Display the date on the Maven web site
maven.xdoc.date = left
-
+
# Display the maven version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
@@ -12,7 +12,14 @@
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
+
+# Sets up the system properties for the test JDBC datasource
+maven.junit.sysproperties=org.apache.jetspeed.database.url \
+org.apache.jetspeed.database.driver \
+org.apache.jetspeed.database.user \
+org.apache.jetspeed.database.password
+
+org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.database.user = sa
+org.apache.jetspeed.database.password =
\ No newline at end of file
1.2 +12 -1 jakarta-jetspeed-2/components/rdbms/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/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 27 Feb 2004 17:55:04 -0000 1.2
@@ -9,4 +9,15 @@
maven.checkstyle.properties=${basedir}/../checkstyle.properties
-maven.compile.deprecation=on
\ No newline at end of file
+maven.compile.deprecation=on
+
+# Sets up the system properties for the test JDBC datasource
+maven.junit.sysproperties=org.apache.jetspeed.database.url \
+org.apache.jetspeed.database.driver \
+org.apache.jetspeed.database.user \
+org.apache.jetspeed.database.password
+
+org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.database.user = sa
+org.apache.jetspeed.database.password =
\ No newline at end of file
1.2 +14 -1 jakarta-jetspeed-2/components/persistence/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 22 Feb 2004 22:47:56 -0000 1.1
+++ project.properties 27 Feb 2004 17:55:04 -0000 1.2
@@ -9,4 +9,17 @@
maven.checkstyle.properties=${basedir}/../checkstyle.properties
-maven.compile.deprecation=on
\ No newline at end of file
+maven.compile.deprecation=on
+
+database.default.name=hsql
+
+# Sets up the system properties for the test JDBC datasource
+maven.junit.sysproperties=org.apache.jetspeed.database.url \
+org.apache.jetspeed.database.driver \
+org.apache.jetspeed.database.user \
+org.apache.jetspeed.database.password
+
+org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.database.user = sa
+org.apache.jetspeed.database.password =
\ No newline at end of file
1.2 +1 -0 jakarta-jetspeed-2/components/persistence/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 22 Feb 2004 22:47:56 -0000 1.1
+++ maven.xml 27 Feb 2004 17:55:04 -0000 1.2
@@ -6,6 +6,7 @@
<!-- Target of maven test:single test -->
<property name='testcase'
value='org.apache.jetspeed.components.TestComponentManager'/>
+
<goal name="deployJar">
<attainGoal name="jar:install"/>
1.2 +12 -1 jakarta-jetspeed-2/components/jetspeed/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 21 Feb 2004 03:51:33 -0000 1.1
+++ project.properties 27 Feb 2004 17:55:04 -0000 1.2
@@ -9,4 +9,15 @@
maven.checkstyle.properties=${basedir}/../checkstyle.properties
-maven.compile.deprecation=on
\ No newline at end of file
+maven.compile.deprecation=on
+
+# Sets up the system properties for the test JDBC datasource
+maven.junit.sysproperties=org.apache.jetspeed.database.url \
+org.apache.jetspeed.database.driver \
+org.apache.jetspeed.database.user \
+org.apache.jetspeed.database.password
+
+org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.database.user = sa
+org.apache.jetspeed.database.password =
\ No newline at end of file
1.2 +12 -1 jakarta-jetspeed-2/components/prefs/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 26 Feb 2004 04:31:12 -0000 1.1
+++ project.properties 27 Feb 2004 17:55:04 -0000 1.2
@@ -15,4 +15,15 @@
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
+database.default.password=
+
+# Sets up the system properties for the test JDBC datasource
+maven.junit.sysproperties=org.apache.jetspeed.database.url \
+org.apache.jetspeed.database.driver \
+org.apache.jetspeed.database.user \
+org.apache.jetspeed.database.password
+
+org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.database.user = sa
+org.apache.jetspeed.database.password =
\ No newline at end of file
1.2 +8 -23 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 26 Feb 2004 04:31:12 -0000 1.1
+++ maven.xml 27 Feb 2004 17:55:04 -0000 1.2
@@ -5,6 +5,8 @@
<!-- Target of maven test:single test -->
<property name='testcase' value='org.apache.jetspeed.prefs.TestPreferences'/>
+
+
<!-- ================================================================ -->
<!-- Set System properties for junit -->
<!-- ================================================================ -->
@@ -38,11 +40,11 @@
<!-- TODO: I'd like to implement this as a plugin or use commons SQL -->
<!-- ================================================================ -->
<goal name="db.execute">
- <sql driver="${database.default.driver}"
+ <sql driver="${org.apache.jetspeed.database.driver}"
classpathref="maven.dependency.classpath"
- url="${database.default.url}"
- userid="${database.default.username}"
- password="${database.default.password}"
+ url="${org.apache.jetspeed.database.url}"
+ userid="${org.apache.jetspeed.database.user}"
+ password="${org.apache.jetspeed.database.password}"
src="${database.arg.script}">
</sql>
</goal>
@@ -73,26 +75,9 @@
<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">
+ <goal name="deployJar">
<attainGoal name="jar:install"/>
<copy file="${basedir}/target/${maven.final.name}.jar"
todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
