weaver 2003/12/04 11:12:24
Modified: cornerstone-demo/registry/implementation/cornerstone.dataSource
hsqldb-standalone.reg.properties
cornerstone-demo maven.xml project.xml
Log:
added persistence demo to maven build.
Changed the hsqldb-standalone.reg.properties to correctly locate the test HSql DB
Revision Changes Path
1.2 +1 -1
jakarta-jetspeed-2/cornerstone-demo/registry/implementation/cornerstone.dataSource/hsqldb-standalone.reg.properties
Index: hsqldb-standalone.reg.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/cornerstone-demo/registry/implementation/cornerstone.dataSource/hsqldb-standalone.reg.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hsqldb-standalone.reg.properties 2 Dec 2003 17:46:53 -0000 1.1
+++ hsqldb-standalone.reg.properties 4 Dec 2003 19:12:24 -0000 1.2
@@ -1,6 +1,6 @@
_.instance.className=org.apache.cornerstone.framework.persistence.datasource.BaseDataSource
_.instance.isSingleton=true
driver.className=org.hsqldb.jdbcDriver
-connection.url=jdbc:hsqldb:../hsqldb/data/test
+connection.url=jdbc:hsqldb:./hsqldb/data/test
connection.userName=sa
connection.password=
1.2 +36 -11 jakarta-jetspeed-2/cornerstone-demo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone-demo/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 2 Dec 2003 17:46:52 -0000 1.1
+++ maven.xml 4 Dec 2003 19:12:24 -0000 1.2
@@ -1,22 +1,37 @@
-<project default="run-demo"
+<project default="run-all-demos"
xmlns:j="jelly:core"
xmlns:define="jelly:define"
xmlns:reactor="reactor">
-
- <goal name="run-demo">
-
- <attainGoal name="jar:jar" />
- <!-- Merge standard runtime and demo into same directory -->
+ <preGoal name="demo-1">
+ <!-- Merge standard runtime and demo into same directory -->
+ <copy todir="${maven.build.dir}/runtime">
+ <fileset dir="${CORNERSTONE_RUNTIME_HOME}"/>
+ </copy>
+ <copy todir="${maven.build.dir}/runtime/registry">
+ <fileset dir="${basedir}/registry"/>
+ </copy>
+ </preGoal>
+
+ <preGoal name="demo-persistence">
+ <!-- Merge standard runtime and demo into same directory -->
<copy todir="${maven.build.dir}/runtime">
<fileset dir="${CORNERSTONE_RUNTIME_HOME}"/>
</copy>
<copy todir="${maven.build.dir}/runtime/registry">
<fileset dir="${basedir}/registry"/>
</copy>
-
-
- <java classname="org.apache.cornerstone.framework.demo.main.DemoMain"
fork="yes">
+ </preGoal>
+
+
+ <goal name="run-all-demos">
+ <attainGoal name="jar:jar" />
+ <attainGoal name="demo-1" />
+ <attainGoal name="demo-persistence" />
+ </goal>
+
+ <goal name="demo-1">
+ <java classname="org.apache.cornerstone.framework.demo.main.DemoMain"
fork="yes">
<sysproperty key="log4j.configuration" value="log4j.properties"/>
<sysproperty key="CORNERSTONE_RUNTIME_HOME"
value="${basedir}/target/runtime"/>
<classpath>
@@ -24,8 +39,18 @@
<pathelement path="${maven.build.dir}/${jar.name}"/>
</classpath>
</java>
-
- </goal>
+ </goal>
+
+ <goal name="demo-persistence">
+ <java
classname="org.apache.cornerstone.framework.demo.main.DemoPersistence" fork="yes">
+ <sysproperty key="log4j.configuration" value="log4j.properties"/>
+ <sysproperty key="CORNERSTONE_RUNTIME_HOME"
value="${basedir}/target/runtime"/>
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dir}/${jar.name}"/>
+ </classpath>
+ </java>
+ </goal>
1.2 +16 -0 jakarta-jetspeed-2/cornerstone-demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cornerstone-demo/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 2 Dec 2003 17:46:52 -0000 1.1
+++ project.xml 4 Dec 2003 19:12:24 -0000 1.2
@@ -46,6 +46,22 @@
</properties>
</dependency>
+ <dependency>
+ <id>hsqldb</id>
+ <version>1.7.1</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ <properties>
+ <war.bundle.jar>false</war.bundle.jar>
+ </properties>
+ </dependency>
+
<dependency>
<id>junit</id>
<version>3.8.1</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
