You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by sg...@apache.org on 2005/05/19 10:53:53 UTC
cvs commit: jakarta-turbine-2/conf TurbineResources.properties
sgoeschl 2005/05/19 01:53:53
Modified: conf/test CompleteTurbineResources.properties
TestFulcrumComponents.properties
conf TurbineResources.properties
Log:
Providing the new TurbineYaafiComponentService
Revision Changes Path
1.3 +7 -2 jakarta-turbine-2/conf/test/CompleteTurbineResources.properties
Index: CompleteTurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/CompleteTurbineResources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompleteTurbineResources.properties 23 Feb 2004 20:35:06 -0000 1.2
+++ CompleteTurbineResources.properties 19 May 2005 08:53:53 -0000 1.3
@@ -319,7 +319,12 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
-#services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
+
+# Choose between the two available implementations of an Avalon container - ECM or YAAFI
+
+# services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
+# services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineYaafiComponentService
+
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
1.7 +15 -9 jakarta-turbine-2/conf/test/TestFulcrumComponents.properties
Index: TestFulcrumComponents.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/TestFulcrumComponents.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestFulcrumComponents.properties 4 Nov 2004 12:20:03 -0000 1.6
+++ TestFulcrumComponents.properties 19 May 2005 08:53:53 -0000 1.7
@@ -51,9 +51,11 @@
module.packages=@MODULE_PACKAGES@
+# Choose between the two available implementations of an Avalon container - ECM or YAAFI
+
+# services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
+services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineYaafiComponentService
-services.MerlinComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineMerlinComponentService
-services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
@@ -63,7 +65,11 @@
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
-
+# -------------------------------------------------------------------
+#
+# R U N D A T A S E R V I C E
+#
+# -------------------------------------------------------------------
services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
services.RunDataService.default.parameter.parser=org.apache.turbine.util.parser.DefaultParameterParser
@@ -109,13 +115,13 @@
tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
+# -------------------------------------------------------------------
+#
+# A V A L O N C O M P O N E N T S E R V I C E
+#
+# -------------------------------------------------------------------
services.AvalonComponentService.componentConfiguration = conf/test/fulcrumComponentConfiguration.xml
services.AvalonComponentService.componentRoles = conf/test/fulcrumRoleConfiguration.xml
services.AvalonComponentService.earlyInit=true
services.AvalonComponentService.lookup = org.apache.fulcrum.cache.GlobalCacheService
-
-
-services.MerlinComponentService.earlyInit=true
-services.MerlinComponentService.block.path=conf/test/merlin
-services.MerlinComponentService.kernel=conf/test/merlin/kernel.xml
1.56 +7 -2 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- TurbineResources.properties 4 Nov 2004 12:20:04 -0000 1.55
+++ TurbineResources.properties 19 May 2005 08:53:53 -0000 1.56
@@ -317,7 +317,12 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
-services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
+
+# Choose between the two available implementations of an Avalon container - ECM or YAAFI
+
+# services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
+services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineYaafiComponentService
+
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org