Author: deepal
Date: Sat Aug 6 22:32:14 2011
New Revision: 1154615
URL: http://svn.apache.org/viewvc?rev=1154615&view=rev
Log:
Fixing the replyTo problem. Now if the request contains replyTo address
(nonanonymous). then we first send the ACK through the incoming transport and
send the application reply through the replyTo address.
- We need to build the envelop, so we build it
- If message contains MTOM or SWA then we build with attachment.
[Added a test case]
As part of the fix I had to fix PausingHandlerExecutionTest, because now the
flow complete call differently if message contains replyTo.
- In handers,
- Flow complete for in handler
- out handlers
- Flow complete for out handler
I also fixed TargetResolverServiceTest, I think either test is doing something
wrong or TargetResolver itself is doing something wrong. Will bring the
dicusssion to the mailing list.
Added:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/Echo.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/integration/UtilServer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java?rev=1154615&r1=1154614&r2=1154615&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
Sat Aug 6 22:32:14 2011
@@ -39,7 +39,7 @@ public class TargetResolverServiceTest e
public void receive(MessageContext msgContext) throws
AxisFault {
// Set the reply to on the server side to test
server side
// target resolvers
- msgContext.setReplyTo(new EndpointReference(
+ msgContext.setTo(new EndpointReference(
"http://ws.apache.org/new/anonymous/address";));
new
RawXMLINOutMessageReceiver().receive(msgContext);
}
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/Echo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/Echo.java?rev=1154615&r1=1154614&r2=1154615&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/Echo.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/Echo.java
Sat Aug 6 22:32:14 2011
@@ -29,7 +29,7 @@ public class Echo {
private static final Log log = LogFactory.getLog(Echo.class);
public static final String SERVICE_NAME = "EchoXMLService";
public static final String ECHO_OM_ELEMENT_OP_NAME = "echoOMElement";
-
+
public Echo() {
}
@@ -42,7 +42,7 @@ public class Echo {
log.info("echoOMElementNoResponse service called.");
}
- public void echoWithExeption(OMElement omEle) throws Exception {
+ public void echoWithExeption(OMElement omEle) throws Exception {
throw new Exception("Invoked the service");
}
@@ -55,6 +55,21 @@ public class Echo {
return omEle;
}
+ public OMElement longRunning(OMElement omEle) {
+ omEle.buildWithAttachments();
+ omEle.setLocalName(omEle.getLocalName() + "Response");
+ if (omEle.getFirstElement().getText().trim().startsWith("fault")) {
+ throw new RuntimeException("fault string found in echoOMElement");
+ }
+ try {
+ Thread.sleep(60000);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return omEle;
+ }
+
+
public OMElement echoOM(OMElement omEle) {
return omEle;
}
@@ -68,7 +83,7 @@ public class Echo {
}
public OMElement echoMTOMtoBase64(OMElement omEle) {
- OMText omText = (OMText)(omEle.getFirstElement()).getFirstOMChild();
+ OMText omText = (OMText) (omEle.getFirstElement()).getFirstOMChild();
omText.setOptimize(false);
return omEle;
}
Added:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java?rev=1154615&view=auto
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
(added)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/LongRunningServiceTest.java
Sat Aug 6 22:32:14 2011
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis2.engine;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.client.async.AxisCallback;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.engine.util.TestConstants;
+import org.apache.axis2.integration.TestingUtils;
+import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
+
+public class LongRunningServiceTest extends UtilServerBasedTestCase
+ implements TestConstants {
+
+ QName operationName = new QName("longRunning");
+ EndpointReference targetEPR = new EndpointReference(
+ "http://127.0.0.1:"; + (UtilServer.TESTING_PORT)
+// "http://127.0.0.1:"; + 5556
+ + "/axis2/services/EchoXMLService/longRunning");
+ private static final Log log =
LogFactory.getLog(LongRunningServiceTest.class);
+
+ public LongRunningServiceTest() {
+ super(LongRunningServiceTest.class.getName());
+ }
+
+ public LongRunningServiceTest(String testName) {
+ super(testName);
+ }
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(LongRunningServiceTest.class));
+ }
+
+ protected void setUp() throws Exception {
+ UtilServer.start();
+ UtilServer.engageAddressingModule();
+ AxisService service =
+ Utils.createSimpleService(serviceName,
+ Echo.class.getName(),
+ operationName);
+ UtilServer.deployService(service);
+
+ }
+
+ protected void tearDown() throws Exception {
+ UtilServer.unDeployService(serviceName);
+ }
+
+ public void testLongRunningService() throws Exception {
+ ConfigurationContext configConetxt =
UtilServer.createClientConfigurationContext();
+
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+
+ OMElement payload = TestingUtils.createDummyOMElement();
+ Options options = new Options();
+ options.setTo(targetEPR);
+ options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
+ options.setUseSeparateListener(true);
+ options.setAction(operationName.getLocalPart());
+ BetterAxisCallback callback = new BetterAxisCallback();
+
+ ServiceClient sender = new ServiceClient(configConetxt, null);
+ sender.setOptions(options);
+
+ sender.sendReceiveNonBlocking(payload, callback);
+
+ //Wait till the callback receives the response.
+ while (!callback.isComplete()) {
+ Thread.sleep(1000);
+ }
+
+ sender.cleanup();
+ configConetxt.terminate();
+ }
+
+ class BetterAxisCallback implements AxisCallback {
+ private boolean complete = false;
+
+ public void onComplete() {
+ log.info("onComplete\n");
+ complete = true;
+ }
+
+ public void onFault(MessageContext mc) {
+ System.out.println("Fault");
+ log.info("onFault\n");
+ complete = true;
+ }
+
+ public void onMessage(MessageContext mc) {
+ TestingUtils.compareWithCreatedOMElement(
+ mc.getEnvelope().getBody().getFirstElement());
+ log.info("onMessage\n");
+ complete = true;
+ }
+
+ public void onError(Exception e) {
+ e.printStackTrace();
+ log.info("Error\n" + e.getStackTrace());
+ complete = true;
+ }
+
+ public boolean isComplete() {
+ return complete;
+ }
+ }
+
+
+}
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java?rev=1154615&r1=1154614&r2=1154615&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
Sat Aug 6 22:32:14 2011
@@ -161,7 +161,6 @@ public class PausingHandlerExecutionTest
private void executeClient() throws Exception {
OMElement payload = TestingUtils.createDummyOMElement();
OMElement result = createClient().sendReceive(payload);
-
TestingUtils.compareWithCreatedOMElement(result);
}
@@ -192,8 +191,8 @@ public class PausingHandlerExecutionTest
// expected results when pausing
List expectedExecutionState = Arrays.asList(new String[] { "In1",
"In2", "In2", "In3",
- "In4", "In5", "In6", "Out1", "Out2", "Out3", "FCOut3",
"FCOut2", "FCOut1", "FCIn6",
- "FCIn5", "FCIn4", "FCIn3", "FCIn2", "FCIn1" });
+ "In4", "In5", "In6", "FCIn6", "FCIn5", "FCIn4", "FCIn3",
"FCIn2", "FCIn1", "Out1",
+ "Out2", "Out3", "FCOut3", "FCOut2", "FCOut1" });
//-----------------------------------------------------------------------
assertEquals(expectedExecutionState, testResults);
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=1154615&r1=1154614&r2=1154615&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/integration/UtilServer.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/integration/UtilServer.java
Sat Aug 6 22:32:14 2011
@@ -137,8 +137,8 @@ public class UtilServer {
}
return ConfigurationContextFactory
.createConfigurationContextFromFileSystem(file.getAbsolutePath(),
-
file.getAbsolutePath() +
-
"/conf/axis2.xml");
+ file.getAbsolutePath() +
+ "/conf/axis2.xml");
}
public static ConfigurationContext getNewConfigurationContext(
@@ -150,7 +150,7 @@ public class UtilServer {
}
return ConfigurationContextFactory
.createConfigurationContextFromFileSystem(file.getAbsolutePath(),
- axis2xml);
+ axis2xml);
}
public static synchronized void stop() throws AxisFault {
@@ -184,7 +184,7 @@ public class UtilServer {
.createConfigurationContextFromFileSystem(
TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
null);
AxisModule axisModule = DeploymentEngine.buildModule(file,
-
configContext.getAxisConfiguration());
+ configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(axisModule);
configContext.getAxisConfiguration().addService(service);
@@ -215,18 +215,26 @@ public class UtilServer {
TestCase.assertTrue(file.exists());
ConfigurationContext configContext =
- ConfigurationContextFactory
.createConfigurationContextFromFileSystem(
-
TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH +"/integrationRepo"),
+
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
+
TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "/integrationRepo"),
TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH +
"/integrationRepo/conf/axis2.xml"));
AxisModule axisModule = DeploymentEngine.buildModule(file,
-
configContext.getAxisConfiguration());
+ configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(axisModule);
return configContext;
}
+ public static void engageAddressingModule() throws AxisFault {
+ File file = getAddressingMARFile();
+ AxisModule axisModule = DeploymentEngine.buildModule(file,
+ receiver.getConfigurationContext().getAxisConfiguration());
+
receiver.getConfigurationContext().getAxisConfiguration().engageModule(axisModule);
+ }
+
+
public static ConfigurationContext createClientConfigurationContext(String
repo)
throws AxisFault {
- return ConfigurationContextFactory
.createConfigurationContextFromFileSystem(
+ return
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
repo,
repo + "/conf/axis2.xml");
}
@@ -239,7 +247,7 @@ public class UtilServer {
ConfigurationContext configContext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem(clientHome, null);
AxisModule axisModule = DeploymentEngine.buildModule(file,
-
configContext.getAxisConfiguration());
+ configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(axisModule);
// sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=1154615&r1=1154614&r2=1154615&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
Sat Aug 6 22:32:14 2011
@@ -83,27 +83,31 @@ public abstract class AbstractMessageRec
* @throws AxisFault if a problem occurred
*/
public void receive(final MessageContext messageCtx) throws AxisFault {
- if (messageCtx.isPropertyTrue(DO_ASYNC)
- || ((messageCtx.getParameter(DO_ASYNC) != null)
&&
-
JavaUtils.isTrueExplicitly(messageCtx.getParameter(DO_ASYNC).getValue()))) {
-
+ // Checking whether the replyTo address, if it is non Anonymous then
we need to send the ACK and
+ // send the reply to on replyTo address
+ EndpointReference replyTo = messageCtx.getReplyTo();
+ if (replyTo != null && !replyTo.hasAnonymousAddress()) {
+ // We have a valid reply to address, so processing the request
through AsyncMessageReceiverWorker and send the ACK
+ processAsAsync(messageCtx);
+ return;
+ }
+ // Checking for long running services
+ if (messageCtx.isPropertyTrue(DO_ASYNC)
+ || ((messageCtx.getParameter(DO_ASYNC) != null) &&
+
JavaUtils.isTrueExplicitly(messageCtx.getParameter(DO_ASYNC).getValue()))) {
String mep = messageCtx.getAxisOperation()
- .getMessageExchangePattern();
- EndpointReference replyTo = messageCtx.getReplyTo();
- // In order to invoke the service in the ASYNC mode,
the request
+ .getMessageExchangePattern();
+ // Checking whether the replyTo address is valid, so that we can
send the Application response
+ // In order to invoke the service in the ASYNC mode, the request
// should contain ReplyTo header if the MEP of the
service is not
// InOnly type
- if ((!WSDLUtil.isOutputPresentForMEP(mep))
- || (replyTo != null &&
!replyTo.hasAnonymousAddress())) {
- AsyncMessageReceiverWorker worker = new
AsyncMessageReceiverWorker(
- messageCtx);
- messageCtx.getEnvelope().build();
-
messageCtx.getConfigurationContext().getThreadPool().execute(
- worker);
- return;
- }
- }
+ if ((!WSDLUtil.isOutputPresentForMEP(mep))
+ || (replyTo != null && !replyTo.hasAnonymousAddress())) {
+ processAsAsync(messageCtx);
+ return;
+ }
+ }
ThreadContextDescriptor tc = setThreadContext(messageCtx);
try {
@@ -129,6 +133,28 @@ public abstract class AbstractMessageRec
}
/**
+ * This is to create a separate thread to process business logic
invocation. We create a AsyncMessageReceiverWorker
+ * which internally calls the message receiver specified for the operation.
+ *
+ * We send the ACK through the incoming transport and reply through the
address specified in replyTo address.
+ * @param messageCtx msgContext the current MessageContext
+ */
+ private void processAsAsync(MessageContext messageCtx) {
+ AsyncMessageReceiverWorker worker = new AsyncMessageReceiverWorker(
+ messageCtx);
+ if (messageCtx.isDoingMTOM() || messageCtx.isDoingSwA()) {
+ // If we are doing MTOM or SWA then we need to build with
attachment, because we are going to close the incoming connection
+ messageCtx.getEnvelope().buildWithAttachments();
+ } else {
+ // We need to build the envelop since we are going to close the
input stream
+ messageCtx.getEnvelope().build();
+ }
+
+ messageCtx.getConfigurationContext().getThreadPool().execute(
+ worker);
+ }
+
+ /**
* Several pieces of information need to be available to the service
* implementation class. For one, the ThreadContextClassLoader needs
* to be correct, and for another we need to give the service code
