jvanzyl 01/08/31 00:10:53
Modified: conf Fulcrum.properties TurbineResources.properties
conf/master Fulcrum.master
Log:
- change localization service property to match up with its new
location in fulcrum
- turn on intake by default so it can be tested in the tdk
Revision Changes Path
1.6 +6 -6 jakarta-turbine-3/conf/Fulcrum.properties
Index: Fulcrum.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/conf/Fulcrum.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Fulcrum.properties 2001/08/28 01:11:05 1.5
+++ Fulcrum.properties 2001/08/31 07:10:53 1.6
@@ -26,11 +26,11 @@
services.BSFService.classname=org.apache.fulcrum.bsf.TurbineBSFService
services.GlobalCacheService.classname=org.apache.fulcrum.cache.TurbineGlobalCacheService
services.TemplateService.classname=org.apache.fulcrum.template.TurbineTemplateService
+services.LocalizationService.classname=org.apache.fulcrum.localization.TurbineLocalizationService
+services.IntakeService.classname=org.apache.fulcrum.intake.TurbineIntakeService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
-services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
-#services.IntakeService.classname=org.apache.fulcrum.intake.TurbineIntakeService
# Turn on the appropriate template service.
services.VelocityService.classname=org.apache.fulcrum.velocity.TurbineVelocityService
@@ -50,8 +50,8 @@
services.DatabaseService.database.default=default
-services.DatabaseService.database.default.driver=org.gjt.mm.mysql.Driver
-services.DatabaseService.database.default.url=jdbc:mysql://localhost:3306/Turbine
+services.DatabaseService.database.default.driver=${database.driver}
+services.DatabaseService.database.default.url=${database.url}
services.DatabaseService.database.default.username=username
services.DatabaseService.database.default.password=password
@@ -85,8 +85,8 @@
# adapter. These properties are used by the DBFactory. You can add
# all the drivers you want here.
-services.DatabaseService.database.adapter=DBMM
-services.DatabaseService.database.adapter.DBMM=org.gjt.mm.mysql.Driver
+services.DatabaseService.database.adapter=${database.adaptor}
+services.DatabaseService.database.adapter.${database.adaptor}=${database.driver}
# Determines if the quantity column of the IDBroker's id_table should
# be increased automatically if requests for ids reaches a high
1.6 +1 -1 jakarta-turbine-3/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/conf/TurbineResources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineResources.properties 2001/08/30 21:31:04 1.5
+++ TurbineResources.properties 2001/08/31 07:10:53 1.6
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.5 2001/08/30 21:31:04 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.6 2001/08/31 07:10:53 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
1.6 +2 -2 jakarta-turbine-3/conf/master/Fulcrum.master
Index: Fulcrum.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/conf/master/Fulcrum.master,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Fulcrum.master 2001/08/28 01:11:26 1.5
+++ Fulcrum.master 2001/08/31 07:10:53 1.6
@@ -26,11 +26,11 @@
services.BSFService.classname=org.apache.fulcrum.bsf.TurbineBSFService
services.GlobalCacheService.classname=org.apache.fulcrum.cache.TurbineGlobalCacheService
services.TemplateService.classname=org.apache.fulcrum.template.TurbineTemplateService
+services.LocalizationService.classname=org.apache.fulcrum.localization.TurbineLocalizationService
+services.IntakeService.classname=org.apache.fulcrum.intake.TurbineIntakeService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
-services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
-#services.IntakeService.classname=org.apache.fulcrum.intake.TurbineIntakeService
# Turn on the appropriate template service.
@TEMPLATE_SERVICE@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
