mpoeschl 01/07/15 11:52:41
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
Log:
update TR.master for security changes
Revision Changes Path
1.125 +28 -47 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- TurbineResources.properties 2001/07/13 22:31:59 1.124
+++ TurbineResources.properties 2001/07/15 18:52:40 1.125
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.124 2001/07/13 22:31:59 jmcnally Exp $
+# $Id: TurbineResources.properties,v 1.125 2001/07/15 18:52:40 mpoeschl Exp $
#
# This is the configuration file for Turbine.
#
@@ -112,6 +112,27 @@
module.packages=org.apache.turbine.modules
+# These are the default modules to emulate the Turbine
+# 2.1 page/layout/nav/screen system.
+
+module.default.actions = TemplateAction
+module.default.screens=TemplateScreen
+module.default.layouts = TemplateLayout
+module.default.navigations=TemplateNavigation
+
+# You can define any module type you wish here and
+# they will be added to Turbine's module processing
+# system. You must provide a default module!
+#
+# module.default.woogy = Boogie
+# module.default.floogy = Moogie
+
+pipeline.default = org.apache.turbine.pipeline.ClassicPipeline
+pipeline.default.targetModuleType = screens
+
+template.default = /Default
+template.default.extension = vm
+
# -------------------------------------------------------------------
#
# F R A M E W O R K S E T T I N G S
@@ -286,7 +307,7 @@
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.db.DBSecurityService
+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
@@ -579,46 +600,6 @@
# -------------------------------------------------------------------
#
-# W E B M A C R O S E R V I C E
-#
-# -------------------------------------------------------------------
-
-services.WebMacroService.template.extension=wm
-services.WebMacroService.default.page.template = /Default.wm
-services.WebMacroService.default.layout.template = /Default.wm
-
-# The location of WebMacro configuration file, relative to webapp
-# root.
-
-services.WebMacroService.properties=/WEB-INF/conf/WebMacro.properties
-
-# The path where WebMacro will look for templates, relative to webapp
-# root. Use your system's path separator to specify multiple paths.
-
-services.WebMacroService.templates=${template.path}
-
-# The class that will act as a template provider in webmacro. We can
-# use default class from WebMacro (template path above is pushed into
-# WebMacro configuration mechanism, so that class can pick it up), or
-# some other custom class
-
-services.WebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
-
-# -------------------------------------------------------------------
-#
-# F R E E M A R K E R S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# The path where FreeMarker will look for templates, relative to
-# webapp root, if supported by the servlet engine.
-#
-# Default: /templates
-
-services.FreeMarkerService.templates=/templates
-
-# -------------------------------------------------------------------
-#
# U P L O A D S E R V I C E
#
# -------------------------------------------------------------------
@@ -713,10 +694,10 @@
# implementation to provide application specific addtional
# functionality.
#
-# Default: org.apache.turbine.om.security.TurbineUser
+# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUser
#
-services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
+services.SecurityService.user.class=org.apache.turbine.services.security.impl.db.entity.TurbineUser
#
# This setting is DBSecurityService specific - this class is consulted for the names
@@ -725,9 +706,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.om.security.TurbineUserPeer
+# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
#
-services.SecurityService.userPeer.class=org.apache.turbine.om.security.TurbineUserPeer
+services.SecurityService.userPeer.class=org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
#
# This is the class that implements UserManager interface.
@@ -736,7 +717,7 @@
# Default implementation uses Peers and a relational database .
#
-services.SecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
+services.SecurityService.user.manager=org.apache.turbine.services.security.impl.db.DBUserManager
#
# This is used by the SecurityService to make the password checking
1.92 +7 -7 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- TurbineResources.master 2001/07/13 22:31:57 1.91
+++ TurbineResources.master 2001/07/15 18:52:40 1.92
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.91 2001/07/13 22:31:57 jmcnally Exp $
+# $Id: TurbineResources.master,v 1.92 2001/07/15 18:52:40 mpoeschl Exp $
#
# This is the configuration file for Turbine.
#
@@ -307,7 +307,7 @@
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.db.DBSecurityService
+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
@@ -694,10 +694,10 @@
# implementation to provide application specific addtional
# functionality.
#
-# Default: org.apache.turbine.om.security.TurbineUser
+# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUser
#
-services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
+services.SecurityService.user.class=org.apache.turbine.services.security.impl.db.entity.TurbineUser
#
# This setting is DBSecurityService specific - this class is consulted for the names
@@ -706,9 +706,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.om.security.TurbineUserPeer
+# Default: org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
#
-services.SecurityService.userPeer.class=org.apache.turbine.om.security.TurbineUserPeer
+services.SecurityService.userPeer.class=org.apache.turbine.services.security.impl.db.entity.TurbineUserPeer
#
# This is the class that implements UserManager interface.
@@ -717,7 +717,7 @@
# Default implementation uses Peers and a relational database .
#
-services.SecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
+services.SecurityService.user.manager=org.apache.turbine.services.security.impl.db.DBUserManager
#
# This is used by the SecurityService to make the password checking
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
