jvanzyl     01/08/05 09:05:42

  Modified:    conf     TurbineResources.properties
               conf/master TurbineResources.master
               conf/view velocity velocity-secure
  Log:
  - reflect changes in decoupling of template/velocity service.
  
  Revision  Changes    Path
  1.129     +3 -3      jakarta-turbine/conf/TurbineResources.properties
  
  Index: TurbineResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- TurbineResources.properties       2001/08/01 15:20:40     1.128
  +++ TurbineResources.properties       2001/08/05 16:05:42     1.129
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.128 2001/08/01 15:20:40 jvanzyl Exp $
  +# $Id: TurbineResources.properties,v 1.129 2001/08/05 16:05:42 jvanzyl Exp $
   #
   # This is the configuration file for Turbine.
   #
  @@ -303,15 +303,15 @@
   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.TemplateService.classname=org.apache.fulcrum.template.TurbineTemplateService
   
   
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.turbine.services.intake.TurbineIntakeService
  
-services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
   
   # Turn on the appropriate template service.
  
-services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
  
+services.VelocityService.classname=org.apache.fulcrum.velocity.TurbineVelocityService
   
   # -------------------------------------------------------------------
   # 
  
  
  
  1.96      +2 -2      jakarta-turbine/conf/master/TurbineResources.master
  
  Index: TurbineResources.master
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- TurbineResources.master   2001/08/01 15:20:40     1.95
  +++ TurbineResources.master   2001/08/05 16:05:42     1.96
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.master,v 1.95 2001/08/01 15:20:40 jvanzyl Exp $
  +# $Id: TurbineResources.master,v 1.96 2001/08/05 16:05:42 jvanzyl Exp $
   #
   # This is the configuration file for Turbine.
   #
  @@ -303,12 +303,12 @@
   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.TemplateService.classname=org.apache.fulcrum.template.TurbineTemplateService
   
   
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.turbine.services.intake.TurbineIntakeService
  
-services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
   
   # Turn on the appropriate template service.
   @TEMPLATE_SERVICE@
  
  
  
  1.19      +1 -1      jakarta-turbine/conf/view/velocity
  
  Index: velocity
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/conf/view/velocity,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- velocity  2001/07/10 01:13:50     1.18
  +++ velocity  2001/08/05 16:05:42     1.19
  @@ -7,4 +7,4 @@
   action.sessionvalidator=sessionvalidator.TemplateSessionValidator
   action.accesscontroller=AccessController
   
  
-template.service=services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
  
+template.service=services.VelocityService.classname=org.apache.fulcrum.velocity.TurbineVelocityService
  
  
  
  1.12      +1 -1      jakarta-turbine/conf/view/velocity-secure
  
  Index: velocity-secure
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/conf/view/velocity-secure,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- velocity-secure   2001/07/10 01:13:51     1.11
  +++ velocity-secure   2001/08/05 16:05:42     1.12
  @@ -7,4 +7,4 @@
   action.sessionvalidator=sessionvalidator.TemplateSecureSessionValidator
   action.accesscontroller=AccessController
   
  
-template.service=services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
  
+template.service=services.VelocityService.classname=org.apache.fulcrum.velocity.TurbineVelocityService
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to