jvanzyl 01/06/14 07:39:33
Modified: src/java/org/apache/turbine/services/factory
TurbineFactoryService.java
Log:
- updating service as per notes.
Revision Changes Path
1.8 +9 -14
jakarta-turbine/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java
Index: TurbineFactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineFactoryService.java 2001/04/19 19:00:25 1.7
+++ TurbineFactoryService.java 2001/06/14 14:39:33 1.8
@@ -63,15 +63,10 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
-import org.apache.velocity.runtime.configuration.Configuration;
-
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.ObjectInputStreamForContext;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.resources.ResourceService;
-import org.apache.turbine.services.resources.TurbineResources;
/**
* The Factory Service instantiates objects using specified
@@ -79,10 +74,10 @@
* will be used.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TurbineFactoryService.java,v 1.7 2001/04/19 19:00:25 ilkka Exp $
+ * @version $Id: TurbineFactoryService.java,v 1.8 2001/06/14 14:39:33 jvanzyl Exp $
*/
public class TurbineFactoryService
- extends TurbineBaseService
+ extends BaseService
implements FactoryService
{
/**
@@ -146,12 +141,12 @@
*
* @throws InitializationException if initialization fails.
*/
- public void init() throws InitializationException
+ public void init()
+ throws InitializationException
{
- Configuration conf = getConfiguration();
- if (conf != null)
+ if (getConfiguration() != null)
{
- Vector loaders = conf.getVector(CLASS_LOADERS);
+ Vector loaders = getConfiguration().getVector(CLASS_LOADERS);
if (loaders != null)
{
for (int i = 0; i < loaders.size(); i++)
@@ -172,10 +167,10 @@
}
String key,factory;
- for (Iterator i = conf.getKeys(OBJECT_FACTORY); i.hasNext();)
+ for (Iterator i = getConfiguration().getKeys(OBJECT_FACTORY);
i.hasNext();)
{
key = (String) i.next();
- factory = conf.getString(key);
+ factory = getConfiguration().getString(key);
/*
* Store the factory to the table as a string and
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
