Author: ludwig
Date: Thu Feb 3 20:27:59 2011
New Revision: 1066945
URL: http://svn.apache.org/viewvc?rev=1066945&view=rev
Log:
Java 5 to service package.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
turbine/core/trunk/src/java/org/apache/turbine/services/InitializationException.java
turbine/core/trunk/src/java/org/apache/turbine/services/InstantiationException.java
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java?rev=1066945&r1=1066944&r2=1066945&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
Thu Feb 3 20:27:59 2011
@@ -60,14 +60,14 @@ public abstract class BaseInitableBroker
implements InitableBroker
{
/** A repository of Initable instances. */
- protected Hashtable initables = new Hashtable();
+ protected Hashtable<String, Initable> initables = new Hashtable<String,
Initable>();
/**
* Names of classes being early-initialized are pushed onto this
* stack. A name appearing twice indicates a circular dependency
* chain.
*/
- protected Stack stack = new Stack();
+ protected Stack<String> stack = new Stack<String>();
/** Logging */
private Log log = LogFactory.getLog(this.getClass());
@@ -104,7 +104,7 @@ public abstract class BaseInitableBroker
.append(" couldn't be initialized because of circular
depency chain:\n");
for (int i = pos; i > 0; i--)
{
- msg.append((String) stack.elementAt(stack.size() - i - 1)
+ "->");
+ msg.append(stack.elementAt(stack.size() - i - 1) + "->");
}
msg.append(className).append('\n');
@@ -221,7 +221,7 @@ public abstract class BaseInitableBroker
protected Initable getInitableInstance(String className)
throws InstantiationException
{
- Initable initable = (Initable) initables.get(className);
+ Initable initable = initables.get(className);
if (initable == null)
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1066945&r1=1066944&r2=1066945&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
Thu Feb 3 20:27:59 2011
@@ -63,7 +63,7 @@ public abstract class BaseServiceBroker
/**
* A repository of Service instances.
*/
- private Hashtable services = new Hashtable();
+ private Hashtable<String, Service> services = new Hashtable<String,
Service>();
/**
* Configuration for the services broker.
@@ -95,7 +95,7 @@ public abstract class BaseServiceBroker
* the requirement of having init(Object) all
* together.
*/
- private Hashtable serviceObjects = new Hashtable();
+ private Hashtable<String, Object> serviceObjects = new Hashtable<String,
Object>();
/** Logging */
private static Log log = LogFactory.getLog(BaseServiceBroker.class);
@@ -109,7 +109,7 @@ public abstract class BaseServiceBroker
/**
* mapping from service names to instances of TurbineServiceProviders
*/
- private Hashtable serviceProviderInstanceMap = new Hashtable();
+ private Hashtable<String, Service> serviceProviderInstanceMap = new
Hashtable<String, Service>();
/**
* Default constructor, protected as to only be useable by subclasses.
@@ -206,6 +206,7 @@ public abstract class BaseServiceBroker
*
* Generic ServiceBroker provides no Services.
*/
+ @SuppressWarnings("unchecked")
protected void initMapping()
{
/*
@@ -220,9 +221,9 @@ public abstract class BaseServiceBroker
* There's no point in retrieving an ordered set
* of keys if they aren't kept in order :-)
*/
- for (Iterator keys = configuration.getKeys(); keys.hasNext();)
+ for (Iterator<String> keys = configuration.getKeys(); keys.hasNext();)
{
- String key = (String) keys.next();
+ String key = keys.next();
String[] keyParts = StringUtils.split(key, ".");
if ((keyParts.length == 3)
@@ -258,7 +259,8 @@ public abstract class BaseServiceBroker
*
* @return An Iterator of service names.
*/
- public Iterator getServiceNames()
+ @SuppressWarnings("unchecked")
+ public Iterator<String> getServiceNames()
{
return mapping.getKeys();
}
@@ -270,7 +272,8 @@ public abstract class BaseServiceBroker
* @param prefix The prefix against which to test.
* @return An Iterator of service names which match the prefix.
*/
- public Iterator getServiceNames(String prefix)
+ @SuppressWarnings("unchecked")
+ public Iterator<String> getServiceNames(String prefix)
{
return mapping.getKeys(prefix);
}
@@ -335,19 +338,19 @@ public abstract class BaseServiceBroker
if (report)
{
// Throw exceptions
- for (Iterator names = getServiceNames(); names.hasNext();)
+ for (Iterator<String> names = getServiceNames(); names.hasNext();)
{
- doInitService((String) names.next());
+ doInitService(names.next());
}
}
else
{
// Eat exceptions
- for (Iterator names = getServiceNames(); names.hasNext();)
+ for (Iterator<String> names = getServiceNames(); names.hasNext();)
{
try
{
- doInitService((String) names.next());
+ doInitService(names.next());
}
// In case of an exception, file an error message; the
// system may be still functional, though.
@@ -430,17 +433,17 @@ public abstract class BaseServiceBroker
* this will fix the problem for now.
*/
- ArrayList reverseServicesList = new ArrayList();
+ ArrayList<String> reverseServicesList = new ArrayList<String>();
- for (Iterator serviceNames = getServiceNames();
serviceNames.hasNext();)
+ for (Iterator<String> serviceNames = getServiceNames();
serviceNames.hasNext();)
{
- serviceName = (String) serviceNames.next();
+ serviceName = serviceNames.next();
reverseServicesList.add(0, serviceName);
}
- for (Iterator serviceNames = reverseServicesList.iterator();
serviceNames.hasNext();)
+ for (Iterator<String> serviceNames = reverseServicesList.iterator();
serviceNames.hasNext();)
{
- serviceName = (String) serviceNames.next();
+ serviceName = serviceNames.next();
log.info("Shutting down service: " + serviceName);
shutdownService(serviceName);
}
@@ -524,7 +527,7 @@ public abstract class BaseServiceBroker
protected Service getServiceInstance(String name)
throws InstantiationException
{
- Service service = (Service) services.get(name);
+ Service service = services.get(name);
if (service == null)
{
@@ -539,7 +542,7 @@ public abstract class BaseServiceBroker
try
{
className = mapping.getString(name);
- service = (Service) services.get(className);
+ service = services.get(className);
if (service == null)
{
@@ -669,11 +672,11 @@ public abstract class BaseServiceBroker
{
String serviceName = null;
TurbineServiceProvider turbineServiceProvider = null;
- Enumeration list = this.serviceProviderInstanceMap.keys();
+ Enumeration<String> list = this.serviceProviderInstanceMap.keys();
while (list.hasMoreElements())
{
- serviceName = (String) list.nextElement();
+ serviceName = list.nextElement();
turbineServiceProvider = (TurbineServiceProvider)
this.getService(serviceName);
if (turbineServiceProvider.exists(name))
@@ -697,11 +700,11 @@ public abstract class BaseServiceBroker
{
String serviceName = null;
TurbineServiceProvider turbineServiceProvider = null;
- Enumeration list = this.serviceProviderInstanceMap.keys();
+ Enumeration<String> list = this.serviceProviderInstanceMap.keys();
while (list.hasMoreElements())
{
- serviceName = (String) list.nextElement();
+ serviceName = list.nextElement();
turbineServiceProvider = (TurbineServiceProvider)
this.getService(serviceName);
if (turbineServiceProvider.exists(name))
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java?rev=1066945&r1=1066944&r2=1066945&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
Thu Feb 3 20:27:59 2011
@@ -38,6 +38,11 @@ import org.apache.commons.configuration.
public class BaseUnicastRemoteService extends UnicastRemoteObject
implements Service
{
+ /**
+ * Serial version.
+ */
+ private static final long serialVersionUID = -7775459623190960297L;
+
protected Configuration configuration;
private boolean isInitialized;
private InitableBroker initableBroker;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/InitializationException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/InitializationException.java?rev=1066945&r1=1066944&r2=1066945&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/InitializationException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/InitializationException.java
Thu Feb 3 20:27:59 2011
@@ -35,6 +35,11 @@ import org.apache.turbine.util.TurbineEx
public class InitializationException extends TurbineException
{
/**
+ * Serial version.
+ */
+ private static final long serialVersionUID = 974475242666061904L;
+
+ /**
* Construct an InitializationException with specified detail message.
*
* @param msg The detail message.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/InstantiationException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/InstantiationException.java?rev=1066945&r1=1066944&r2=1066945&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/InstantiationException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/InstantiationException.java
Thu Feb 3 20:27:59 2011
@@ -38,6 +38,11 @@ import org.apache.turbine.util.TurbineRu
public class InstantiationException extends TurbineRuntimeException
{
/**
+ * Serial version.
+ */
+ private static final long serialVersionUID = -6657313997260441099L;
+
+ /**
* Construct an InstantiationException with specified detail
* message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java?rev=1066945&r1=1066944&r2=1066945&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
Thu Feb 3 20:27:59 2011
@@ -21,8 +21,6 @@ package org.apache.turbine.services;
*/
-import javax.servlet.ServletConfig;
-
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -70,6 +68,7 @@ public abstract class TurbineBaseService
* @exception InitializationException if initialization of this
* class was not successful.
*/
+ @Override
public void init(Object data)
throws InitializationException
{
@@ -91,6 +90,7 @@ public abstract class TurbineBaseService
* @exception InitializationException if initialization of this
* class was not successful.
*/
+ @Deprecated
public void init(RunData data) throws InitializationException
{
}
@@ -117,6 +117,7 @@ public abstract class TurbineBaseService
* @exception InitializationException, if initialization of this
* class was not successful.
*/
+ @Override
public void init() throws InitializationException
{
setInit(true);
@@ -128,6 +129,7 @@ public abstract class TurbineBaseService
* You can use this method to release resources thet your Service
* allocated when Turbine shuts down.
*/
+ @Override
public void shutdown()
{
setInit(false);
