weaver 2004/02/23 16:36:36
Modified: components/rdbms/src/java/org/apache/jetspeed/containers
rdbms.container.groovy
Log:
now checks to see where the db really should be (a maven req)
Revision Changes Path
1.2 +10 -2
jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers/rdbms.container.groovy
Index: rdbms.container.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers/rdbms.container.groovy,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rdbms.container.groovy 23 Feb 2004 16:42:59 -0000 1.1
+++ rdbms.container.groovy 24 Feb 2004 00:36:36 -0000 1.2
@@ -11,6 +11,7 @@
import org.picocontainer.defaults.ConstantParameter
import org.picocontainer.ComponentAdapter
import org.picocontainer.defaults.ConstructorComponentAdapter
+import java.io.File
// WARNING!!!!!!
// DO NOT use {Class}.class as it appears to be broken in Groovy
@@ -23,7 +24,14 @@
container = new DefaultPicoContainer()
// This is the HSQL engine that holds the test registry
-container.registerComponentInstance(new HSQLServerComponent(9001,
"sa","","../../portal/test/db/hsql/Registry",false, true))
+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")
@@ -32,7 +40,7 @@
// 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", 5, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
+container.registerComponentInstance(dsClass, new DBCPDatasourceComponent("sa","",
"org.hsqldb.jdbcDriver", "jdbc:hsqldb:hsql://127.0.0.1", 20, 5000,
GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
