Author: epugh
Date: Tue Dec 13 17:38:57 2005
New Revision: 356685
URL: http://svn.apache.org/viewcvs?rev=356685&view=rev
Log:
Forgot to actually use Localization service from Avalon container.
Modified:
jakarta/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
Modified:
jakarta/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java?rev=356685&r1=356684&r2=356685&view=diff
==============================================================================
---
jakarta/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
(original)
+++
jakarta/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
Tue Dec 13 17:38:57 2005
@@ -23,8 +23,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.localization.LocalizationService;
import org.apache.turbine.services.InstantiationException;
-import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.RunData;
@@ -56,12 +56,12 @@
{
if (localizationService == null)
{
- ServiceManager serviceManager = TurbineServices.getInstance();
+ AvalonComponentService acs = (AvalonComponentService)
TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+
try
{
- localizationService =
(LocalizationService)serviceManager.getService(
- LocalizationService.ROLE
- );
+ localizationService =
(LocalizationService)acs.lookup(LocalizationService.ROLE);
+
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
