weaver 2004/02/26 09:38:56
Modified: components/rdbms/src/java/org/apache/jetspeed/containers
rdbms.container.groovy
Log:
removed sys props override check, moved to the assembly script (more IoCish)
Revision Changes Path
1.3 +2 -8
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rdbms.container.groovy 24 Feb 2004 00:36:36 -0000 1.2
+++ rdbms.container.groovy 26 Feb 2004 17:38:56 -0000 1.3
@@ -24,14 +24,8 @@
container = new DefaultPicoContainer()
// 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))
-}
+container.registerComponentInstance(new HSQLServerComponent(9001, "sa","",
System.getProperty(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH),false, true))
+
// This JNDI component helps us publish the datasource
Class jndiClass = Class.forName("org.apache.jetspeed.components.jndi.JNDIComponent")
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
