You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/02/12 19:23:50 UTC
cvs commit: jakarta-turbine-2/conf/test fulcrumRoleConfiguration.xml fulcrumComponentConfiguration.xml TestFulcrumComponents.properties TurbineAvalonService.properties componentTorqueConfiguration.xml roleTorqueConfiguration.xml
epugh 2004/02/12 10:23:50
Modified: conf/test fulcrumRoleConfiguration.xml
fulcrumComponentConfiguration.xml
TestFulcrumComponents.properties
Removed: conf/test TurbineAvalonService.properties
componentTorqueConfiguration.xml
roleTorqueConfiguration.xml
Log:
Consolidate multipe test files down to a few
Revision Changes Path
1.3 +19 -0 jakarta-turbine-2/conf/test/fulcrumRoleConfiguration.xml
Index: fulcrumRoleConfiguration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/fulcrumRoleConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fulcrumRoleConfiguration.xml 24 Oct 2003 13:01:19 -0000 1.2
+++ fulcrumRoleConfiguration.xml 12 Feb 2004 18:23:50 -0000 1.3
@@ -18,5 +18,24 @@
name="org.apache.fulcrum.crypto.CryptoService"
shorthand="crypto"
default-class="org.apache.fulcrum.crypto.DefaultCryptoService"/>
+
+ <role
+ name="org.apache.fulcrum.localization.LocalizationService"
+ shorthand="localization"
+ default-class="org.apache.fulcrum.localization.DefaultLocalizationService"/>
+
+ <role
+ name="org.apache.fulcrum.intake.IntakeService"
+ shorthand="intake"
+ default-class="org.apache.fulcrum.intake.IntakeServiceImpl"/>
+
+ <role
+ name="org.apache.fulcrum.factory.FactoryService"
+ shorthand="factory"
+ default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
+
+ <role name="org.apache.torque.avalon.Torque"
+ shorthand="torque"
+ default-class="org.apache.torque.avalon.TorqueComponent" />
</role-list>
1.3 +16 -2 jakarta-turbine-2/conf/test/fulcrumComponentConfiguration.xml
Index: fulcrumComponentConfiguration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/fulcrumComponentConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fulcrumComponentConfiguration.xml 24 Oct 2003 13:01:19 -0000 1.2
+++ fulcrumComponentConfiguration.xml 12 Feb 2004 18:23:50 -0000 1.3
@@ -11,8 +11,22 @@
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
<clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
<java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
- <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
-
+ <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
</algorithm>
</crypto>
+ <localization>
+ <bundles>
+ <bundle>org.apache.turbine.services.localization.BarBundle</bundle>
+ </bundles>
+ </localization>
+ <intake>
+ <serialDataPath>target/appData.ser</serialDataPath>
+ <xmlPaths>
+ <xmlPath>conf/test/intake.xml</xmlPath>
+ </xmlPaths>
+ </intake>
+ <factory/>
+ <torque>
+ <configfile>conf/test/TorqueTest.properties</configfile>
+ </torque>
</componentConfig>
1.4 +4 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestFulcrumComponents.properties 19 Nov 2003 14:05:39 -0000 1.3
+++ TestFulcrumComponents.properties 12 Feb 2004 18:23:50 -0000 1.4
@@ -54,10 +54,9 @@
services.MerlinComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineMerlinComponentService
services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
-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
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
services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
@@ -114,7 +113,9 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org