Author: veithen
Date: Tue Sep 2 12:49:18 2008
New Revision: 691353
URL: http://svn.apache.org/viewvc?rev=691353&view=rev
Log:
Transport unit tests: Use supportSingleOperation service parameter to dispatch
all requests to a single operation. This allows us to get rid of
DefaultOperationDispatcher and related code.
Removed:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/DefaultOperationDispatcher.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEchoEndpoint.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEndpoint.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java?rev=691353&r1=691352&r2=691353&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java
Tue Sep 2 12:49:18 2008
@@ -30,7 +30,6 @@
import org.apache.synapse.transport.testkit.client.ClientOptions;
import org.apache.synapse.transport.testkit.message.RESTMessage;
import org.apache.synapse.transport.testkit.name.Name;
-import
org.apache.synapse.transport.testkit.server.axis2.DefaultOperationDispatcher;
@Name("java.net")
public class JavaNetRESTClient implements AsyncTestClient<RESTMessage> {
@@ -48,8 +47,7 @@
public void sendMessage(ClientOptions options, ContentType contentType,
RESTMessage message) throws Exception {
StringBuilder url = new StringBuilder();
url.append(channel.getEndpointReference().getAddress());
- url.append('/');
- url.append(DefaultOperationDispatcher.DEFAULT_OPERATION_NAME);
+ url.append("/default");
String queryString = message.getQueryString();
if (queryString.length() > 0) {
url.append('?');
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java?rev=691353&r1=691352&r2=691353&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
Tue Sep 2 12:49:18 2008
@@ -23,6 +23,8 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import javax.xml.namespace.QName;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
@@ -46,7 +48,7 @@
@Override
protected AxisOperation createOperation() {
- AxisOperation operation = new
InOnlyAxisOperation(DefaultOperationDispatcher.DEFAULT_OPERATION_NAME);
+ AxisOperation operation = new InOnlyAxisOperation(new QName("in"));
operation.setMessageReceiver(this);
return operation;
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEchoEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEchoEndpoint.java?rev=691353&r1=691352&r2=691353&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEchoEndpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEchoEndpoint.java
Tue Sep 2 12:49:18 2008
@@ -19,6 +19,8 @@
package org.apache.synapse.transport.testkit.server.axis2;
+import javax.xml.namespace.QName;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
@@ -28,7 +30,7 @@
public class AxisEchoEndpoint extends AxisEndpoint {
@Override
protected AxisOperation createOperation() {
- AxisOperation operation = new
InOutAxisOperation(DefaultOperationDispatcher.DEFAULT_OPERATION_NAME);
+ AxisOperation operation = new InOutAxisOperation(new QName("echo"));
operation.setMessageReceiver(new AbstractInOutMessageReceiver() {
@Override
public void invokeBusinessLogic(MessageContext inMessage,
MessageContext outMessage) throws AxisFault {
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEndpoint.java?rev=691353&r1=691352&r2=691353&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEndpoint.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEndpoint.java
Tue Sep 2 12:49:18 2008
@@ -45,6 +45,8 @@
}
service = new AxisService(serviceName);
service.addOperation(createOperation());
+ // We want to receive all messages through the same operation:
+ service.addParameter(AxisService.SUPPORT_SINGLE_OP, true);
if (configurators != null) {
for (AxisServiceConfigurator configurator : configurators) {
configurator.setupService(service);
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java?rev=691353&r1=691352&r2=691353&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
Tue Sep 2 12:49:18 2008
@@ -19,8 +19,6 @@
package org.apache.synapse.transport.testkit.server.axis2;
-import java.util.Iterator;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -28,7 +26,6 @@
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.Phase;
import org.apache.axis2.transport.TransportListener;
import org.apache.synapse.transport.UtilsTransportServer;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
@@ -59,25 +56,9 @@
AxisConfiguration axisConfiguration = server.getAxisConfiguration();
- // Add a DefaultOperationDispatcher to the InFlow phase. This is
necessary because
- // we want to receive all messages through the same operation.
- DefaultOperationDispatcher operationDispatcher = new
DefaultOperationDispatcher();
- operationDispatcher.initDispatcher();
- getInFlowPhase(axisConfiguration,
"Dispatch").addHandler(operationDispatcher);
-
server.start();
}
- private static Phase getInFlowPhase(AxisConfiguration axisConfiguration,
String name) {
- for (Iterator<?> it = axisConfiguration.getInFlowPhases().iterator();
it.hasNext(); ) {
- Phase phase = (Phase)it.next();
- if (phase.getName().equals(name)) {
- return phase;
- }
- }
- return null;
- }
-
@SuppressWarnings("unused")
private void tearDown() throws Exception {
server.stop();
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java?rev=691353&r1=691352&r2=691353&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/misc/MinConcurrencyTest.java
Tue Sep 2 12:49:18 2008
@@ -23,6 +23,7 @@
import java.util.concurrent.TimeUnit;
import javax.mail.internet.ContentType;
+import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
@@ -40,7 +41,6 @@
import org.apache.synapse.transport.testkit.name.Name;
import org.apache.synapse.transport.testkit.server.axis2.AxisEndpoint;
import org.apache.synapse.transport.testkit.server.axis2.AxisServer;
-import
org.apache.synapse.transport.testkit.server.axis2.DefaultOperationDispatcher;
import org.apache.synapse.transport.testkit.tests.TestResourceSet;
import org.apache.synapse.transport.testkit.tests.TransportTestCase;
@@ -104,7 +104,7 @@
endpointResourceSet.addResource(new AxisEndpoint() {
@Override
protected AxisOperation createOperation() {
- AxisOperation operation = new
InOnlyAxisOperation(DefaultOperationDispatcher.DEFAULT_OPERATION_NAME);
+ AxisOperation operation = new InOnlyAxisOperation(new
QName("in"));
operation.setMessageReceiver(messageReceiver);
return operation;
}
