Author: sagara
Date: Wed May 9 16:14:40 2012
New Revision: 1336271
URL: http://svn.apache.org/viewvc?rev=1336271&view=rev
Log:
Removed some classes deprecated from 1.3 and 1.4 releases.
Removed:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/receivers/CorbaInOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Base64.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/AbstractEngineTest.java
axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java
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=1336271&r1=1336270&r2=1336271&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
Wed May 9 16:14:40 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.AbstractInOutAsyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInMessageReceiver;
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
AbstractInOutAsyncMessageReceiver {
+public class RPCInOutAsyncMessageReceiver extends AbstractInMessageReceiver {
private static Log log = LogFactory.getLog(RPCInOnlyMessageReceiver.class);
@@ -67,7 +67,7 @@ public class RPCInOutAsyncMessageReceive
// 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();
AxisService service = inMessage.getAxisService();
@@ -137,7 +137,7 @@ public class RPCInOutAsyncMessageReceive
if (cause != null) {
msg = cause.getMessage();
}
- if (msg == null) {
+ if (msg == null && method != null) {
msg = "Exception occurred while trying to invoke service
method " +
method.getName();
}
@@ -147,10 +147,20 @@ public class RPCInOutAsyncMessageReceive
}
throw new AxisFault(msg);
} catch (Exception e) {
- String msg = "Exception occurred while trying to invoke service
method " +
- method.getName();
- log.error(msg, e);
- throw new AxisFault(msg, e);
+ if(method != null){
+ String msg = "Exception occurred while trying to invoke
service method " +
+ method.getName();
+ log.error(msg, e);
+ throw new AxisFault(msg, e);
+ }
+
}
}
+
+ @Override
+ protected void invokeBusinessLogic(MessageContext messageCtx) throws
AxisFault {
+ messageCtx.setProperty(DO_ASYNC, Boolean.TRUE);
+ super.receive(messageCtx);
+
+ }
}
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
Wed May 9 16:14:40 2012
@@ -27,11 +27,11 @@ import org.apache.axis2.context.MessageC
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.receivers.AbstractInOutAsyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import java.lang.reflect.Method;
-public class AsyncMessageReceiver extends AbstractInOutAsyncMessageReceiver {
+public class AsyncMessageReceiver extends AbstractInOutMessageReceiver {
public void invokeBusinessLogic(MessageContext msgContext,
MessageContext newmsgContext) throws
AxisFault {
@@ -40,13 +40,13 @@ public class AsyncMessageReceiver extend
Object obj = getTheImplementationObject(msgContext);
// find the WebService method
- Class ImplClass = obj.getClass();
+ Class<?> ImplClass = obj.getClass();
AxisOperation opDesc =
msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
- Class[] parameters = method.getParameterTypes();
+ Class<?>[] parameters = method.getParameterTypes();
Object[] args;
if ((parameters == null) || (parameters.length == 0)) {
@@ -84,7 +84,7 @@ public class AsyncMessageReceiver extend
}
}
- public Method findOperation(AxisOperation op, Class ImplClass) {
+ public Method findOperation(AxisOperation op, Class<?> ImplClass) {
Method method = null;
String methodName = op.getName().getLocalPart();
Method[] methods = ImplClass.getMethods();
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
Wed May 9 16:14:40 2012
@@ -22,7 +22,7 @@ package org.apache.axis2.engine;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -104,7 +104,7 @@ public class EngineWithoutPhaseResolving
AxisEngine.receive(mc);
}
- public class NullMessageReceiver extends AbstractInOutSyncMessageReceiver {
+ public class NullMessageReceiver extends AbstractInOutMessageReceiver {
public void invokeBusinessLogic(MessageContext inMessage,
MessageContext outMessage)
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
Wed May 9 16:14:40 2012
@@ -23,6 +23,9 @@ package org.apache.axis2.engine;
import junit.framework.Test;
import junit.framework.TestSuite;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -32,6 +35,7 @@ import org.apache.axis2.dispatchers.Addr
import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
import org.apache.axis2.dispatchers.SOAPActionBasedDispatcher;
import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
+import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
@@ -156,4 +160,12 @@ public class MessageWithServerTest exten
rReader.close();
socket.close();
}
+
+ class InstanceDispatcher extends AbstractHandler {
+
+ public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
+ return InvocationResponse.CONTINUE;
+ }
+ }
+
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
Wed May 9 16:14:40 2012
@@ -26,8 +26,10 @@ import org.apache.axiom.soap.SOAPFactory
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.util.MessageContextBuilder;
import java.lang.reflect.Method;
@@ -42,7 +44,7 @@ import java.lang.reflect.Method;
* @see RawXMLINOnlyMessageReceiver
* @see RawXMLINOutAsyncMessageReceiver
*/
-public class RawXMLINOutMessageReceiver extends
AbstractInOutSyncMessageReceiver
+public class RawXMLINOutMessageReceiver extends AbstractMessageReceiver
implements MessageReceiver {
private Method findOperation(AxisOperation op, Class implClass) {
@@ -108,4 +110,14 @@ public class RawXMLINOutMessageReceiver
throw AxisFault.makeFault(e);
}
}
+
+ public final void invokeBusinessLogic(MessageContext msgContext) throws
AxisFault {
+ MessageContext outMsgContext =
MessageContextBuilder.createOutMessageContext(msgContext);
+ outMsgContext.getOperationContext().addMessageContext(outMsgContext);
+
+ invokeBusinessLogic(msgContext, outMsgContext);
+ replicateState(msgContext);
+
+ AxisEngine.send(outMsgContext);
+ }
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/AbstractEngineTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/AbstractEngineTest.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/AbstractEngineTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/engine/AbstractEngineTest.java
Wed May 9 16:14:40 2012
@@ -22,7 +22,8 @@ package org.apache.axis2.engine;
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractMessageReceiver;
+import org.apache.axis2.util.MessageContextBuilder;
public class AbstractEngineTest extends TestCase {
public AbstractEngineTest() {
@@ -32,12 +33,22 @@ public class AbstractEngineTest extends
super(arg0);
}
- public class NullMessageReceiver extends AbstractInOutSyncMessageReceiver {
+ public class NullMessageReceiver extends AbstractMessageReceiver {
public void invokeBusinessLogic(MessageContext inMessage,
MessageContext outMessage)
throws AxisFault {
}
+
+ public final void invokeBusinessLogic(MessageContext msgContext)
throws AxisFault {
+ MessageContext outMsgContext =
MessageContextBuilder.createOutMessageContext(msgContext);
+
outMsgContext.getOperationContext().addMessageContext(outMsgContext);
+
+ invokeBusinessLogic(msgContext, outMsgContext);
+ replicateState(msgContext);
+
+ AxisEngine.send(outMsgContext);
+ }
}
}
Modified:
axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/ping/src/org/apache/axis2/ping/PingMessageReceiver.java
Wed May 9 16:14:40 2012
@@ -26,7 +26,7 @@ import org.apache.axis2.context.MessageC
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.engine.Pingable;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@ import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Iterator;
-public class PingMessageReceiver extends AbstractInOutSyncMessageReceiver
implements PingConstants {
+public class PingMessageReceiver extends AbstractInOutMessageReceiver
implements PingConstants {
private static Log log = LogFactory.getLog(PingMessageReceiver.class);
public void invokeBusinessLogic(MessageContext inMessage, MessageContext
outMessage) throws AxisFault {
@@ -44,7 +44,7 @@ public class PingMessageReceiver extends
AxisOperation axisOperation;
PingResponse pingResponse = new PingResponse();
pingResponse.initPingResponse(inMessage);
- Iterator opListIterator = getAxisOperations(inMessage);
+ Iterator<AxisOperation> opListIterator =
getAxisOperations(inMessage);
while (opListIterator.hasNext()) {
axisOperation = (AxisOperation) opListIterator.next();
@@ -75,9 +75,9 @@ public class PingMessageReceiver extends
* @return Iterator for the list of AxisOperations
* @throws AxisFault
*/
- private Iterator getAxisOperations(MessageContext inMessage) throws
AxisFault {
+ private Iterator<AxisOperation> getAxisOperations(MessageContext
inMessage) throws AxisFault {
boolean serviceLevel = false;
- Iterator operationsIterator;
+ Iterator<AxisOperation> operationsIterator;
OMElement element = null;
OMElement pingRequestElement = inMessage.getEnvelope().
@@ -95,8 +95,8 @@ public class PingMessageReceiver extends
if (!serviceLevel && element != null) {
//Operations to be pinged has been specified in the ping request
- Iterator elementIterator =
pingRequestElement.getChildrenWithName(new QName(TAG_OPERATION));
- ArrayList operationList = new ArrayList();
+ Iterator<?> elementIterator =
pingRequestElement.getChildrenWithName(new QName(TAG_OPERATION));
+ ArrayList<AxisOperation> operationList = new
ArrayList<AxisOperation>();
AxisOperation axisOperation;
while (elementIterator.hasNext()) {
Modified:
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java?rev=1336271&r1=1336270&r2=1336271&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptReceiver.java
Wed May 9 16:14:40 2012
@@ -24,7 +24,7 @@ import org.apache.axis2.context.MessageC
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.axis2.scripting.convertors.ConvertorFactory;
import org.apache.axis2.scripting.convertors.OMElementConvertor;
import org.apache.bsf.BSFEngine;
@@ -76,7 +76,7 @@ import java.util.ArrayList;
* The script language is determined by the file name suffix when using scripts
* in seperate files or the script parameter name suffix when using inline
scripts.
*/
-public class ScriptReceiver extends AbstractInOutSyncMessageReceiver {
+public class ScriptReceiver extends AbstractInOutMessageReceiver {
public static final String SCRIPT_ATTR = "script";
public static final String FUNCTION_ATTR = "function";
@@ -161,7 +161,7 @@ public class ScriptReceiver extends Abst
}
} else {
// the script is defined inline within the services.xml
- ArrayList parameters = axisService.getParameters();
+ ArrayList<Parameter> parameters = axisService.getParameters();
for (int i=0; scriptFileParam == null && i<parameters.size(); i++)
{
Parameter p = (Parameter) parameters.get(i);
if (p.getName().startsWith("script.")) {
