You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2008/11/15 22:40:43 UTC
svn commit: r717931 - in /turbine/core/trunk:
src/java/org/apache/turbine/services/localization/
src/java/org/apache/turbine/services/pull/
src/java/org/apache/turbine/services/rundata/
src/java/org/apache/turbine/services/security/ src/java/org/apache...
Author: tv
Date: Sat Nov 15 13:40:43 2008
New Revision: 717931
URL: http://svn.apache.org/viewvc?rev=717931&view=rev
Log:
Use the transparent service lookup in all service lookups
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/util/RunDataFactory.java
turbine/core/trunk/src/java/org/apache/turbine/util/pool/RecyclableSupport.java
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java
turbine/core/trunk/xdocs/changes.xml
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java Sat Nov 15 13:40:43 2008
@@ -27,7 +27,6 @@
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.pull.ApplicationTool;
import org.apache.turbine.util.RunData;
/**
@@ -58,13 +57,14 @@
{
if (localizationService == null)
{
- AvalonComponentService ecm =
- (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
- try {
- localizationService = (LocalizationService)ecm.lookup(LocalizationService.ROLE);
+ try
+ {
+ localizationService = (LocalizationService)TurbineServices.getInstance()
+ .getService(LocalizationService.ROLE);
}
- catch (Exception e) {
- throw new InstantiationException("Problem looking up Localization Service:"+e.getMessage());
+ catch (Exception e)
+ {
+ throw new InstantiationException("Problem looking up Localization Service:"+e.getMessage());
}
}
return localizationService;
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java Sat Nov 15 13:40:43 2008
@@ -26,23 +26,19 @@
import java.util.List;
import org.apache.commons.configuration.Configuration;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.fulcrum.pool.PoolService;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.velocity.VelocityService;
import org.apache.turbine.services.velocity.TurbineVelocity;
+import org.apache.turbine.services.velocity.VelocityService;
import org.apache.turbine.util.RunData;
-
import org.apache.velocity.context.Context;
/**
@@ -193,9 +189,7 @@
{
try
{
- AvalonComponentService acs = (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
- pool = (PoolService)acs.lookup(PoolService.ROLE);
-
+ pool = (PoolService)TurbineServices.getInstance().getService(PoolService.ROLE);
if (pool == null)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java Sat Nov 15 13:40:43 2008
@@ -32,22 +32,20 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.commons.configuration.Configuration;
-
+import org.apache.fulcrum.parser.CookieParser;
+import org.apache.fulcrum.parser.DefaultCookieParser;
+import org.apache.fulcrum.parser.DefaultParameterParser;
+import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.fulcrum.parser.ParserService;
+import org.apache.fulcrum.pool.PoolException;
+import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
-import org.apache.fulcrum.pool.PoolException;
-import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.TurbineException;
-import org.apache.fulcrum.parser.CookieParser;
-import org.apache.fulcrum.parser.DefaultCookieParser;
-import org.apache.fulcrum.parser.DefaultParameterParser;
-import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.fulcrum.parser.ParserService;
/**
* The RunData Service provides the implementations for RunData and
@@ -145,13 +143,8 @@
}
}
}
- AvalonComponentService acs = (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
- try {
- pool = (PoolService)acs.lookup(PoolService.ROLE);
- }
- catch (ServiceException se) {
- throw new InitializationException("Problem looking up Pool Service:" + se);
- }
+
+ pool = (PoolService)TurbineServices.getInstance().getService(PoolService.ROLE);
if (pool == null)
{
@@ -159,12 +152,7 @@
+ " configured Pool Service!");
}
- try {
- parserService = (ParserService)acs.lookup(ParserService.ROLE);
- }
- catch (ServiceException se) {
- throw new InitializationException("Problem looking up Parser Service:" + se);
- }
+ parserService = (ParserService)TurbineServices.getInstance().getService(ParserService.ROLE);
if (parserService == null)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/BaseSecurityService.java Sat Nov 15 13:40:43 2008
@@ -40,7 +40,6 @@
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -296,9 +295,7 @@
try
{
- AvalonComponentService acs = (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
-
- aclFactoryService = (FactoryService) acs.lookup(FactoryService.ROLE);
+ aclFactoryService = (FactoryService)TurbineServices.getInstance().getService(FactoryService.ROLE);
}
catch (Exception e)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/RunDataFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/RunDataFactory.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/RunDataFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/RunDataFactory.java Sat Nov 15 13:40:43 2008
@@ -25,19 +25,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fulcrum.parser.DefaultCookieParser;
+import org.apache.fulcrum.parser.DefaultParameterParser;
import org.apache.fulcrum.pool.PoolException;
import org.apache.fulcrum.pool.PoolService;
-
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.rundata.DefaultTurbineRunData;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.services.rundata.TurbineRunData;
-import org.apache.fulcrum.parser.DefaultCookieParser;
-import org.apache.fulcrum.parser.DefaultParameterParser;
/**
* Creates instances of RunData for use within Turbine or 3rd party
@@ -120,11 +117,13 @@
// Failed, create a default implementation using the Pool Service.
TurbineRunData data;
- try {
+
+ try
+ {
data = (TurbineRunData) getPoolService().getInstance(DefaultTurbineRunData.class);
- } catch (ServiceException e) {
- throw new TurbineException(e);
- } catch (PoolException e) {
+ }
+ catch (PoolException e)
+ {
throw new TurbineException(e);
}
@@ -192,11 +191,7 @@
}
// Failed, use the Pool Service instead.
- try {
- getPoolService().putInstance(data);
- } catch (ServiceException e) {
- throw new RuntimeException(e);
- }
+ getPoolService().putInstance(data);
}
/**
@@ -208,11 +203,13 @@
.getInstance().getService(RunDataService.SERVICE_NAME);
}
- private static PoolService getPoolService() throws ServiceException {
- if (pool == null) {
- AvalonComponentService acs = (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
- pool = (PoolService)acs.lookup(PoolService.ROLE);
+ private static PoolService getPoolService()
+ {
+ if (pool == null)
+ {
+ pool = (PoolService)TurbineServices.getInstance().getService(PoolService.ROLE);
}
- return pool;
+
+ return pool;
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/pool/RecyclableSupport.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/pool/RecyclableSupport.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/pool/RecyclableSupport.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/pool/RecyclableSupport.java Sat Nov 15 13:40:43 2008
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
/**
* A support class for recyclable objects implementing default methods.
@@ -88,10 +87,11 @@
*/
protected boolean doDispose() throws ServiceException
{
- if (pool == null) {
- AvalonComponentService acs = (AvalonComponentService) TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
- pool = (PoolService)acs.lookup(PoolService.ROLE);
+ if (pool == null)
+ {
+ pool = (PoolService)TurbineServices.getInstance().getService(PoolService.ROLE);
}
+
return pool.putInstance(this);
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java Sat Nov 15 13:40:43 2008
@@ -88,12 +88,8 @@
{
try
{
- AvalonComponentService cs = (AvalonComponentService)
- TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
-
- TestComponent tc = (TestComponent) cs.lookup(TestComponent.ROLE);
+ TestComponent tc = (TestComponent)TurbineServices.getInstance().getService(TestComponent.ROLE);
tc.test();
- cs.release(tc);
}
catch(Exception e)
{
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java Sat Nov 15 13:40:43 2008
@@ -23,11 +23,9 @@
import java.math.BigDecimal;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.parser.BaseValueParser;
import org.apache.fulcrum.parser.ParserService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
@@ -68,18 +66,11 @@
*/
protected void setUp()
{
- AvalonComponentService acs =
- (AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
-
try
{
- parserService = (ParserService)acs.lookup(ParserService.ROLE);
+ parserService = (ParserService)TurbineServices.getInstance().getService(ParserService.ROLE);
parser = (BaseValueParser) parserService.getParser(BaseValueParser.class);
}
- catch (ServiceException e)
- {
- fail(e.getMessage());
- }
catch (InstantiationException e)
{
fail(e.getMessage());
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java Sat Nov 15 13:40:43 2008
@@ -19,12 +19,10 @@
* under the License.
*/
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.parser.DefaultParameterParser;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.fulcrum.parser.ParserService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.TurbineConfig;
@@ -72,18 +70,7 @@
"/context");
turi = new TurbineURI(sd);
- AvalonComponentService acs =
- (AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
-
- try
- {
- parserService = (ParserService)acs.lookup(ParserService.ROLE);
- }
- catch (ServiceException e)
- {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ parserService = (ParserService)TurbineServices.getInstance().getService(ParserService.ROLE);
}
/**
Modified: turbine/core/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=717931&r1=717930&r2=717931&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Sat Nov 15 13:40:43 2008
@@ -26,6 +26,12 @@
<body>
<release version="2.4-M2" date="in Subversion">
<action type="update" dev="tv">
+ Ported the class cache for JavaBaseFactory from Turbine 2.3
+ </action>
+ <action type="update" dev="tv">
+ Use the transparent service lookup in all service lookups
+ </action>
+ <action type="update" dev="tv">
Initialize the locale of RunData, the ParameterParser and the CookieParser
from the HttpServletRequest. Make RunData.setLocale propagate the locale
setting to the parsers.