You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/02/24 16:43:02 UTC
cvs commit: jakarta-jetspeed-2 project.properties project.xml maven.xml
weaver 2004/02/24 07:43:02
Modified: . project.properties project.xml maven.xml
Log:
- Added pre and post goals for allBuild that start and stop the HSQL server
Revision Changes Path
1.4 +8 -0 jakarta-jetspeed-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 14 Jan 2004 03:58:50 -0000 1.3
+++ project.properties 24 Feb 2004 15:43:02 -0000 1.4
@@ -10,3 +10,11 @@
maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/
+
+database.test.name=hsql
+database.test.driver=org.hsqldb.jdbcDriver
+database.test.url=jdbc:hsqldb:hsql://127.0.0.1:9001
+database.test.username=sa
+database.test.password=
+
+
1.4 +13 -2 jakarta-jetspeed-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 10 Jan 2004 04:38:01 -0000 1.3
+++ project.xml 24 Feb 2004 15:43:02 -0000 1.4
@@ -96,12 +96,23 @@
</developers>
- <dependencies/>
+ <dependencies>
+ <!-- Used for pre-starting the DB prior to tests -->
+ <dependency>
+ <id>hsqldb</id>
+ <version>1.7.1</version>
+ <properties>
+ <war.bundle.jar>false</war.bundle.jar>
+ </properties>
+ </dependency>
+
+ </dependencies>
<build>
<nagEmailAddress>david@bluesunrise.com</nagEmailAddress>
- <!--
+
<sourceDirectory>src/java</sourceDirectory>
+ <!--
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<aspectSourceDirectory></aspectSourceDirectory>
-->
1.20 +45 -3 jakarta-jetspeed-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.xml 24 Feb 2004 00:54:20 -0000 1.19
+++ maven.xml 24 Feb 2004 15:43:02 -0000 1.20
@@ -73,7 +73,7 @@
<maven:reactor
basedir="${basedir}/components/registry"
includes="project.xml"
- goals="build_registry"
+ goals="build.registry.server"
banner="Build and Install the Regsitry Components jar"
postProcessing="false"
ignoreFailures="false"/>
@@ -95,7 +95,7 @@
<maven:reactor
basedir="${basedir}"
includes="services/security/project.xml"
- goals="db.recreate,db.test.recreate,jar:install,ojb.registry"
+ goals="db.recreate,db.test.recreate.server,jar:install,ojb.registry"
banner="Build and Install the services - security jar"
postProcessing="false"
ignoreFailures="false"/>
@@ -104,7 +104,7 @@
<maven:reactor
basedir="${basedir}"
includes="portal/project.xml"
- goals="db.recreate,db.test.recreate,war:install"
+ goals="db.recreate,db.test.recreate.server,war:install"
banner="Build and Install the Portlet WAR"
postProcessing="false"
ignoreFailures="false"/>
@@ -148,5 +148,47 @@
postProcessing="false"
ignoreFailures="false"/>
</goal>
+
+ <preGoal name="allBuild">
+ <!-- Make sure that the org.apache.jetspeed.dbutil.HSQLServer
+ - is compiled.
+ -->
+ <attainGoal name="java:compile" />
+ <echo message="====================================" />
+ <echo message="Starting HSQL server for testing " />
+ <echo message="====================================" />
+ <!-- Test DB -->
+ <java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="true" >
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}"/>
+ </classpath>
+ <arg value="-database" />
+ <arg value="portal/test/db/hsql/Registry" />
+ <arg value="-port" />
+ <arg value="9001" />
+ <arg value="-no_system_exit" />
+ <arg value="true" />
+ <arg value="-silent" />
+ <arg value="true" />
+ <arg value="-trace" />
+ <arg value="false" />
+ </java>
+
+ </preGoal>
+
+ <postGoal name="allBuild">
+ <echo message="====================================" />
+ <echo message=" Stopping HSQL server " />
+ <echo message="====================================" />
+ <sql driver="${database.test.driver}"
+ classpathref="maven.dependency.classpath"
+ url="${database.test.url}"
+ userid="${database.test.username}"
+ password="${database.test.password}">
+ <!-- SQL command to shut down the server -->
+ SHUTDOWN
+ </sql>
+ </postGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org