henning 2002/12/19 16:14:57
Modified: src/java/org/apache/turbine/services/pull
TurbinePullService.java
Log:
Convert TurbineResources References to direct Configuration access
Revision Changes Path
1.8 +7 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbinePullService.java 14 Aug 2002 16:51:25 -0000 1.7
+++ TurbinePullService.java 20 Dec 2002 00:14:57 -0000 1.8
@@ -64,8 +64,6 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.pool.PoolService;
-import org.apache.turbine.services.resources.ResourceService;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.velocity.VelocityContext;
@@ -140,6 +138,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class TurbinePullService extends TurbineBaseService
@@ -268,9 +267,8 @@
* Get the resources directory that is specificed
* in the TR.props or default to "/resources".
*/
- resourcesDirectory = TurbineResources.getString(
- TOOL_RESOURCES_DIR,
- TOOL_RESOURCES_DIR_DEFAULT);
+ resourcesDirectory = conf.getString(TOOL_RESOURCES_DIR,
+ TOOL_RESOURCES_DIR_DEFAULT);
/*
* Get absolute path to the resources directory.
@@ -280,7 +278,7 @@
* for it to initialize correctly.
*/
absolutePathToResourcesDirectory =
- Turbine.getRealPath(resourcesDirectory);
+ Turbine.getRealPath(resourcesDirectory);
/*
* Should we refresh the tool box on a per
@@ -339,8 +337,8 @@
{
List classes = new ArrayList();
- ResourceService toolResources =
- TurbineResources.getResources(keyPrefix);
+ Configuration toolResources =
+ Turbine.getConfiguration().subset(keyPrefix);
/*
* There might not be any tools for this prefix
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
