Author: veithen
Date: Sun Jun 14 18:25:25 2009
New Revision: 784594
URL: http://svn.apache.org/viewvc?rev=784594&view=rev
Log:
Fixed some warnings.
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/AxisJMSException.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/AxisJMSException.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/AxisJMSException.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/AxisJMSException.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/AxisJMSException.java
Sun Jun 14 18:25:25 2009
@@ -16,6 +16,7 @@
package org.apache.axis2.transport.jms;
public class AxisJMSException extends RuntimeException {
+ private static final long serialVersionUID = 630157137524249401L;
AxisJMSException() {
super();
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
Sun Jun 14 18:25:25 2009
@@ -17,23 +17,21 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.transport.base.BaseUtils;
-import org.apache.axis2.transport.base.threads.WorkerPool;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.AxisFault;
import org.apache.axiom.om.OMElement;
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Map;
/**
* Encapsulate a JMS Connection factory definition within an Axis2.xml
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
Sun Jun 14 18:25:25 2009
@@ -15,22 +15,16 @@
*/
package org.apache.axis2.transport.jms;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import javax.jms.JMSException;
import javax.naming.Context;
-import javax.naming.NamingException;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterInclude;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.transport.base.threads.WorkerPool;
/**
* Class managing a set of {...@link JMSConnectionFactory} objects.
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
Sun Jun 14 18:25:25 2009
@@ -61,6 +61,7 @@
* @param cfgCtx the Axis configuration context
* @param trpInDesc the TransportIn description
*/
+ @Override
public void init(ConfigurationContext cfgCtx,
TransportInDescription trpInDesc) throws AxisFault {
@@ -145,6 +146,7 @@
* messages until they complete. This helps bring an instance into a
maintenence mode
* @throws AxisFault on error
*/
+ @Override
public void pause() throws AxisFault {
if (state != BaseConstants.STARTED) return;
try {
@@ -162,6 +164,7 @@
* Resume the lister - Brings the lister into active mode back from a
paused state
* @throws AxisFault on error
*/
+ @Override
public void resume() throws AxisFault {
if (state != BaseConstants.PAUSED) return;
try {
@@ -182,6 +185,7 @@
* @param millis a number of milliseconds to wait until pending requests
are allowed to complete
* @throws AxisFault on error
*/
+ @Override
public void maintenenceShutdown(long millis) throws AxisFault {
if (state != BaseConstants.STARTED) return;
try {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
Sun Jun 14 18:25:25 2009
@@ -58,6 +58,7 @@
* @param transportOut the transport sender definition from axis2.xml
* @throws AxisFault on error
*/
+ @Override
public void init(ConfigurationContext cfgCtx, TransportOutDescription
transportOut) throws AxisFault {
super.init(cfgCtx, transportOut);
connFacManager = new JMSConnectionFactoryManager(transportOut);
@@ -88,6 +89,7 @@
/**
* Performs the actual sending of the JMS message
*/
+ @Override
public void sendMessage(MessageContext msgCtx, String targetAddress,
OutTransportInfo outTransportInfo) throws AxisFault {
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
Sun Jun 14 18:25:25 2009
@@ -50,7 +50,7 @@
public class JMSUtils extends BaseUtils {
private static final Log log = LogFactory.getLog(JMSUtils.class);
- private static final Class[] NOARGS = new Class[] {};
+ private static final Class<?>[] NOARGS = new Class<?>[] {};
private static final Object[] NOPARMS = new Object[] {};
/**
@@ -64,8 +64,7 @@
return true;
} else {
- List transports = service.getExposedTransports();
- for (Object transport : transports) {
+ for (String transport : service.getExposedTransports()) {
if (JMSListener.TRANSPORT_NAME.equals(transport)) {
return true;
}
@@ -226,7 +225,7 @@
public static void setTransportHeaders(MessageContext msgContext, Message
message)
throws JMSException {
- Map headerMap = (Map)
msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
+ Map<?,?> headerMap = (Map<?,?>)
msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (headerMap == null) {
return;
@@ -380,7 +379,7 @@
} catch (JMSException ignore) {}
// any other transport properties / headers
- Enumeration e = null;
+ Enumeration<?> e = null;
try {
e = message.getPropertyNames();
} catch (JMSException ignore) {}
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java?rev=784594&r1=784593&r2=784594&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManagerFactory.java
Sun Jun 14 18:25:25 2009
@@ -143,11 +143,10 @@
return stm;
}
- private static Map<String, String> getServiceStringParameters(List list) {
+ private static Map<String, String>
getServiceStringParameters(List<Parameter> list) {
Map<String, String> map = new HashMap<String, String>();
- for (Object o : list) {
- Parameter p = (Parameter) o;
+ for (Parameter p : list) {
if (p.getValue() instanceof String) {
map.put(p.getName(), (String) p.getValue());
}
@@ -155,10 +154,12 @@
return map;
}
- private static String getRqdStringProperty(String key, Map svcMap, Map
cfMap) {
- String value = (String) svcMap.get(key);
+ private static String getRqdStringProperty(String key, Map<String,String>
svcMap,
+ Map<String,String> cfMap) {
+
+ String value = svcMap.get(key);
if (value == null) {
- value = (String) cfMap.get(key);
+ value = cfMap.get(key);
}
if (value == null) {
throw new AxisJMSException("Service/connection factory property :
" + key);
@@ -166,18 +167,22 @@
return value;
}
- private static String getOptionalStringProperty(String key, Map svcMap,
Map cfMap) {
- String value = (String) svcMap.get(key);
+ private static String getOptionalStringProperty(String key,
Map<String,String> svcMap,
+ Map<String,String> cfMap) {
+
+ String value = svcMap.get(key);
if (value == null) {
- value = (String) cfMap.get(key);
+ value = cfMap.get(key);
}
return value;
}
- private static Boolean getOptionalBooleanProperty(String key, Map svcMap,
Map cfMap) {
- String value = (String) svcMap.get(key);
+ private static Boolean getOptionalBooleanProperty(String key,
Map<String,String> svcMap,
+ Map<String,String> cfMap) {
+
+ String value = svcMap.get(key);
if (value == null) {
- value = (String) cfMap.get(key);
+ value = cfMap.get(key);
}
if (value == null) {
return null;
@@ -186,10 +191,12 @@
}
}
- private static Integer getOptionalIntProperty(String key, Map svcMap, Map
cfMap) {
- String value = (String) svcMap.get(key);
+ private static Integer getOptionalIntProperty(String key,
Map<String,String> svcMap,
+ Map<String,String> cfMap) {
+
+ String value = svcMap.get(key);
if (value == null) {
- value = (String) cfMap.get(key);
+ value = cfMap.get(key);
}
if (value != null) {
try {
@@ -201,10 +208,12 @@
return null;
}
- private static Double getOptionalDoubleProperty(String key, Map svcMap,
Map cfMap) {
- String value = (String) svcMap.get(key);
+ private static Double getOptionalDoubleProperty(String key,
Map<String,String> svcMap,
+ Map<String,String> cfMap) {
+
+ String value = svcMap.get(key);
if (value == null) {
- value = (String) cfMap.get(key);
+ value = cfMap.get(key);
}
if (value != null) {
try {
@@ -216,12 +225,12 @@
return null;
}
- private static int getTransactionality(Map svcMap, Map cfMap) {
+ private static int getTransactionality(Map<String,String> svcMap,
Map<String,String> cfMap) {
String key = BaseConstants.PARAM_TRANSACTIONALITY;
- String val = (String) svcMap.get(key);
+ String val = svcMap.get(key);
if (val == null) {
- val = (String) cfMap.get(key);
+ val = cfMap.get(key);
}
if (val == null) {
@@ -239,12 +248,12 @@
}
}
- private static int getDestinationType(Map svcMap, Map cfMap) {
+ private static int getDestinationType(Map<String,String> svcMap,
Map<String,String> cfMap) {
String key = JMSConstants.PARAM_DEST_TYPE;
- String val = (String) svcMap.get(key);
+ String val = svcMap.get(key);
if (val == null) {
- val = (String) cfMap.get(key);
+ val = cfMap.get(key);
}
if (JMSConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(val)) {
@@ -253,12 +262,12 @@
return JMSConstants.QUEUE;
}
- private static int getSessionAck(Map svcMap, Map cfMap) {
+ private static int getSessionAck(Map<String,String> svcMap,
Map<String,String> cfMap) {
String key = JMSConstants.PARAM_SESSION_ACK;
- String val = (String) svcMap.get(key);
+ String val = svcMap.get(key);
if (val == null) {
- val = (String) cfMap.get(key);
+ val = cfMap.get(key);
}
if (val == null || "AUTO_ACKNOWLEDGE".equalsIgnoreCase(val)) {
@@ -278,12 +287,12 @@
}
}
- private static int getCacheLevel(Map svcMap, Map cfMap) {
+ private static int getCacheLevel(Map<String,String> svcMap,
Map<String,String> cfMap) {
String key = JMSConstants.PARAM_CACHE_LEVEL;
- String val = (String) svcMap.get(key);
+ String val = svcMap.get(key);
if (val == null) {
- val = (String) cfMap.get(key);
+ val = cfMap.get(key);
}
if ("none".equalsIgnoreCase(val)) {
@@ -300,12 +309,12 @@
return JMSConstants.CACHE_AUTO;
}
- private static boolean getJMSSpecVersion(Map svcMap, Map cfMap) {
+ private static boolean getJMSSpecVersion(Map<String,String> svcMap,
Map<String,String> cfMap) {
String key = JMSConstants.PARAM_JMS_SPEC_VER;
- String val = (String) svcMap.get(key);
+ String val = svcMap.get(key);
if (val == null) {
- val = (String) cfMap.get(key);
+ val = cfMap.get(key);
}
if (val == null || "1.1".equals(val)) {
