taylor 2004/02/25 15:56:06
Modified: . maven.xml project.xml
portal/src/webapp/WEB-INF/db/hsql Registry.script
src/java/org/apache/jetspeed/dbutil HSQLServer.java
Log:
Added task "start.test.server" to start the Test HSQL server in its own JVM
Just leave this puppy up and running for unit testing
TODO: use different ports and dbs for "Unittest", "systemtest", and "prod"
Revision Changes Path
1.25 +12 -0 jakarta-jetspeed-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- maven.xml 25 Feb 2004 20:55:57 -0000 1.24
+++ maven.xml 25 Feb 2004 23:56:06 -0000 1.25
@@ -156,4 +156,16 @@
<echo message="maven.repo.local = ${maven.repo.local}" />
</goal>
+ <goal name="start.test.server">
+ <java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="yes">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <pathelement path="${maven.build.dest}"/>
+ </classpath>
+ <arg value="-database" />
+ <arg value="./portal/test/db/hsql/Registry" />
+ </java>
+ </goal>
+
+
</project>
1.6 +1 -0 jakarta-jetspeed-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 25 Feb 2004 20:55:57 -0000 1.5
+++ project.xml 25 Feb 2004 23:56:06 -0000 1.6
@@ -109,6 +109,7 @@
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
</build>
1.29 +1 -2
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script
Index: Registry.script
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Registry.script 25 Feb 2004 06:54:06 -0000 1.28
+++ Registry.script 25 Feb 2004 23:56:06 -0000 1.29
@@ -64,8 +64,8 @@
CREATE TABLE PREF_PROPERTY_VALUE(PROPERTY_VALUE_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_KEY_ID INTEGER,NODE_ID INTEGER,BOOLEAN_VALUE BIT,DATETIME_VALUE
TIMESTAMP,LONG_VALUE INTEGER,DOUBLE_VALUE DOUBLE,TEXT_VALUE VARCHAR(254),CREATION_DATE
TIMESTAMP,MODIFIED_DATE TIMESTAMP,CONSTRAINT PREF_PROPERTY_VALUE_FK_1 FOREIGN
KEY(NODE_ID) REFERENCES PREF_NODE(NODE_ID))
CREATE TABLE PREF_PROPERTY_KEY(PROPERTY_KEY_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_SET_DEF_ID INTEGER,PROPERTY_NAME VARCHAR(100),PROPERTY_TYPE
SMALLINT,CREATION_DATE TIMESTAMP,MODIFIED_DATE TIMESTAMP,CONSTRAINT
PREF_PROPERTY_KEY_FK_1 FOREIGN KEY(PROPERTY_SET_DEF_ID) REFERENCES
PREF_PROPERTY_SET_DEF(PROPERTY_SET_DEF_ID))
ALTER TABLE PREF_PROPERTY_VALUE ADD CONSTRAINT PREF_PROPERTY_VALUE_FK_2 FOREIGN
KEY(PROPERTY_KEY_ID) REFERENCES PREF_PROPERTY_KEY(PROPERTY_KEY_ID)
-GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
+GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
CREATE USER SA PASSWORD "" ADMIN
CREATE ALIAS DAYNAME FOR "org.hsqldb.Library.dayname"
CREATE ALIAS SPACE FOR "org.hsqldb.Library.space"
@@ -319,4 +319,3 @@
INSERT INTO PRINCIPAL_RULE_ASSOC VALUES('anon','j1')
INSERT INTO PREF_NODE VALUES(1,NULL,NULL,'',0,'/','2004-02-24
09:43:55.37','2004-02-24 09:43:55.37')
INSERT INTO PREF_NODE VALUES(2,NULL,NULL,'',1,'/','2004-02-24
09:43:55.46','2004-02-24 09:43:55.46')
-/*C2*/CONNECT USER sa PASSWORD ""
1.3 +19 -7
jakarta-jetspeed-2/src/java/org/apache/jetspeed/dbutil/HSQLServer.java
Index: HSQLServer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/src/java/org/apache/jetspeed/dbutil/HSQLServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HSQLServer.java 24 Feb 2004 16:28:59 -0000 1.2
+++ HSQLServer.java 25 Feb 2004 23:56:06 -0000 1.3
@@ -1,8 +1,17 @@
/*
- * Created on Feb 24, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Copyright 2000-2001,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.jetspeed.dbutil;
@@ -33,8 +42,11 @@
try
{
- new HSQLServerThread(args).start();
- Thread.sleep(3000);
+ System.out.println("Starting server: " + args[1]);
+ Thread hsql = new HSQLServerThread(args);
+ hsql.start();
+ System.out.println("Exiting HSQL");
+
}
catch (InterruptedException e)
{
@@ -81,7 +93,7 @@
*/
public void run()
{
- System.out.println("Starting HSQLDB server on localhost: " + args);
+ System.out.println("Starting HSQLDB server");
Server.main(args);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
