weaver 2004/02/23 07:17:37
Modified: portal/src/webapp/WEB-INF/conf/test jetspeed.properties
portal/src/webapp/WEB-INF/conf jetspeed.properties
Log:
removed HSQL service
Revision Changes Path
1.13 +1 -43
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/test/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/test/jetspeed.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jetspeed.properties 23 Feb 2004 13:18:00 -0000 1.12
+++ jetspeed.properties 23 Feb 2004 15:17:37 -0000 1.13
@@ -14,48 +14,6 @@
# -------------------------------------------------------------------
log4j.file = /WEB-INF/conf/test/Log4j.properties
-# --------------------------------------------------------------------------
-# JNDI Support Service (Only needed if the current container does not support JNDI)
-#---------------------------------------------------------------------------
-services.JNDIService.classname=org.apache.jetspeed.cps.jndi.TyrexJNDIService
-services.JNDIService.earlyInit = true
-
-
-# --------------------------------------------------------------------------
-# HSQL Server (Only needed if you are using HSQL)
-#---------------------------------------------------------------------------
-services.HSQLDBServer.classname=org.apache.jetspeed.cps.hsql.HSQLDBServer
-services.HSQLDBServer.port=9001
-services.HSQLDBServer.user=sa
-services.HSQLDBServer.password=
-# Quiet logging from HSQL
-services.HSQLDBServer.silent=true
-# turn DB trace in HSQL
-services.HSQLDBServer.trace=false
-services.HSQLDBServer.db.path=../../test/db/hsql/Registry
-services.HSQLDBServer.earlyInit = true
-# use the below lines to setup HSQL within a JNDI pooled Datasource
-services.HSQLDBServer.use.jndi.datasource=true
-services.HSQLDBServer.jndi.datasource.name=jdbc/jetspeed
-services.HSQLDBServer.jndi.datasource.maxActive=25
-# When the pool is exhausted do 1 of the following
-# "grow" increases the pool size by 1
-# "fail" a "noSuchElementException" is thrown
-# "block" waits for a datasource to become available
-services.HSQLDBServer.jndi.datasource.when.exhausted=grow
-# The amount of time block while waiting for a released
-# object. Only used if "block" is specified
-# services.HSQLDBServer.jndi.datasource.max.block.wait=5000
-
-
-
-
-# -------------------------------------------------------------------
-# P E R S I S T E N C E
-# -------------------------------------------------------------------
-# Currently unneeded
-# services.PersistenceService.persistence.plugin.name=jetspeed-test
-
# -------------------------------------------------------------------
1.37 +1 -34
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jetspeed.properties 23 Feb 2004 13:17:47 -0000 1.36
+++ jetspeed.properties 23 Feb 2004 15:17:37 -0000 1.37
@@ -128,39 +128,6 @@
# services.JNDIService.earlyInit = true
-# --------------------------------------------------------------------------
-# HSQL Server (Only needed if you are using HSQL)
-#---------------------------------------------------------------------------
-services.HSQLDBServer.classname=org.apache.jetspeed.cps.hsql.HSQLDBServer
-services.HSQLDBServer.port=9001
-services.HSQLDBServer.user=sa
-services.HSQLDBServer.password=
-# Quiet logging from HSQL
-services.HSQLDBServer.silent=true
-# turn DB trace in HSQL
-services.HSQLDBServer.trace=false
-services.HSQLDBServer.db.path=WEB-INF/db/hsql/Registry
-services.HSQLDBServer.earlyInit = true
-services.HSQLDBServer.use.jndi.datasource=false
-# The configuration below is only needed when running tests OR
-# when running jetspeed in a container that does not support JNDI
-# datasources natively. Since the default target is Tomcat, which does
-# support JNDI datasources, this is disabled in the deploymeny configuration
-
-# use the below lines to setup HSQL within a JNDI pooled Datasource
-# services.HSQLDBServer.use.jndi.datasource=true
-
-# services.HSQLDBServer.jndi.datasource.name=jdbc/jetspeed
-# services.HSQLDBServer.jndi.datasource.maxActive=25
-# When the pool is exhausted do 1 of the following
-# "grow" increases the pool size by 1
-# "fail" a "noSuchElementException" is thrown
-# "block" waits for a datasource to become available
-# services.HSQLDBServer.jndi.datasource.when.exhausted=grow
-# The amount of time block while waiting for a released
-# object. Only used if "block" is specified
-# services.HSQLDBServer.jndi.datasource.max.block.wait=5000
-
#--------------------------------------------------------------------
# P E R S I S T E N C E S E R V I C E
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
