weaver 2004/02/27 09:50:01
Modified: components/registry/src/java/org/apache/jetspeed/containers
registry.container.groovy
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.2 +6 -11
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/containers/registry.container.groovy
Index: registry.container.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/containers/registry.container.groovy,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- registry.container.groovy 24 Feb 2004 00:39:25 -0000 1.1
+++ registry.container.groovy 27 Feb 2004 17:50:01 -0000 1.2
@@ -38,16 +38,6 @@
-// This is the HSQL engine that holds the test registry
-if(new File("../../portal/test/db/hsql").exists())
-{
- container.registerComponentInstance(new HSQLServerComponent(9001,
"sa","","../../portal/test/db/hsql/Registry",false, true))
-}
-else
-{
- container.registerComponentInstance(new HSQLServerComponent(9001,
"sa","","./portal/test/db/hsql/Registry",false, true))
-}
-
// This JNDI component helps us publish the datasource
Class jndiClass = Class.forName("org.apache.jetspeed.components.jndi.JNDIComponent")
Class tyrexJndiClass =
Class.forName("org.apache.jetspeed.components.jndi.TyrexJNDIComponent")
@@ -55,7 +45,12 @@
// Create a datasource based on the HSQL server we just created
Class dsClass =
Class.forName("org.apache.jetspeed.components.datasource.DatasourceComponent")
-container.registerComponentInstance(dsClass, new DBCPDatasourceComponent("sa","",
"org.hsqldb.jdbcDriver", "jdbc:hsqldb:hsql://127.0.0.1", 20, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
+String url = System.getProperty("org.apache.jetspeed.database.url")
+String driver = System.getProperty("org.apache.jetspeed.database.driver")
+String user = System.getProperty("org.apache.jetspeed.database.user")
+String password = System.getProperty("org.apache.jetspeed.database.password")
+
+container.registerComponentInstance(dsClass, new DBCPDatasourceComponent(user,
password, driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
//
// Persistence
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
