henning 2002/12/19 16:04:12
Modified: src/java/org/apache/turbine/services BaseService.java
BaseUnicastRemoteService.java
Log:
Removed implicit properties object, changed to generation from the
Configuration Object "on the fly"
Revision Changes Path
1.4 +5 -14
jakarta-turbine-2/src/java/org/apache/turbine/services/BaseService.java
Index: BaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseService.java 16 Apr 2002 22:07:07 -0000 1.3
+++ BaseService.java 20 Dec 2002 00:04:12 -0000 1.4
@@ -55,13 +55,16 @@
*/
import java.util.Properties;
+
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
/**
* This class is a generic implementation of <code>Service</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class BaseService
@@ -71,9 +74,6 @@
/** A reference to the ServiceBroker that instantiated this object. */
protected ServiceBroker serviceBroker;
- /** The properties of this service. */
- protected Properties properties;
-
/** The configuration for this service */
protected Configuration configuration;
@@ -129,16 +129,7 @@
*/
public Properties getProperties()
{
- if (name == null)
- {
- return null;
- }
-
- if (properties == null)
- {
- properties = getServiceBroker().getProperties(name);
- }
- return properties;
+ return ConfigurationConverter.getProperties(getConfiguration());
}
/**
1.4 +6 -15
jakarta-turbine-2/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
Index: BaseUnicastRemoteService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseUnicastRemoteService.java 16 Apr 2002 22:07:07 -0000 1.3
+++ BaseUnicastRemoteService.java 20 Dec 2002 00:04:12 -0000 1.4
@@ -1,12 +1,14 @@
package org.apache.turbine.services;
-import org.apache.commons.configuration.Configuration;
-
-import java.util.Properties;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
+
+import java.util.Properties;
+
import javax.servlet.ServletConfig;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
/**
* A base implementation of an {@link java.rmi.server.UnicastRemoteObject}
@@ -21,7 +23,6 @@
private boolean isInitialized;
private InitableBroker initableBroker;
private String name;
- private Properties properties;
private ServiceBroker serviceBroker;
public BaseUnicastRemoteService()
@@ -29,7 +30,6 @@
{
isInitialized = false;
initableBroker = null;
- properties = null;
name = null;
serviceBroker = null;
}
@@ -102,16 +102,7 @@
public Properties getProperties()
{
- if (name == null)
- {
- return null;
- }
-
- if (properties == null)
- {
- properties = getServiceBroker().getProperties(name);
- }
- return properties;
+ return ConfigurationConverter.getProperties(getConfiguration());
}
public void setName(String name)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
