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 2003/11/14 15:46:57 UTC
cvs commit: jakarta-turbine-2/conf/test/merlin config.xml
epugh 2003/11/14 06:46:57
Modified: . project.xml
conf/test TestFulcrumComponents.properties
src/java/org/apache/turbine/services/localization
LocalizationTool.java
src/test/org/apache/turbine/services/localization
LocalizationToolTest.java
Added: conf/test/merlin config.xml
Removed: conf/test TestLocalization.properties
componentLocalizationConfiguration.xml
roleLocalizationConfiguration.xml
Log:
Changed tests to load Localization via the merlinized version in -alpha-4.
Revision Changes Path
1.147 +11 -2 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- project.xml 14 Nov 2003 12:29:39 -0000 1.146
+++ project.xml 14 Nov 2003 14:46:57 -0000 1.147
@@ -551,13 +551,22 @@
</dependency>
<dependency>
<groupId>fulcrum</groupId>
- <artifactId>fulcrum-localization</artifactId>
- <version>1.0-alpha-3</version>
+ <artifactId>fulcrum-localization-api</artifactId>
+ <version>1.0-alpha-4</version>
<url>http://jakarta.apache.org/turbine/fulcrum/localization</url>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-localization-impl</artifactId>
+ <version>1.0-alpha-4</version>
+ <url>http://jakarta.apache.org/turbine/fulcrum/localization</url>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-intake</artifactId>
1.2 +8 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFulcrumComponents.properties 24 Oct 2003 12:50:58 -0000 1.1
+++ TestFulcrumComponents.properties 14 Nov 2003 14:46:57 -0000 1.2
@@ -52,7 +52,7 @@
module.packages=@MODULE_PACKAGES@
-
+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
@@ -61,7 +61,6 @@
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.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
@@ -90,6 +89,7 @@
services.AssemblerBrokerService.navigation=org.apache.turbine.services.assemblerbroker.util.java.JavaNavigationFactory
services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
+
# -------------------------------------------------------------------
#
# T E M P L A T E S E R V I C E
@@ -109,9 +109,14 @@
services.PullService.tools.per.request.refresh=true
tool.request.intake=org.apache.turbine.services.intake.IntakeTool
+tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
services.AvalonComponentService.componentConfiguration = conf/test/fulcrumComponentConfiguration.xml
services.AvalonComponentService.componentRoles = conf/test/fulcrumRoleConfiguration.xml
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.9 +8 -8 jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocalizationTool.java
Index: LocalizationTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocalizationTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalizationTool.java 9 Sep 2003 15:04:51 -0000 1.8
+++ LocalizationTool.java 14 Nov 2003 14:46:57 -0000 1.9
@@ -54,13 +54,13 @@
*/
import java.util.Locale;
import java.util.MissingResourceException;
-import org.apache.turbine.services.InstantiationException;
-import org.apache.avalon.framework.component.ComponentException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.localization.LocalizationService;
+import org.apache.turbine.services.InstantiationException;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
+import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.RunData;
/**
@@ -91,13 +91,13 @@
{
if (localizationService == null)
{
- AvalonComponentService acs =
- (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ MerlinComponentService merlin =
+ (MerlinComponentService) TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
try {
- localizationService = (LocalizationService)acs.lookup(LocalizationService.ROLE);
+ localizationService = (LocalizationService)merlin.lookup("/fulcrum/localizer");
}
- catch (ComponentException ce) {
- throw new InstantiationException("Problem looking up Localization Service:"+ce.getMessage());
+ catch (Exception e) {
+ throw new InstantiationException("Problem looking up Localization Service:"+e.getMessage());
}
}
return localizationService;
1.2 +2 -2 jakarta-turbine-2/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
Index: LocalizationToolTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalizationToolTest.java 9 Sep 2003 15:04:51 -0000 1.1
+++ LocalizationToolTest.java 14 Nov 2003 14:46:57 -0000 1.2
@@ -134,7 +134,7 @@
}
public void setUp() throws Exception
{
- tc = new TurbineConfig(".", "/conf/test/TestLocalization.properties");
+ tc = new TurbineConfig(".", "/conf/test/TestFulcrumComponents.properties");
tc.initialize();
}
public void tearDown() throws Exception
1.1 jakarta-turbine-2/conf/test/merlin/config.xml
Index: config.xml
===================================================================
<targets>
<target path="/fulcrum/localizer">
<categories priority="INFO"/>
<configuration>
<bundles>
<bundle>org.apache.turbine.services.localization.BarBundle</bundle>
</bundles>
</configuration>
</target>
</targets>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org