Author: sagara
Date: Thu May 24 10:57:24 2012
New Revision: 1342192
URL: http://svn.apache.org/viewvc?rev=1342192&view=rev
Log:
AXIS2-5315 , removed deprecated AbstractInMessageReceiver and
AbstractInOutAsyncMessageReceivers.
Removed:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOnlyMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
axis/axis2/java/core/trunk/modules/samples/ping/src/samples/ping/receivers/RawXMLINOnlyMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
Thu May 24 10:57:24 2012
@@ -24,7 +24,7 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.receivers.AbstractInMessageReceiver;
+import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public class RPCInOnlyMessageReceiver extends AbstractInMessageReceiver {
+public class RPCInOnlyMessageReceiver extends AbstractMessageReceiver {
private static Log log = LogFactory.getLog(RPCInOnlyMessageReceiver.class);
@@ -42,7 +42,7 @@ public class RPCInOnlyMessageReceiver ex
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
- Class ImplClass = obj.getClass();
+ Class<?> ImplClass = obj.getClass();
AxisOperation op =
inMessage.getOperationContext().getAxisOperation();
@@ -75,7 +75,7 @@ public class RPCInOnlyMessageReceiver ex
Throwable cause = e.getCause();
if (cause != null) {
String msg = cause.getMessage();
- if (msg == null) {
+ if (msg == null && method != null) {
msg = "Exception occurred while trying to invoke service
method " +
method.getName();
}
@@ -86,7 +86,7 @@ public class RPCInOnlyMessageReceiver ex
throw AxisFault.makeFault(cause);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service
method " +
- method.getName();
+ (method != null ? method.getName() : "");
log.error(msg, e);
throw new AxisFault(msg, e);
}
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
Thu May 24 10:57:24 2012
@@ -31,7 +31,7 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-import org.apache.axis2.receivers.AbstractInMessageReceiver;
+import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public class RPCInOutAsyncMessageReceiver extends AbstractInMessageReceiver {
+public class RPCInOutAsyncMessageReceiver extends AbstractMessageReceiver {
private static Log log = LogFactory.getLog(RPCInOnlyMessageReceiver.class);
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Thu May 24 10:57:24 2012
@@ -159,7 +159,7 @@ public class AxisServiceBasedMultiLangua
//populate the MEP -> class map
mepToClassMap = new HashMap();
mepToClassMap.put(WSDL2Constants.MEP_URI_IN_ONLY,
- "org.apache.axis2.receivers.AbstractInMessageReceiver");
+ "org.apache.axis2.receivers.AbstractMessageReceiver");
mepToClassMap.put(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY,
"org.apache.axis2.receivers.AbstractMessageReceiver");
mepToClassMap.put(WSDL2Constants.MEP_URI_IN_OUT,
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
Thu May 24 10:57:24 2012
@@ -311,7 +311,7 @@
<!-- end of template for in-out message receiver -->
<!-- start of in-only -->
- <xsl:template
match="/interface[@basereceiver='org.apache.axis2.receivers.AbstractInMessageReceiver']">
+ <xsl:template
match="/interface[@basereceiver='org.apache.axis2.receivers.AbstractMessageReceiver']">
<xsl:variable name="skeletonname"><xsl:value-of
select="@skeletonInterfaceName"/></xsl:variable>
/**
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOnlyMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOnlyMessageReceiver.java?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOnlyMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOnlyMessageReceiver.java
Thu May 24 10:57:24 2012
@@ -31,7 +31,7 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractInMessageReceiver;
+import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,7 +41,7 @@ import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Map;
-public class CorbaInOnlyMessageReceiver extends AbstractInMessageReceiver
implements CorbaConstants {
+public class CorbaInOnlyMessageReceiver extends AbstractMessageReceiver
implements CorbaConstants {
private static Log log =
LogFactory.getLog(CorbaInOnlyMessageReceiver.class);
private ORB orb = null;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
Thu May 24 10:57:24 2012
@@ -40,10 +40,10 @@ import java.lang.reflect.Method;
* @see RawXMLINOutMessageReceiver
* @see RawXMLINOutAsyncMessageReceiver
*/
-public class RawXMLINOnlyMessageReceiver extends AbstractInMessageReceiver
+public class RawXMLINOnlyMessageReceiver extends AbstractMessageReceiver
implements MessageReceiver {
- private Method findOperation(AxisOperation op, Class implClass) {
+ private Method findOperation(AxisOperation op, Class<?> implClass) {
Method method = (Method)(op.getParameterValue("myMethod"));
if (method != null && method.getDeclaringClass() == implClass) return
method;
@@ -78,7 +78,7 @@ public class RawXMLINOnlyMessageReceiver
Object obj = getTheImplementationObject(msgContext);
// find the WebService method
- Class implClass = obj.getClass();
+ Class<?> implClass = obj.getClass();
AxisOperation op = msgContext.getAxisOperation();
Method method = findOperation(op, implClass);
Modified:
axis/axis2/java/core/trunk/modules/samples/ping/src/samples/ping/receivers/RawXMLINOnlyMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/ping/src/samples/ping/receivers/RawXMLINOnlyMessageReceiver.java?rev=1342192&r1=1342191&r2=1342192&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/samples/ping/src/samples/ping/receivers/RawXMLINOnlyMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/samples/ping/src/samples/ping/receivers/RawXMLINOnlyMessageReceiver.java
Thu May 24 10:57:24 2012
@@ -20,7 +20,6 @@ package samples.ping.receivers;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.receivers.AbstractInMessageReceiver;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.MessageReceiver;
