You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/09/13 05:21:41 UTC
svn commit: r280475 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/engine/ core/src/org/apache/axis2/receivers/
integration/test/org/apache/axis2/engine/
integration/test/org/apache/axis2/groovy/
integration/test/org/apache/axis2...
Author: chinthaka
Date: Mon Sep 12 20:21:19 2005
New Revision: 280475
URL: http://svn.apache.org/viewcvs?rev=280475&view=rev
Log:
- Making Addresing based dispatcher to work properly.
- fixing test cases as those which used addressing did not contain wsa action.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Mon Sep 12 20:21:19 2005
@@ -63,17 +63,17 @@
service =
messageContext.getSystemContext().getAxisConfiguration()
.getService(serviceName);
-// if (service == null) {
-// String filePart = toEPR.getAddress();
-// String[] values = Utils.parseRequestURLForServiceAndOperation(
-// filePart);
-// if (values[0] != null) {
-// serviceName = new QName(values[0]);
-// AxisConfiguration registry =
-// messageContext.getSystemContext().getAxisConfiguration();
-// return registry.getService(serviceName);
-// }
-// }
+ if (service == null) {
+ String filePart = toEPR.getAddress();
+ String[] values = Utils.parseRequestURLForServiceAndOperation(
+ filePart);
+ if (values[0] != null) {
+ serviceName = new QName(values[0]);
+ AxisConfiguration registry =
+ messageContext.getSystemContext().getAxisConfiguration();
+ return registry.getService(serviceName);
+ }
+ }
}
return service;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Mon Sep 12 20:21:19 2005
@@ -74,6 +74,7 @@
messageInformationHeaders.setRelatesTo(
new RelatesTo(oldMessageInfoHeaders.getMessageId(),
AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
+ messageInformationHeaders.setAction(oldMessageInfoHeaders.getAction());
newmsgCtx.setMessageInformationHeaders(messageInformationHeaders);
newmsgCtx.setOperationContext(messgeCtx.getOperationContext());
newmsgCtx.setServiceContext(messgeCtx.getServiceContext());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java Mon Sep 12 20:21:19 2005
@@ -52,6 +52,7 @@
messageInformationHeaders.setRelatesTo(
new RelatesTo(oldMessageInfoHeaders.getMessageId(),
AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
+ messageInformationHeaders.setAction(oldMessageInfoHeaders.getAction());
outMsgContext.setMessageInformationHeaders(messageInformationHeaders);
outMsgContext.setOperationContext(msgContext.getOperationContext());
outMsgContext.setServiceContext(msgContext.getServiceContext());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Mon Sep 12 20:21:19 2005
@@ -39,7 +39,7 @@
private EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
+ (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService/echoOMElement");
+ + "/axis/services/EchoXMLService");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
@@ -108,6 +108,7 @@
call.setTransportInfo(Constants.TRANSPORT_HTTP,
Constants.TRANSPORT_HTTP,
true);
+ call.setWsaAction(operationName.getLocalPart());
OMElement result = call.invokeBlocking(
operationName.getLocalPart(), method);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java Mon Sep 12 20:21:19 2005
@@ -41,7 +41,6 @@
public class EchoRawXMLOnTwoChannelsTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
-// + ("5556")
+ (UtilServer.TESTING_PORT)
+ "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
@@ -115,6 +114,7 @@
call.setTransportInfo(Constants.TRANSPORT_HTTP,
Constants.TRANSPORT_HTTP,
true);
+ call.setWsaAction(operationName.getLocalPart());
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
TestingUtils.campareWithCreatedOMElement(
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java Mon Sep 12 20:21:19 2005
@@ -76,7 +76,7 @@
}
- public void testServiceExsit() throws Exception {
+ public void testServiceExists() throws Exception {
ServiceDescription desc = UtilServer.getConfigurationContext().
getAxisConfiguration().getService(serviceName);
assertNotNull(desc);
@@ -95,6 +95,7 @@
call.setTransportInfo(Constants.TRANSPORT_HTTP,
Constants.TRANSPORT_HTTP,
false);
+ call.setWsaAction(operationName.getLocalPart());
OMElement result = call.invokeBlocking(operationName.getLocalPart(),
payload);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Mon Sep 12 20:21:19 2005
@@ -71,7 +71,7 @@
protected void setUp() throws Exception {
UtilsTCPServer.start();
-
+
//create and deploy the service
service =
Utils.createSimpleService(serviceName,
@@ -187,6 +187,7 @@
serviceContext);
call.setTo(targetEPR);
call.engageModule(new QName(Constants.MODULE_ADDRESSING));
+ call.setWsaAction(operationName.getLocalPart());
call.setTransportInfo(Constants.TRANSPORT_TCP,
Constants.TRANSPORT_TCP,
true);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=280475&r1=280474&r2=280475&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Mon Sep 12 20:21:19 2005
@@ -127,6 +127,7 @@
call.setTransportInfo(Constants.TRANSPORT_TCP,
Constants.TRANSPORT_TCP,
true);
+ call.setWsaAction(operationName.getLocalPart());
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
try {