You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ml...@apache.org on 2007/02/05 18:04:16 UTC
svn commit: r503769 - in /webservices/sandesha/trunk/java: config/
interop/conf/ samples/conf/userguide/ src/org/apache/sandesha2/client/
src/org/apache/sandesha2/msgprocessors/ src/org/apache/sandesha2/util/
test-resources/ test/src/org/apache/sandesh...
Author: mlovett
Date: Mon Feb 5 09:04:15 2007
New Revision: 503769
URL: http://svn.apache.org/viewvc?view=rev&rev=503769
Log:
Move to new WSDL constants, to match upstream Axis2 changes
Modified:
webservices/sandesha/trunk/java/config/client_axis2.xml
webservices/sandesha/trunk/java/config/module.xml
webservices/sandesha/trunk/java/config/server_axis2.xml
webservices/sandesha/trunk/java/interop/conf/sec-client-axis2.xml
webservices/sandesha/trunk/java/interop/conf/sec-services.xml
webservices/sandesha/trunk/java/interop/conf/services.xml
webservices/sandesha/trunk/java/samples/conf/userguide/services.xml
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/java/test-resources/client_mtom_axis2.xml
webservices/sandesha/trunk/java/test-resources/server_mtom_axis2.xml
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/MessageContextPropertyTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/mtom/MTOMRMTest.java
Modified: webservices/sandesha/trunk/java/config/client_axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/client_axis2.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/config/client_axis2.xml (original)
+++ webservices/sandesha/trunk/java/config/client_axis2.xml Mon Feb 5 09:04:15 2007
@@ -48,9 +48,9 @@
<!--any operation -->
<!--Note : You can ovride this for particular service by adding the same element with your requirement-->
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</messageReceivers>
Modified: webservices/sandesha/trunk/java/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/module.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/config/module.xml (original)
+++ webservices/sandesha/trunk/java/config/module.xml Mon Feb 5 09:04:15 2007
@@ -36,7 +36,7 @@
</handler>
</OutFaultFlow>
- <operation name="RMInOnlyOperation" mep="http://www.w3.org/2004/08/wsdl/in-only">
+ <operation name="RMInOnlyOperation" mep="http://www.w3.org/2006/01/wsdl/in-only">
<messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
<!-- namespaces for the 2005-02 spec -->
@@ -50,7 +50,7 @@
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/AckRequested</actionMapping>
</operation>
- <operation name="RMInOutOperation" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <operation name="RMInOutOperation" mep="http://www.w3.org/2006/01/wsdl/in-out">
<messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
<!-- namespaces for the 2005-02 spec -->
@@ -63,10 +63,10 @@
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/MakeConnection</actionMapping>
</operation>
- <operation name="RMOutOnlyOperation" mep="http://www.w3.org/2004/08/wsdl/out-only">
+ <operation name="RMOutOnlyOperation" mep="http://www.w3.org/2006/01/wsdl/out-only">
<messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
</operation>
- <operation name="RMOutInOperation" mep="http://www.w3.org/2004/08/wsdl/out-in">
+ <operation name="RMOutInOperation" mep="http://www.w3.org/2006/01/wsdl/out-in">
<messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
</operation>
Modified: webservices/sandesha/trunk/java/config/server_axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/server_axis2.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/config/server_axis2.xml (original)
+++ webservices/sandesha/trunk/java/config/server_axis2.xml Mon Feb 5 09:04:15 2007
@@ -49,9 +49,9 @@
<!--any operation -->
<!--Note : You can ovride this for particular service by adding the same element with your requirement-->
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</messageReceivers>
Modified: webservices/sandesha/trunk/java/interop/conf/sec-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/conf/sec-client-axis2.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/interop/conf/sec-client-axis2.xml (original)
+++ webservices/sandesha/trunk/java/interop/conf/sec-client-axis2.xml Mon Feb 5 09:04:15 2007
@@ -48,9 +48,9 @@
<!--any operation -->
<!--Note : You can ovride this for particular service by adding the same element with your requirement-->
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</messageReceivers>
Modified: webservices/sandesha/trunk/java/interop/conf/sec-services.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/conf/sec-services.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/interop/conf/sec-services.xml (original)
+++ webservices/sandesha/trunk/java/interop/conf/sec-services.xml Mon Feb 5 09:04:15 2007
@@ -7,10 +7,10 @@
<module ref="rahas"/>
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
<messageReceiver
- mep="http://www.w3.org/2004/08/wsdl/in-only"
+ mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
</messageReceivers>
@@ -19,7 +19,7 @@
</parameter>
<operation name="EchoString"
- mep="http://www.w3.org/2004/08/wsdl/in-out">
+ mep="http://www.w3.org/2006/01/wsdl/in-out">
<actionMapping>urn:wsrm:EchoString</actionMapping>
<outputActionMapping>
urn:wsrm:EchoStringResponse
@@ -27,7 +27,7 @@
</operation>
<operation name="Ping"
- mep="http://www.w3.org/2004/08/wsdl/in-only">
+ mep="http://www.w3.org/2006/01/wsdl/in-only">
<actionMapping>urn:wsrm:Ping</actionMapping>
</operation>
Modified: webservices/sandesha/trunk/java/interop/conf/services.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/interop/conf/services.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/interop/conf/services.xml (original)
+++ webservices/sandesha/trunk/java/interop/conf/services.xml Mon Feb 5 09:04:15 2007
@@ -3,23 +3,23 @@
<module ref="sandesha2" />
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.sandesha2.interop.RMInteropServiceMessageReceiverInOut" />
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.sandesha2.interop.RMInteropServiceMessageReceiverInOnly" />
</messageReceivers>
<parameter locked="false" name="ServiceClass">
org.apache.sandesha2.interop.RMInteropServiceSkeletonImpl
</parameter>
<operation name="EchoString"
- mep="http://www.w3.org/2004/08/wsdl/in-out">
+ mep="http://www.w3.org/2006/01/wsdl/in-out">
<actionMapping>urn:wsrm:EchoString</actionMapping>
<outputActionMapping>
urn:wsrm:EchoStringResponse
</outputActionMapping>
</operation>
<operation name="Ping"
- mep="http://www.w3.org/2004/08/wsdl/in-only">
+ mep="http://www.w3.org/2006/01/wsdl/in-only">
<actionMapping>urn:wsrm:Ping</actionMapping>
</operation>
</service>
Modified: webservices/sandesha/trunk/java/samples/conf/userguide/services.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/samples/conf/userguide/services.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/samples/conf/userguide/services.xml (original)
+++ webservices/sandesha/trunk/java/samples/conf/userguide/services.xml Mon Feb 5 09:04:15 2007
@@ -9,12 +9,12 @@
<module ref="sandesha2" />
- <operation name="ping" mep="http://www.w3.org/2004/08/wsdl/in-only">
+ <operation name="ping" mep="http://www.w3.org/2006/01/wsdl/in-only">
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
<actionMapping>urn:wsrm:Ping</actionMapping>
</operation>
- <operation name="MTOMPing" mep="http://www.w3.org/2004/08/wsdl/in-only">
+ <operation name="MTOMPing" mep="http://www.w3.org/2006/01/wsdl/in-only">
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
</operation>
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Mon Feb 5 09:04:15 2007
@@ -39,7 +39,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisOperationFactory;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
@@ -1158,7 +1158,7 @@
AxisOperation anonOutOnlyOperation = service.getOperation(ServiceClient.ANON_OUT_ONLY_OP);
if (anonOutOnlyOperation==null) {
- anonOutOnlyOperation = AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY);
+ anonOutOnlyOperation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_OUT_ONLY);
anonOutOnlyOperation.setName(ServiceClient.ANON_OUT_ONLY_OP);
AxisOperation referenceOperation = service.getOperation(new QName (Sandesha2Constants.RM_IN_ONLY_OPERATION));
@@ -1179,7 +1179,7 @@
AxisOperation anonOutInOperation = service.getOperation(ServiceClient.ANON_OUT_IN_OP);
if (anonOutInOperation==null) {
- anonOutInOperation = AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_IN);
+ anonOutInOperation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_OUT_IN);
anonOutInOperation.setName(ServiceClient.ANON_OUT_IN_OP);
AxisOperation referenceOperation = service.getOperation(new QName (Sandesha2Constants.RM_IN_OUT_OPERATION_NAME));
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Mon Feb 5 09:04:15 2007
@@ -18,7 +18,6 @@
package org.apache.sandesha2.msgprocessors;
import java.util.Iterator;
-import java.util.List;
import javax.xml.namespace.QName;
@@ -30,8 +29,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2006Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -41,14 +39,12 @@
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
-import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SenderBean;
-import org.apache.sandesha2.util.AcknowledgementManager;
import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.Range;
import org.apache.sandesha2.util.RangeString;
@@ -192,10 +188,10 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(rmVersion) && anonReplyTo) {
MessageContext applicationMessage = storageManager.retrieveMessageContext(storageKey, configCtx);
AxisOperation operation = applicationMessage.getAxisOperation();
- if (operation!=null &&
- (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(operation.getMessageExchangePattern()) ||
- WSDL20_2006Constants.MEP_URI_OUT_IN.equals(operation.getMessageExchangePattern())))
- syncResponseNeeded = true;
+ if(operation!= null) {
+ int mep = operation.getAxisSpecifMEPConstant();
+ syncResponseNeeded = (mep == WSDLConstants.MEP_CONSTANT_OUT_IN);
+ }
}
if (!syncResponseNeeded) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Mon Feb 5 09:04:15 2007
@@ -29,7 +29,6 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -99,7 +98,7 @@
AxisOperation op = msgContext.getAxisOperation();
if(op != null) {
int mep = op.getAxisSpecifMEPConstant();
- if(mep == WSDL20_2004Constants.MEP_CONSTANT_OUT_IN) {
+ if(mep == WSDLConstants.MEP_CONSTANT_OUT_IN) {
EndpointReference replyTo = rewriteEPR(msgContext.getReplyTo(), msgContext);
msgContext.setReplyTo(replyTo);
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java Mon Feb 5 09:04:15 2007
@@ -28,7 +28,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.Handler.InvocationResponse;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -264,7 +264,7 @@
// the reply messages that we were looking for. If so we can remove the matching sender bean.
int mep = msgCtx.getAxisOperation().getAxisSpecifMEPConstant();
if(specVersion!=null && specVersion.equals(Sandesha2Constants.SPEC_VERSIONS.v1_0) &&
- mep == WSDL20_2004Constants.MEP_CONSTANT_OUT_IN) {
+ mep == WSDLConstants.MEP_CONSTANT_OUT_IN) {
RelatesTo relatesTo = msgCtx.getRelatesTo();
if(relatesTo != null) {
String messageId = relatesTo.getValue();
@@ -300,7 +300,7 @@
// add an ack entry here
boolean backchannelFree = (replyTo != null && !replyTo.hasAnonymousAddress()) ||
- WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY == mep;
+ WSDLConstants.MEP_CONSTANT_IN_ONLY == mep;
EndpointReference acksTo = new EndpointReference (bean.getAcksToEPR());
if (acksTo.hasAnonymousAddress() && backchannelFree) {
Object responseWritten = msgCtx.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
@@ -329,9 +329,14 @@
}
if (inOrderInvocation) {
-
- // Whatever the MEP, we suspend processing here and the invoker will do the real work
- result = InvocationResponse.SUSPEND;
+ // Whatever the MEP, we stop processing here and the invoker will do the real work. We only
+ // SUSPEND if we need to keep the backchannel open for the response... we may as well ABORT
+ // to let other cases end more quickly.
+ if(backchannelFree) {
+ result = InvocationResponse.ABORT;
+ } else {
+ result = InvocationResponse.SUSPEND;
+ }
InvokerBeanMgr storageMapMgr = storageManager.getInvokerBeanMgr();
storageManager.storeMessageContext(key, rmMsgCtx.getMessageContext());
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Mon Feb 5 09:04:15 2007
@@ -28,7 +28,7 @@
import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -357,7 +357,7 @@
getMsgContext().getAxisService());
OperationContext opcontext = OperationContextFactory
.createOperationContext(
- WSDL20_2004Constants.MEP_CONSTANT_OUT_IN, terminateOp);
+ WSDLConstants.MEP_CONSTANT_OUT_IN, terminateOp);
opcontext.setParent(getMsgContext().getServiceContext());
getConfigurationContext().registerOperationContext(rmMsgCtx.getMessageId(), opcontext);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java Mon Feb 5 09:04:15 2007
@@ -18,7 +18,6 @@
package org.apache.sandesha2.util;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -48,7 +47,6 @@
import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SenderBean;
-import org.apache.sandesha2.wsrm.AcknowledgementRange;
import org.apache.sandesha2.wsrm.Sequence;
import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Mon Feb 5 09:04:15 2007
@@ -760,7 +760,6 @@
public static void printSOAPEnvelope(SOAPEnvelope envelope, OutputStream out) throws SandeshaException {
try {
XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(out);
- System.out.println("\n");
envelope.serialize(writer);
} catch (XMLStreamException e) {
throw new SandeshaException(e.getMessage());
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java Mon Feb 5 09:04:15 2007
@@ -82,14 +82,10 @@
RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
List beans = rmdBeanMgr.find(findBean);
- System.out.println("Checking replyTo" + replyToAddress);
if(beans.isEmpty()) {
- System.out.println("No beans.");
rmsBean.setTerminationPauserForCS(true);
storageManager.getRMSBeanMgr().update(rmsBean);
complete = false;
- } else {
- System.out.println("Matcher:\n" + findBean + "\nFound beans:\n" + beans);
}
}
Modified: webservices/sandesha/trunk/java/test-resources/client_mtom_axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test-resources/client_mtom_axis2.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/test-resources/client_mtom_axis2.xml (original)
+++ webservices/sandesha/trunk/java/test-resources/client_mtom_axis2.xml Mon Feb 5 09:04:15 2007
@@ -36,9 +36,9 @@
<!--any operation -->
<!--Note : You can ovride this for particular service by adding the same element with your requirement-->
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</messageReceivers>
<!-- ================================================= -->
Modified: webservices/sandesha/trunk/java/test-resources/server_mtom_axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test-resources/server_mtom_axis2.xml?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/test-resources/server_mtom_axis2.xml (original)
+++ webservices/sandesha/trunk/java/test-resources/server_mtom_axis2.xml Mon Feb 5 09:04:15 2007
@@ -35,9 +35,9 @@
<!--any operation -->
<!--Note : You can ovride this for particular service by adding the same element with your requirement-->
<messageReceivers>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</messageReceivers>
<!-- ================================================= -->
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/MessageContextPropertyTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/MessageContextPropertyTest.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/MessageContextPropertyTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/MessageContextPropertyTest.java Mon Feb 5 09:04:15 2007
@@ -22,7 +22,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
@@ -49,7 +49,7 @@
AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
AxisService axisService = axisConfiguration.getService("RMSampleService");
- AxisOperation operation = AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY);
+ AxisOperation operation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_ONLY);
operation.setMessageReceiver(new TestMessageReceiver());
operation.setName(new QName(TEST_OPERATION_NAME));
axisService.addOperation(operation);
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/mtom/MTOMRMTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/mtom/MTOMRMTest.java?view=diff&rev=503769&r1=503768&r2=503769
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/mtom/MTOMRMTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/mtom/MTOMRMTest.java Mon Feb 5 09:04:15 2007
@@ -47,7 +47,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.SandeshaException;
@@ -90,7 +90,7 @@
AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
AxisService axisService = axisConfiguration.getService("RMSampleService");
- AxisOperation operation = AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY);
+ AxisOperation operation = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_ONLY);
operation.setMessageReceiver(new MTOMTestMessageReceiver());
operation.setName(new QName(MTOMping));
axisService.addOperation(operation);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org