jvanzyl 01/08/01 08:20:40
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
Log:
- removed AssemblerBrokerService config
- removed UniqueIdService config
- remove ServletService config
- update service configs for services moved to fulcrum proper
Revision Changes Path
1.128 +19 -39 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- TurbineResources.properties 2001/07/30 18:10:35 1.127
+++ TurbineResources.properties 2001/08/01 15:20:40 1.128
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.127 2001/07/30 18:10:35 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.128 2001/08/01 15:20:40 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -292,26 +292,23 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
-services.ResourceService.classname=org.apache.turbine.services.resources.TurbineResourceService
-services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
-services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
+services.FactoryService.classname=org.apache.fulcrum.factory.TurbineFactoryService
+services.PoolService.classname=org.apache.fulcrum.pool.TurbinePoolService
+services.MimeTypeService.classname=org.apache.fulcrum.mimetype.TurbineMimeTypeService
+services.SchedulerService.classname=org.apache.fulcrum.schedule.TurbineSchedulerService
+services.XmlRpcService.classname=org.apache.fulcrum.xmlrpc.TurbineXmlRpcService
+services.UploadService.classname=org.apache.fulcrum.upload.TurbineUploadService
+services.SecurityService.classname=org.apache.fulcrum.security.impl.db.DBSecurityService
+services.DatabaseService.classname=org.apache.fulcrum.db.TurbineDatabaseService
+services.XSLTService.classname=org.apache.fulcrum.xslt.TurbineXSLTService
+services.BSFService.classname=org.apache.fulcrum.bsf.TurbineBSFService
+services.GlobalCacheService.classname=org.apache.fulcrum.cache.TurbineGlobalCacheService
+
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
-services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
-services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
-services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
-services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
-services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
-services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
-services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
-services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
-services.SecurityService.classname=org.apache.turbine.services.security.impl.db.DBSecurityService
-services.DatabaseService.classname=org.apache.turbine.services.db.TurbineDatabaseService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
#services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
-services.XSLTService.classname=org.apache.turbine.services.xslt.TurbineXSLTService
-services.BSFService.classname=org.apache.turbine.services.bsf.TurbineBSFService
# Turn on the appropriate template service.
services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
@@ -412,23 +409,6 @@
# -------------------------------------------------------------------
#
-# A S S E M B L E R B R O K E R S E R V I C E
-#
-# -------------------------------------------------------------------
-# A list of AssemblerFactory classes that will be registered
-# with TurbineAssemblerBrokerService
-# -------------------------------------------------------------------
-
-services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.java.JavaScreenFactory
-#services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.python.PythonScreenFactory
-services.AssemblerBrokerService.action=org.apache.turbine.services.assemblerbroker.util.java.JavaActionFactory
-services.AssemblerBrokerService.layout=org.apache.turbine.services.assemblerbroker.util.java.JavaLayoutFactory
-services.AssemblerBrokerService.page=org.apache.turbine.services.assemblerbroker.util.java.JavaPageFactory
-services.AssemblerBrokerService.navigation=org.apache.turbine.services.assemblerbroker.util.java.JavaNavigationFactory
-services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
-
-# -------------------------------------------------------------------
-#
# B S F S E R V I C E
#
# -------------------------------------------------------------------
@@ -694,10 +674,10 @@
# implementation to provide application specific addtional
# functionality.
#
-# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUser
+# Default: org.apache.fulcrum.security.impl.db.entity.TurbineUser
#
-services.SecurityService.user.class=org.apache.turbine.services.security.impl.db.entity.TurbineUser
+services.SecurityService.user.class=org.apache.fulcrum.security.impl.db.entity.TurbineUser
#
# This setting is DBSecurityService specific - this class is consulted for the names
@@ -706,9 +686,9 @@
# it's peer class must implement org.apache.turbine.om.security.peer.UserPeer
interface,
# and you need to specify the name of the peer class here.
#
-# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
+# Default: org.apache.fulcrum.security.impl.db.entity.TurbineUserPeer
#
-services.SecurityService.userPeer.class=org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
+services.SecurityService.userPeer.class=org.apache.fulcrum.security.impl.db.entity.TurbineUserPeer
#
# This is the class that implements UserManager interface.
@@ -717,7 +697,7 @@
# Default implementation uses Peers and a relational database .
#
-services.SecurityService.user.manager=org.apache.turbine.services.security.impl.db.DBUserManager
+services.SecurityService.user.manager=org.apache.fulcrum.security.impl.db.DBUserManager
#
# This is used by the SecurityService to make the password checking
@@ -797,7 +777,7 @@
# that needs to be shared between Turbine applications
# running on separate servers.
-services.XmlRpcService.handler.file =
org.apache.turbine.services.xmlrpc.util.FileHandler
+services.XmlRpcService.handler.file = org.apache.fulcrum.xmlrpc.util.FileHandler
services.XmlRpcService.paranoid = false
services.XmlRpcService.acceptClient = 192.168.1.*
services.XmlRpcService.denyClient =
1.95 +19 -39 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- TurbineResources.master 2001/07/30 18:10:36 1.94
+++ TurbineResources.master 2001/08/01 15:20:40 1.95
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.94 2001/07/30 18:10:36 jvanzyl Exp $
+# $Id: TurbineResources.master,v 1.95 2001/08/01 15:20:40 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -292,26 +292,23 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
-services.ResourceService.classname=org.apache.turbine.services.resources.TurbineResourceService
-services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
-services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
+services.FactoryService.classname=org.apache.fulcrum.factory.TurbineFactoryService
+services.PoolService.classname=org.apache.fulcrum.pool.TurbinePoolService
+services.MimeTypeService.classname=org.apache.fulcrum.mimetype.TurbineMimeTypeService
+services.SchedulerService.classname=org.apache.fulcrum.schedule.TurbineSchedulerService
+services.XmlRpcService.classname=org.apache.fulcrum.xmlrpc.TurbineXmlRpcService
+services.UploadService.classname=org.apache.fulcrum.upload.TurbineUploadService
+services.SecurityService.classname=org.apache.fulcrum.security.impl.db.DBSecurityService
+services.DatabaseService.classname=org.apache.fulcrum.db.TurbineDatabaseService
+services.XSLTService.classname=org.apache.fulcrum.xslt.TurbineXSLTService
+services.BSFService.classname=org.apache.fulcrum.bsf.TurbineBSFService
+services.GlobalCacheService.classname=org.apache.fulcrum.cache.TurbineGlobalCacheService
+
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
-services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
-services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
-services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
-services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
-services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
-services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
-services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
-services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
-services.SecurityService.classname=org.apache.turbine.services.security.impl.db.DBSecurityService
-services.DatabaseService.classname=org.apache.turbine.services.db.TurbineDatabaseService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
#services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
-services.XSLTService.classname=org.apache.turbine.services.xslt.TurbineXSLTService
-services.BSFService.classname=org.apache.turbine.services.bsf.TurbineBSFService
# Turn on the appropriate template service.
@TEMPLATE_SERVICE@
@@ -412,23 +409,6 @@
# -------------------------------------------------------------------
#
-# A S S E M B L E R B R O K E R S E R V I C E
-#
-# -------------------------------------------------------------------
-# A list of AssemblerFactory classes that will be registered
-# with TurbineAssemblerBrokerService
-# -------------------------------------------------------------------
-
-services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.java.JavaScreenFactory
-#services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.python.PythonScreenFactory
-services.AssemblerBrokerService.action=org.apache.turbine.services.assemblerbroker.util.java.JavaActionFactory
-services.AssemblerBrokerService.layout=org.apache.turbine.services.assemblerbroker.util.java.JavaLayoutFactory
-services.AssemblerBrokerService.page=org.apache.turbine.services.assemblerbroker.util.java.JavaPageFactory
-services.AssemblerBrokerService.navigation=org.apache.turbine.services.assemblerbroker.util.java.JavaNavigationFactory
-services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
-
-# -------------------------------------------------------------------
-#
# B S F S E R V I C E
#
# -------------------------------------------------------------------
@@ -694,10 +674,10 @@
# implementation to provide application specific addtional
# functionality.
#
-# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUser
+# Default: org.apache.fulcrum.security.impl.db.entity.TurbineUser
#
-services.SecurityService.user.class=org.apache.turbine.services.security.impl.db.entity.TurbineUser
+services.SecurityService.user.class=org.apache.fulcrum.security.impl.db.entity.TurbineUser
#
# This setting is DBSecurityService specific - this class is consulted for the names
@@ -706,9 +686,9 @@
# it's peer class must implement org.apache.turbine.om.security.peer.UserPeer
interface,
# and you need to specify the name of the peer class here.
#
-# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
+# Default: org.apache.fulcrum.security.impl.db.entity.TurbineUserPeer
#
-services.SecurityService.userPeer.class=org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
+services.SecurityService.userPeer.class=org.apache.fulcrum.security.impl.db.entity.TurbineUserPeer
#
# This is the class that implements UserManager interface.
@@ -717,7 +697,7 @@
# Default implementation uses Peers and a relational database .
#
-services.SecurityService.user.manager=org.apache.turbine.services.security.impl.db.DBUserManager
+services.SecurityService.user.manager=org.apache.fulcrum.security.impl.db.DBUserManager
#
# This is used by the SecurityService to make the password checking
@@ -797,7 +777,7 @@
# that needs to be shared between Turbine applications
# running on separate servers.
-services.XmlRpcService.handler.file =
org.apache.turbine.services.xmlrpc.util.FileHandler
+services.XmlRpcService.handler.file = org.apache.fulcrum.xmlrpc.util.FileHandler
services.XmlRpcService.paranoid = false
services.XmlRpcService.acceptClient = 192.168.1.*
services.XmlRpcService.denyClient =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
