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/16 15:23:48 UTC
svn commit: r508417 - in /webservices/sandesha/trunk/java: config/
src/org/apache/sandesha2/ src/org/apache/sandesha2/util/
src/org/apache/sandesha2/wsrm/ test-resources/
test/src/org/apache/sandesha2/faulttests/ test/src/org/apache/sandesha2/wsrm/
Author: mlovett
Date: Fri Feb 16 06:23:46 2007
New Revision: 508417
URL: http://svn.apache.org/viewvc?view=rev&rev=508417
Log:
Move to new WS-RM and WS-MC namespaces, to match the latest WX-RX spec
Modified:
webservices/sandesha/trunk/java/config/module.xml
webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
webservices/sandesha/trunk/java/test-resources/MakeConnection.xml
webservices/sandesha/trunk/java/test-resources/MessagePending.xml
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedFaultTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MessagePendingTest.java
Modified: webservices/sandesha/trunk/java/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/module.xml?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/config/module.xml (original)
+++ webservices/sandesha/trunk/java/config/module.xml Fri Feb 16 06:23:46 2007
@@ -42,8 +42,8 @@
<!-- namespaces for the 2005-02 spec -->
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement</actionMapping>
- <!-- namespaces for the 2006-08 spec -->
- <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement</actionMapping>
+ <!-- namespaces for the 2007-02 spec -->
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement</actionMapping>
</operation>
<operation name="RMInOutOperation" mep="http://www.w3.org/2006/01/wsdl/in-out">
@@ -56,17 +56,17 @@
<!-- For interoparability perposes. Some WSRM implementations tend to send this as the LastMessage,
replied with an ack -->
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/LastMessage</actionMapping>
- <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/AckRequested</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/AckRequested</actionMapping>
<!-- TerminateSequence works as a InOut in RM 1.0 anonymous scenario -->
<actionMapping>http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence</actionMapping>
- <!-- namespaces for the 2006-08 spec -->
- <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequence</actionMapping>
- <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequence</actionMapping>
- <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequence</actionMapping>
- <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/MakeConnection</actionMapping>
+ <!-- namespaces for the 2007-02 spec -->
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequence</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/TerminateSequence</actionMapping>
+ <actionMapping>http://docs.oasis-open.org/ws-rx/wsmc/200702/MakeConnection</actionMapping>
</operation>
<operation name="RMOutOnlyOperation" mep="http://www.w3.org/2006/01/wsdl/out-only">
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java Fri Feb 16 06:23:46 2007
@@ -300,7 +300,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(rmNamespaceValue)) {
rmSpecVersion = Sandesha2Constants.SPEC_VERSIONS.v1_0;
- } else if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(rmNamespaceValue)) {
+ } else if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(rmNamespaceValue)) {
rmSpecVersion = Sandesha2Constants.SPEC_VERSIONS.v1_1;
}
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java Fri Feb 16 06:23:46 2007
@@ -64,51 +64,81 @@
String SOAP_ACTION_LAST_MESSAGE = "http://schemas.xmlsoap.org/ws/2005/02/rm/LastMessage";
}
+
+ public interface QNames {
+ // Headers
+ QName Sequence = new QName(NS_URI, WSRM_COMMON.SEQUENCE);
+ QName SequenceAck = new QName(NS_URI, WSRM_COMMON.SEQUENCE_ACK);
+ QName AckRequest = new QName(NS_URI, WSRM_COMMON.ACK_REQUESTED);
+ QName SequenceFault = new QName(NS_URI, WSRM_COMMON.SEQUENCE_FAULT);
+
+ // Body elements
+ QName CreateSequence = new QName(NS_URI, WSRM_COMMON.CREATE_SEQUENCE);
+ QName CreateSequenceResponse = new QName(NS_URI, WSRM_COMMON.CREATE_SEQUENCE_RESPONSE);
+ QName CloseSequence = new QName(NS_URI, WSRM_COMMON.CLOSE_SEQUENCE);
+ QName CloseSequenceResponse = new QName(NS_URI, WSRM_COMMON.CLOSE_SEQUENCE_RESPONSE);
+ QName TerminateSequence = new QName(NS_URI, WSRM_COMMON.TERMINATE_SEQUENCE);
+ QName TerminateSequenceResponse = new QName(NS_URI, WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE);
+
+ // Other elements
+ QName Identifier = new QName(NS_URI, WSRM_COMMON.IDENTIFIER);
+ }
}
- public interface SPEC_2006_08 {
+ public interface SPEC_2007_02 {
- String NS_URI = "http://docs.oasis-open.org/ws-rx/wsrm/200608";
- String ANONYMOUS_URI_PREFIX = "http://docs.oasis-open.org/ws-rx/wsrm/200608/anonymous?id=";
+ String NS_URI = "http://docs.oasis-open.org/ws-rx/wsrm/200702";
+ String MC_NS_URI = "http://docs.oasis-open.org/ws-rx/wsmc/200702";
+ String ANONYMOUS_URI_PREFIX = "http://docs.oasis-open.org/ws-rx/wsmc/200702/anonymous?id=";
String SEC_NS_URI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
String ADDRESSING_NS_URI = AddressingConstants.Final.WSA_NAMESPACE;
public interface Actions {
- String ACTION_CREATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequence";
-
- String ACTION_CREATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequenceResponse";
-
- String ACTION_SEQUENCE_ACKNOWLEDGEMENT = "http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement";
-
- String ACTION_TERMINATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequence";
-
- String ACTION_TERMINATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequenceResponse";
-
- String ACTION_ACK_REQUEST = "http://docs.oasis-open.org/ws-rx/wsrm/200608/AckRequested";
-
- String ACTION_CLOSE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequence";
-
- String ACTION_CLOSE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequenceResponse";
-
- String ACTION_MAKE_CONNECTION = "http://docs.oasis-open.org/ws-rx/wsrm/200608/MakeConnection";
-
- String SOAP_ACTION_CREATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequence";
-
- String SOAP_ACTION_CREATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequenceResponse";
-
- String SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT = "http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement";
-
- String SOAP_ACTION_TERMINATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequence";
-
- String SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequenceResponse";
-
- String SOAP_ACTION_ACK_REQUEST = "http://docs.oasis-open.org/ws-rx/wsrm/200608/AckRequested";
-
- String SOAP_ACTION_CLOSE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequence";
+ // WS-RM actions
+ String ACTION_CREATE_SEQUENCE = SPEC_2007_02.NS_URI + "/CreateSequence";
+ String ACTION_CREATE_SEQUENCE_RESPONSE = SPEC_2007_02.NS_URI + "/CreateSequenceResponse";
+ String ACTION_CLOSE_SEQUENCE = SPEC_2007_02.NS_URI + "/CloseSequence";
+ String ACTION_CLOSE_SEQUENCE_RESPONSE = SPEC_2007_02.NS_URI + "/CloseSequenceResponse";
+ String ACTION_TERMINATE_SEQUENCE = SPEC_2007_02.NS_URI + "/TerminateSequence";
+ String ACTION_TERMINATE_SEQUENCE_RESPONSE = SPEC_2007_02.NS_URI + "/TerminateSequenceResponse";
+ String ACTION_SEQUENCE_ACKNOWLEDGEMENT = SPEC_2007_02.NS_URI + "/SequenceAcknowledgement";
+ String ACTION_ACK_REQUEST = SPEC_2007_02.NS_URI + "/AckRequested";
+
+ // WS-MC actions
+ String ACTION_MAKE_CONNECTION = SPEC_2007_02.MC_NS_URI + "/MakeConnection";
+
+ String SOAP_ACTION_CREATE_SEQUENCE = ACTION_CREATE_SEQUENCE;
+ String SOAP_ACTION_CREATE_SEQUENCE_RESPONSE = ACTION_CREATE_SEQUENCE_RESPONSE;
+ String SOAP_ACTION_CLOSE_SEQUENCE = ACTION_CLOSE_SEQUENCE;
+ String SOAP_ACTION_CLOSE_SEQUENCE_RESPONSE = ACTION_CLOSE_SEQUENCE_RESPONSE;
+ String SOAP_ACTION_TERMINATE_SEQUENCE = ACTION_TERMINATE_SEQUENCE;
+ String SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE = ACTION_TERMINATE_SEQUENCE_RESPONSE;
+ String SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT = ACTION_SEQUENCE_ACKNOWLEDGEMENT;
+ String SOAP_ACTION_ACK_REQUEST = ACTION_ACK_REQUEST;
+ String SOAP_ACTION_MAKE_CONNECTION = ACTION_MAKE_CONNECTION;
+ }
+
+ public interface QNames {
+ // Headers
+ QName Sequence = new QName(NS_URI, WSRM_COMMON.SEQUENCE);
+ QName SequenceAck = new QName(NS_URI, WSRM_COMMON.SEQUENCE_ACK);
+ QName AckRequest = new QName(NS_URI, WSRM_COMMON.ACK_REQUESTED);
+ QName SequenceFault = new QName(NS_URI, WSRM_COMMON.SEQUENCE_FAULT);
+ QName UsesSequenceSTR = new QName(NS_URI, WSRM_COMMON.USES_SEQUENCE_STR);
+ QName MessagePending = new QName(MC_NS_URI, WSRM_COMMON.MESSAGE_PENDING);
+
+ // Body elements
+ QName CreateSequence = new QName(NS_URI, WSRM_COMMON.CREATE_SEQUENCE);
+ QName CreateSequenceResponse = new QName(NS_URI, WSRM_COMMON.CREATE_SEQUENCE_RESPONSE);
+ QName CloseSequence = new QName(NS_URI, WSRM_COMMON.CLOSE_SEQUENCE);
+ QName CloseSequenceResponse = new QName(NS_URI, WSRM_COMMON.CLOSE_SEQUENCE_RESPONSE);
+ QName TerminateSequence = new QName(NS_URI, WSRM_COMMON.TERMINATE_SEQUENCE);
+ QName TerminateSequenceResponse = new QName(NS_URI, WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE);
+ QName MakeConnection = new QName(MC_NS_URI, WSRM_COMMON.MAKE_CONNECTION);
- String SOAP_ACTION_MAKE_CONNECTION = "http://docs.oasis-open.org/ws-rx/wsrm/200608/MakeConnection";
-
+ // Other elements
+ QName Identifier = new QName(NS_URI, WSRM_COMMON.IDENTIFIER);
}
}
@@ -116,6 +146,8 @@
String NS_PREFIX_RM = "wsrm";
+ String NS_PREFIX_MC = "wsmc";
+
String MSG_NUMBER = "MessageNumber";
String LAST_MSG = "LastMessage";
@@ -491,7 +523,7 @@
static final String [] SPEC_NS_URIS = {
SPEC_2005_02.NS_URI,
- SPEC_2006_08.NS_URI
+ SPEC_2007_02.NS_URI
};
public interface MessageContextProperties{
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java Fri Feb 16 06:23:46 2007
@@ -158,7 +158,7 @@
offerPart.setIdentifier(identifier);
createSequencePart.setSequenceOffer(offerPart);
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(rmNamespaceValue)) {
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(rmNamespaceValue)) {
Endpoint endpoint = new Endpoint (offeredEndpoint, rmNamespaceValue, addressingNamespace);
offerPart.setEndpoint(endpoint);
}
@@ -200,8 +200,8 @@
// If we are using token based security, and the 1.1 spec level, then we
// should introduce a UsesSequenceSTR header into the message.
- if(createSequencePart.getNamespaceValue().equals(Sandesha2Constants.SPEC_2006_08.NS_URI)) {
- UsesSequenceSTR header = new UsesSequenceSTR(null, Sandesha2Constants.SPEC_2006_08.NS_URI);
+ if(createSequencePart.getNamespaceValue().equals(Sandesha2Constants.SPEC_2007_02.NS_URI)) {
+ UsesSequenceSTR header = new UsesSequenceSTR(null, Sandesha2Constants.SPEC_2007_02.NS_URI);
header.toSOAPEnvelope(createSeqmsgContext.getEnvelope());
}
@@ -472,7 +472,7 @@
MessageContext makeConnectionMessageCtx = SandeshaUtil.createNewRelatedMessageContext(referenceRMMessage,makeConnectionOperation);
RMMsgContext makeConnectionRMMessageCtx = MsgInitializer.initializeMessage(makeConnectionMessageCtx);
- MakeConnection makeConnection = new MakeConnection (rmNamespaceValue);
+ MakeConnection makeConnection = new MakeConnection (Sandesha2Constants.SPEC_2007_02.MC_NS_URI);
if (makeConnectionSeqId!=null) {
Identifier identifier = new Identifier (rmNamespaceValue);
identifier.setIndentifer(makeConnectionSeqId);
@@ -480,7 +480,7 @@
}
if (makeConnectionAnonURI!=null) {
- Address address = new Address (rmNamespaceValue);
+ Address address = new Address (Sandesha2Constants.SPEC_2007_02.MC_NS_URI);
address.setAddress (makeConnectionAnonURI);
makeConnection.setAddress(address);
}
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=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Fri Feb 16 06:23:46 2007
@@ -721,7 +721,7 @@
}
public static boolean isWSRMAnonymous(String address) {
- if (address!=null && address.startsWith(Sandesha2Constants.SPEC_2006_08.ANONYMOUS_URI_PREFIX))
+ if (address!=null && address.startsWith(Sandesha2Constants.SPEC_2007_02.ANONYMOUS_URI_PREFIX))
return true;
else
return false;
@@ -981,7 +981,7 @@
}
if(log.isDebugEnabled()) log.debug("Rewriting EPR with UUID " + uuid);
- epr.setAddress(Sandesha2Constants.SPEC_2006_08.ANONYMOUS_URI_PREFIX + uuid);
+ epr.setAddress(Sandesha2Constants.SPEC_2007_02.ANONYMOUS_URI_PREFIX + uuid);
}
if (log.isDebugEnabled())
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Fri Feb 16 06:23:46 2007
@@ -128,7 +128,7 @@
String specVersion = null;
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(messageRMNamespace)) {
specVersion = Sandesha2Constants.SPEC_VERSIONS.v1_0;
- } else if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(messageRMNamespace)) {
+ } else if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(messageRMNamespace)) {
specVersion = Sandesha2Constants.SPEC_VERSIONS.v1_1;
} else {
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java Fri Feb 16 06:23:46 2007
@@ -37,7 +37,7 @@
public static String getSpecVersionString (String namespaceValue) throws SandeshaException {
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceValue))
return Sandesha2Constants.SPEC_VERSIONS.v1_0;
- else if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceValue))
+ else if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceValue))
return Sandesha2Constants.SPEC_VERSIONS.v1_1;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
@@ -49,7 +49,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.NS_URI;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.NS_URI;
+ return Sandesha2Constants.SPEC_2007_02.NS_URI;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -60,7 +60,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_CREATE_SEQUENCE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -71,7 +71,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE_RESPONSE;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE_RESPONSE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_CREATE_SEQUENCE_RESPONSE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -82,7 +82,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_TERMINATE_SEQUENCE;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_TERMINATE_SEQUENCE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -91,7 +91,7 @@
public static String getTerminateSequenceResponseAction (String specVersion) throws SandeshaException {
if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE_RESPONSE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_TERMINATE_SEQUENCE_RESPONSE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec));
@@ -103,7 +103,7 @@
SandeshaMessageKeys.closeSequenceSpecLevel,
specVersion));
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_CLOSE_SEQUENCE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -116,7 +116,7 @@
SandeshaMessageKeys.closeSequenceSpecLevel,
specVersion));
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE_RESPONSE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_CLOSE_SEQUENCE_RESPONSE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -127,7 +127,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return null; //No action defined for ackRequests
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_ACK_REQUEST;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_ACK_REQUEST;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -138,7 +138,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -151,7 +151,7 @@
throw new SandeshaException (message);
}
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_MAKE_CONNECTION;
+ return Sandesha2Constants.SPEC_2007_02.Actions.ACTION_MAKE_CONNECTION;
else {
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -163,7 +163,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_CREATE_SEQUENCE;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_CREATE_SEQUENCE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.SOAP_ACTION_CREATE_SEQUENCE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -174,7 +174,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -185,7 +185,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_TERMINATE_SEQUENCE;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_TERMINATE_SEQUENCE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.SOAP_ACTION_TERMINATE_SEQUENCE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -194,7 +194,7 @@
public static String getTerminateSequenceResponseSOAPAction (String specVersion) throws SandeshaException {
if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE;
+ return Sandesha2Constants.SPEC_2007_02.Actions.SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -205,7 +205,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
throw new SandeshaException ("this spec version does not define a ackRequest SOAP action");
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_ACK_REQUEST;
+ return Sandesha2Constants.SPEC_2007_02.Actions.SOAP_ACTION_ACK_REQUEST;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -216,7 +216,7 @@
if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion))
return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT;
else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion))
- return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT;
+ return Sandesha2Constants.SPEC_2007_02.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT;
else
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
@@ -305,8 +305,8 @@
}
public static String getAddressingNamespace(String rmNamespace) throws SandeshaException {
- if(Sandesha2Constants.SPEC_2006_08.NS_URI.equals(rmNamespace)) {
- return Sandesha2Constants.SPEC_2006_08.ADDRESSING_NS_URI;
+ if(Sandesha2Constants.SPEC_2007_02.NS_URI.equals(rmNamespace)) {
+ return Sandesha2Constants.SPEC_2007_02.ADDRESSING_NS_URI;
} else if(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(rmNamespace)) {
return Sandesha2Constants.SPEC_2005_02.ADDRESSING_NS_URI;
}
@@ -320,8 +320,8 @@
return Sandesha2Constants.SPEC_2005_02.SEC_NS_URI;
}
- if(rmNamespace.equals(Sandesha2Constants.SPEC_2006_08.NS_URI)) {
- return Sandesha2Constants.SPEC_2006_08.SEC_NS_URI;
+ if(rmNamespace.equals(Sandesha2Constants.SPEC_2007_02.NS_URI)) {
+ return Sandesha2Constants.SPEC_2007_02.SEC_NS_URI;
}
return null;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java Fri Feb 16 06:23:46 2007
@@ -109,7 +109,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java Fri Feb 16 06:23:46 2007
@@ -78,7 +78,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return false;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java Fri Feb 16 06:23:46 2007
@@ -77,7 +77,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return false;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java Fri Feb 16 06:23:46 2007
@@ -138,7 +138,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Fri Feb 16 06:23:46 2007
@@ -136,7 +136,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java Fri Feb 16 06:23:46 2007
@@ -117,7 +117,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java Fri Feb 16 06:23:46 2007
@@ -73,7 +73,7 @@
OMFactory factory = element.getOMFactory();
- OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+ OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_MC);
OMElement addressElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.ADDRESS, rmNamespace);
addressElement.setText(address);
@@ -91,7 +91,7 @@
}
public boolean isNamespaceSupported (String namespaceName) {
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.MC_NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java Fri Feb 16 06:23:46 2007
@@ -119,7 +119,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java Fri Feb 16 06:23:46 2007
@@ -120,7 +120,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java Fri Feb 16 06:23:46 2007
@@ -180,7 +180,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Fri Feb 16 06:23:46 2007
@@ -174,7 +174,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Endpoint.java Fri Feb 16 06:23:46 2007
@@ -77,7 +77,7 @@
}
public boolean isNamespaceSupported (String namespaceName) {
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java Fri Feb 16 06:23:46 2007
@@ -97,7 +97,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java Fri Feb 16 06:23:46 2007
@@ -160,7 +160,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java Fri Feb 16 06:23:46 2007
@@ -109,7 +109,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java Fri Feb 16 06:23:46 2007
@@ -77,7 +77,7 @@
return true;
//TODO is this optional or not required.
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MakeConnection.java Fri Feb 16 06:23:46 2007
@@ -61,7 +61,10 @@
public Object fromOMElement(OMElement makeConnectionElement) throws OMException, AxisFault {
- OMElement identifierElement = makeConnectionElement.getFirstChildWithName(new QName(namespaceValue, Sandesha2Constants.WSRM_COMMON.IDENTIFIER));
+ OMElement identifierElement = makeConnectionElement.getFirstChildWithName(Sandesha2Constants.SPEC_2007_02.QNames.Identifier);
+ if(identifierElement == null) {
+ identifierElement = makeConnectionElement.getFirstChildWithName(Sandesha2Constants.SPEC_2005_02.QNames.Identifier);
+ }
OMElement addressElement = makeConnectionElement.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSA.ADDRESS));
if (identifierElement==null && addressElement==null) {
@@ -70,7 +73,7 @@
}
if (identifierElement!=null) {
- identifier = new Identifier (namespaceValue);
+ identifier = new Identifier (identifierElement.getNamespace().getNamespaceURI());
identifier.fromOMElement(makeConnectionElement);
}
@@ -87,10 +90,7 @@
}
public boolean isNamespaceSupported(String namespaceName) {
- if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
- return false;
-
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.MC_NS_URI.equals(namespaceName))
return true;
return false;
@@ -109,8 +109,7 @@
}
*/
OMFactory factory = body.getOMFactory();
- OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
-
+ OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_MC);
OMElement makeConnectionElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.MAKE_CONNECTION,rmNamespace);
if (identifier!=null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java Fri Feb 16 06:23:46 2007
@@ -92,7 +92,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java Fri Feb 16 06:23:46 2007
@@ -109,10 +109,7 @@
}
public boolean isNamespaceSupported(String namespaceName) {
- if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
- return false;
-
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.MC_NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java Fri Feb 16 06:23:46 2007
@@ -97,7 +97,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java Fri Feb 16 06:23:46 2007
@@ -24,12 +24,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
@@ -60,7 +57,6 @@
private MessagePending messagePending = null;
private MakeConnection makeConnection = null;
private SequenceFault sequenceFault = null;
- private String rmNamespaceValue = null;
public RMElements () {
sequenceAcknowledgements = new ArrayList ();
@@ -84,128 +80,124 @@
factory = SOAPAbstractFactory.getSOAPFactory(Sandesha2Constants.SOAPVersion.v1_1);
else
factory = SOAPAbstractFactory.getSOAPFactory(Sandesha2Constants.SOAPVersion.v1_2);
-
- //finding out the rm version.
- rmNamespaceValue = getRMNamespaceValue (envelope,action);
- if (rmNamespaceValue==null) {
- return;
+ // Check for RM defined elements, using either spec version
+ OMElement header = envelope.getHeader();
+ OMElement body = envelope.getBody();
+
+ // The sequence header
+ OMElement element = header.getFirstChildWithName(Sandesha2Constants.SPEC_2007_02.QNames.Sequence);
+ if(element == null) {
+ element = envelope.getHeader().getFirstChildWithName(Sandesha2Constants.SPEC_2005_02.QNames.Sequence);
}
-
- OMElement sequenceElement = envelope.getHeader().getFirstChildWithName(
- new QName(rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE));
- if (sequenceElement != null) {
- sequence = new Sequence(rmNamespaceValue);
+ if (element != null) {
+ sequence = new Sequence(element.getNamespace().getNamespaceURI());
sequence.fromOMElement(envelope.getHeader());
}
- OMElement createSeqElement = envelope.getBody().getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE));
-
- if (createSeqElement != null) {
- createSequence = new CreateSequence(rmNamespaceValue);
- createSequence.fromOMElement(envelope.getBody());
- }
-
- OMElement createSeqResElement = envelope.getBody()
- .getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE_RESPONSE));
- if (createSeqResElement != null) {
- createSequenceResponse = new CreateSequenceResponse(rmNamespaceValue);
- createSequenceResponse.fromOMElement(envelope.getBody());
- }
-
- OMElement terminateSeqElement = envelope.getBody()
- .getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
- if (terminateSeqElement != null) {
- terminateSequence = new TerminateSequence(rmNamespaceValue);
- terminateSequence.fromOMElement(envelope.getBody());
+ // The body messages
+ OMElement firstBodyElement = body.getFirstElement();
+ if(firstBodyElement != null) {
+ QName firstBodyQName = firstBodyElement.getQName();
+
+ if(Sandesha2Constants.SPEC_2007_02.QNames.CreateSequence.equals(firstBodyQName)) {
+ createSequence = new CreateSequence(firstBodyQName.getNamespaceURI());
+ createSequence.fromOMElement(body);
+ } else if(Sandesha2Constants.SPEC_2005_02.QNames.CreateSequence.equals(firstBodyQName)) {
+ createSequence = new CreateSequence(firstBodyQName.getNamespaceURI());
+ createSequence.fromOMElement(body);
+
+ } else if(Sandesha2Constants.SPEC_2007_02.QNames.CreateSequenceResponse.equals(firstBodyQName)) {
+ createSequenceResponse = new CreateSequenceResponse(firstBodyQName.getNamespaceURI());
+ createSequenceResponse.fromOMElement(body);
+ } else if(Sandesha2Constants.SPEC_2005_02.QNames.CreateSequenceResponse.equals(firstBodyQName)) {
+ createSequenceResponse = new CreateSequenceResponse(firstBodyQName.getNamespaceURI());
+ createSequenceResponse.fromOMElement(body);
+
+ } else if(Sandesha2Constants.SPEC_2007_02.QNames.CloseSequence.equals(firstBodyQName)) {
+ closeSequence = new CloseSequence(firstBodyQName.getNamespaceURI());
+ closeSequence.fromOMElement(body);
+ } else if(Sandesha2Constants.SPEC_2005_02.QNames.CloseSequence.equals(firstBodyQName)) {
+ closeSequence = new CloseSequence(firstBodyQName.getNamespaceURI());
+ closeSequence.fromOMElement(body);
+
+ } else if(Sandesha2Constants.SPEC_2007_02.QNames.CloseSequenceResponse.equals(firstBodyQName)) {
+ closeSequenceResponse = new CloseSequenceResponse(firstBodyQName.getNamespaceURI());
+ closeSequenceResponse.fromOMElement(body);
+ } else if(Sandesha2Constants.SPEC_2005_02.QNames.CloseSequenceResponse.equals(firstBodyQName)) {
+ closeSequenceResponse = new CloseSequenceResponse(firstBodyQName.getNamespaceURI());
+ closeSequenceResponse.fromOMElement(body);
+
+ } else if(Sandesha2Constants.SPEC_2007_02.QNames.TerminateSequence.equals(firstBodyQName)) {
+ terminateSequence = new TerminateSequence(firstBodyQName.getNamespaceURI());
+ terminateSequence.fromOMElement(body);
+ } else if(Sandesha2Constants.SPEC_2005_02.QNames.TerminateSequence.equals(firstBodyQName)) {
+ terminateSequence = new TerminateSequence(firstBodyQName.getNamespaceURI());
+ terminateSequence.fromOMElement(body);
+
+ } else if(Sandesha2Constants.SPEC_2007_02.QNames.TerminateSequenceResponse.equals(firstBodyQName)) {
+ terminateSequenceResponse = new TerminateSequenceResponse(firstBodyQName.getNamespaceURI());
+ terminateSequenceResponse.fromOMElement(body);
+ } else if(Sandesha2Constants.SPEC_2005_02.QNames.TerminateSequenceResponse.equals(firstBodyQName)) {
+ terminateSequenceResponse = new TerminateSequenceResponse(firstBodyQName.getNamespaceURI());
+ terminateSequenceResponse.fromOMElement(body);
+
+ } else if(Sandesha2Constants.SPEC_2007_02.QNames.MakeConnection.equals(firstBodyQName)) {
+ makeConnection = new MakeConnection(firstBodyQName.getNamespaceURI());
+ makeConnection.fromOMElement(firstBodyElement);
+ }
}
- OMElement terminateSeqResponseElement = envelope.getBody()
- .getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
- if (terminateSeqResponseElement != null) {
- terminateSequenceResponse = new TerminateSequenceResponse (rmNamespaceValue);
- terminateSequenceResponse.fromOMElement(envelope.getBody());
- }
-
- OMElement closeSequenceElement = envelope.getBody()
- .getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE));
- if (closeSequenceElement != null) {
- closeSequence = new CloseSequence (rmNamespaceValue);
- closeSequence.fromOMElement(envelope.getBody());
- }
-
- OMElement closeSequenceResponseElement = envelope.getBody()
- .getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE_RESPONSE));
- if (closeSequenceResponseElement != null) {
- closeSequenceResponse = new CloseSequenceResponse (rmNamespaceValue);
- closeSequenceResponse.fromOMElement(envelope.getBody());
+ // The other headers
+ Iterator headers = header.getChildrenWithName(Sandesha2Constants.SPEC_2007_02.QNames.SequenceAck);
+ while (headers.hasNext()) {
+ OMElement sequenceAckElement = (OMElement) headers.next();
+ SequenceAcknowledgement sequenceAcknowledgement = new SequenceAcknowledgement(Sandesha2Constants.SPEC_2007_02.NS_URI);
+ sequenceAcknowledgement.fromOMElement(sequenceAckElement);
+ sequenceAcknowledgements.add(sequenceAcknowledgement);
}
-
- Iterator sequenceAcknowledgementIter = envelope.getHeader()
- .getChildrenWithName (new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
- while (sequenceAcknowledgementIter.hasNext()) {
- OMElement sequenceAckElement = (OMElement) sequenceAcknowledgementIter.next();
- SequenceAcknowledgement sequenceAcknowledgement = new SequenceAcknowledgement (rmNamespaceValue);
+ headers = header.getChildrenWithName(Sandesha2Constants.SPEC_2005_02.QNames.SequenceAck);
+ while (headers.hasNext()) {
+ OMElement sequenceAckElement = (OMElement) headers.next();
+ SequenceAcknowledgement sequenceAcknowledgement = new SequenceAcknowledgement(Sandesha2Constants.SPEC_2005_02.NS_URI);
sequenceAcknowledgement.fromOMElement(sequenceAckElement);
-
sequenceAcknowledgements.add(sequenceAcknowledgement);
}
- Iterator ackRequestIter = envelope.getHeader()
- .getChildrenWithName (new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.ACK_REQUESTED));
- while (ackRequestIter.hasNext()) {
- OMElement ackRequestElement = (OMElement) ackRequestIter.next();
- AckRequested ackRequest = new AckRequested(rmNamespaceValue);
+ headers = header.getChildrenWithName(Sandesha2Constants.SPEC_2007_02.QNames.AckRequest);
+ while (headers.hasNext()) {
+ OMElement ackRequestElement = (OMElement) headers.next();
+ AckRequested ackRequest = new AckRequested(Sandesha2Constants.SPEC_2007_02.NS_URI);
+ ackRequest.fromOMElement(ackRequestElement);
+ ackRequests.add(ackRequest);
+ }
+ headers = header.getChildrenWithName(Sandesha2Constants.SPEC_2005_02.QNames.AckRequest);
+ while (headers.hasNext()) {
+ OMElement ackRequestElement = (OMElement) headers.next();
+ AckRequested ackRequest = new AckRequested(Sandesha2Constants.SPEC_2005_02.NS_URI);
ackRequest.fromOMElement(ackRequestElement);
-
ackRequests.add(ackRequest);
}
- OMElement usesSequenceSTRElement = envelope.getHeader()
- .getFirstChildWithName(
- new QName(rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.USES_SEQUENCE_STR));
- if (usesSequenceSTRElement != null) {
- usesSequenceSTR = new UsesSequenceSTR(factory, rmNamespaceValue);
+ element = header.getFirstChildWithName(Sandesha2Constants.SPEC_2007_02.QNames.UsesSequenceSTR);
+ if (element != null) {
+ usesSequenceSTR = new UsesSequenceSTR(factory, Sandesha2Constants.SPEC_2007_02.NS_URI);
usesSequenceSTR.fromOMElement(envelope.getHeader());
}
- OMElement makeConnectionElement = envelope.getBody().getFirstChildWithName(
- new QName (rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.MAKE_CONNECTION));
- if (makeConnectionElement!=null) {
- makeConnection = new MakeConnection (rmNamespaceValue);
- makeConnection.fromOMElement(makeConnectionElement);
- }
-
- OMElement messagePendingElement = envelope.getHeader().getFirstChildWithName(
- new QName (rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.MESSAGE_PENDING));
- if (messagePendingElement!=null) {
- messagePending = new MessagePending (rmNamespaceValue);
- messagePending.fromOMElement(messagePendingElement);
+ element = header.getFirstChildWithName(Sandesha2Constants.SPEC_2007_02.QNames.MessagePending);
+ if (element != null) {
+ messagePending = new MessagePending(Sandesha2Constants.SPEC_2007_02.MC_NS_URI);
+ messagePending.fromOMElement(element);
}
- OMElement sequenceFaultElement = envelope.getHeader().getFirstChildWithName(
- new QName (rmNamespaceValue,
- Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT));
- if (sequenceFaultElement!=null) {
- sequenceFault = new SequenceFault (rmNamespaceValue);
- sequenceFault.fromOMElement(sequenceFaultElement);
+ element = header.getFirstChildWithName(Sandesha2Constants.SPEC_2007_02.QNames.SequenceFault);
+ if(element == null) {
+ element = header.getFirstChildWithName(Sandesha2Constants.SPEC_2005_02.QNames.SequenceFault);
+ }
+ if (element !=null) {
+ sequenceFault = new SequenceFault(element.getNamespace().getNamespaceURI());
+ sequenceFault.fromOMElement(element);
}
}
@@ -326,49 +318,6 @@
public void setMessagePending(MessagePending messagePending) {
this.messagePending = messagePending;
- }
-
- private String getRMNamespaceValue (SOAPEnvelope envelope, String action) {
-
- SOAPHeader header = envelope.getHeader();
- if (header!=null) {
- ArrayList headers = header.getHeaderBlocksWithNSURI(Sandesha2Constants.SPEC_2005_02.NS_URI);
- if (headers!=null && headers.size()>0)
- return Sandesha2Constants.SPEC_2005_02.NS_URI;
-
- headers = header.getHeaderBlocksWithNSURI(Sandesha2Constants.SPEC_2006_08.NS_URI);
- if (headers!=null && headers.size()>0)
- return Sandesha2Constants.SPEC_2006_08.NS_URI;
- }
-
- //rm control messages with parts in the body will be identified by the wsa:action,
- //except when ws-addressing headers are turned off
- if (action!=null) {
- if(action.startsWith(Sandesha2Constants.SPEC_2005_02.NS_URI)) {
- return Sandesha2Constants.SPEC_2005_02.NS_URI;
- }
-
- if (action.startsWith(Sandesha2Constants.SPEC_2006_08.NS_URI))
- return Sandesha2Constants.SPEC_2006_08.NS_URI;
- }
-
- // As a final resort check the body namespace
- SOAPBody body = envelope.getBody();
- if(body != null) {
- OMElement element = body.getFirstElement();
- if(element != null) {
- OMNamespace namespace = element.getNamespace();
- if(namespace != null) {
- String uri = namespace.getNamespaceURI();
- if(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(uri) ||
- Sandesha2Constants.SPEC_2006_08.NS_URI.equals(uri) ) {
- return uri;
- }
- }
- }
- }
-
- return null; //a version could not be found
}
public CloseSequence getCloseSequence() {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java Fri Feb 16 06:23:46 2007
@@ -173,7 +173,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Fri Feb 16 06:23:46 2007
@@ -265,7 +265,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java Fri Feb 16 06:23:46 2007
@@ -103,7 +103,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java Fri Feb 16 06:23:46 2007
@@ -104,10 +104,10 @@
if (endpoint!=null) {
endpoint.toOMElement(sequenceOfferElement);
} else {
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceValue)) {
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceValue)) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.elementMustForSpec,
Sandesha2Constants.WSRM_COMMON.ENDPOINT,
- Sandesha2Constants.SPEC_2006_08.NS_URI);
+ Sandesha2Constants.SPEC_2007_02.NS_URI);
throw new SandeshaException (message);
}
}
@@ -141,7 +141,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java Fri Feb 16 06:23:46 2007
@@ -119,7 +119,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java Fri Feb 16 06:23:46 2007
@@ -118,7 +118,7 @@
}
public boolean isNamespaceSupported (String namespaceName) {
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java Fri Feb 16 06:23:46 2007
@@ -109,7 +109,7 @@
public boolean isNamespaceSupported (String namespaceName) {
// This is only supported using the new namespace
- if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
return true;
return false;
Modified: webservices/sandesha/trunk/java/test-resources/MakeConnection.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test-resources/MakeConnection.xml?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test-resources/MakeConnection.xml (original)
+++ webservices/sandesha/trunk/java/test-resources/MakeConnection.xml Fri Feb 16 06:23:46 2007
@@ -1,5 +1,6 @@
<S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
-xmlns:wsrm="http://docs.oasis-open.org/ws-rx/wsrm/200608"
+xmlns:wsrm="http://docs.oasis-open.org/ws-rx/wsrm/200702"
+xmlns:wsmc="http://docs.oasis-open.org/ws-rx/wsmc/200702"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<S:Header>
<wsa:Action>http://docs.oasis-open.org/wsrx/
@@ -7,9 +8,9 @@
<wsa:To> http://example.org/subscriptionService </wsa:To>
</S:Header>
<S:Body>
-<wsrm:MakeConnection>
+<wsmc:MakeConnection>
<wsrm:Identifier>urn:uuid:6367739C8350488CD411576188379313</wsrm:Identifier>
-<wsrm:Address>http://docs.oasis-open.org/wsrx/wsrm/200608/anonymous?id=550e8400-e29b-11d4-a716-446655440000</wsrm:Address>
-</wsrm:MakeConnection>
+<wsmc:Address>http://docs.oasis-open.org/wsrx/wsrm/200702/anonymous?id=550e8400-e29b-11d4-a716-446655440000</wsmc:Address>
+</wsmc:MakeConnection>
</S:Body>
</S:Envelope>s
Modified: webservices/sandesha/trunk/java/test-resources/MessagePending.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test-resources/MessagePending.xml?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test-resources/MessagePending.xml (original)
+++ webservices/sandesha/trunk/java/test-resources/MessagePending.xml Fri Feb 16 06:23:46 2007
@@ -1,5 +1,6 @@
<S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope"
-xmlns:wsrm="http://docs.oasis-open.org/ws-rx/wsrm/200608"
+xmlns:wsrm="http://docs.oasis-open.org/ws-rx/wsrm/200702"
+xmlns:wsmc="http://docs.oasis-open.org/ws-rx/wsmc/200702"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<S:Header>
<wsa:Action> http://example.org/eventType1 </wsa:Action>
@@ -8,7 +9,7 @@
<wsrm:Sequence>
<wsrm:Identifier> http://example.org/rmid-456 </wsrm:Identifier>
</wsrm:Sequence>
-<wsrm:MessagePending pending="true"/>
+<wsmc:MessagePending pending="true"/>
</S:Header>
<S:Body>
</S:Body>
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedFaultTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedFaultTest.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedFaultTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/CreateSequenceRefusedFaultTest.java Fri Feb 16 06:23:46 2007
@@ -68,7 +68,7 @@
// Open a connection to the endpoint
HttpURLConnection connection =
FaultTestUtils.getHttpURLConnection("http://127.0.0.1:" + serverPort + "/axis2/services/RMSampleService",
- "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequence");
+ "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence");
OutputStream tmpOut2 = connection.getOutputStream();
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/InvalidAcknowledgementTest.java Fri Feb 16 06:23:46 2007
@@ -103,7 +103,7 @@
// Open a connection to the endpoint, using the sequence ack as the action
HttpURLConnection connection =
FaultTestUtils.getHttpURLConnection("http://127.0.0.1:" + serverPort + "/axis2/services/RMSampleService",
- "http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement");
+ "http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement");
OutputStream tmpOut2 = connection.getOutputStream();
byte ar[] = getAppMessageAsBytes(seqID);
@@ -182,7 +182,7 @@
// Open a connection to the endpoint, using the sequence ack as the action
HttpURLConnection connection =
FaultTestUtils.getHttpURLConnection("http://127.0.0.1:" + serverPort + "/axis2/services/RMSampleService",
- "http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement");
+ "http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement");
OutputStream tmpOut2 = connection.getOutputStream();
byte ar[] = getAppMessageAsBytes(seqID);
@@ -250,7 +250,7 @@
// Finished generating SequenceAck part
// Create an RMSBean so the create sequence message can be created
- messageContext.setWSAAction("http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement");
+ messageContext.setWSAAction("http://docs.oasis-open.org/ws-rx/wsrm/200702/SequenceAcknowledgement");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java Fri Feb 16 06:23:46 2007
@@ -148,7 +148,7 @@
// Open a connection to the endpoint
HttpURLConnection connection =
FaultTestUtils.getHttpURLConnection("http://127.0.0.1:" + serverPort + "/axis2/services/RMSampleService",
- Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE);
+ Sandesha2Constants.SPEC_2007_02.Actions.ACTION_CLOSE_SEQUENCE);
StorageManager storageManager =
SandeshaUtil.getSandeshaStorageManager(serverConfigContext, serverConfigContext.getAxisConfiguration());
@@ -210,7 +210,7 @@
// Open a connection to the endpoint
HttpURLConnection connection =
FaultTestUtils.getHttpURLConnection("http://127.0.0.1:" + serverPort + "/axis2/services/RMSampleService",
- Sandesha2Constants.SPEC_2006_08.Actions.ACTION_ACK_REQUEST);
+ Sandesha2Constants.SPEC_2007_02.Actions.ACTION_ACK_REQUEST);
StorageManager storageManager =
SandeshaUtil.getSandeshaStorageManager(serverConfigContext, serverConfigContext.getAxisConfiguration());
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java Fri Feb 16 06:23:46 2007
@@ -31,7 +31,8 @@
public class MakeConnectionTest extends SandeshaTestCase {
SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
- String rmNamespaceValue = Sandesha2Constants.SPEC_2006_08.NS_URI;
+ String rmNamespaceValue = Sandesha2Constants.SPEC_2007_02.NS_URI;
+ String mcNamespaceValue = Sandesha2Constants.SPEC_2007_02.MC_NS_URI;
String addressingNamespaceValue = AddressingConstants.Final.WSA_NAMESPACE;
public MakeConnectionTest() {
@@ -39,9 +40,9 @@
}
public void testfromOMElement() throws AxisFault {
- MakeConnection makeConnection = new MakeConnection(rmNamespaceValue);
+ MakeConnection makeConnection = new MakeConnection(mcNamespaceValue);
SOAPEnvelope envelope = getSOAPEnvelope("", "MakeConnection.xml");
- OMElement makeConnectionElement = envelope.getBody().getFirstChildWithName(new QName (rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.MAKE_CONNECTION));
+ OMElement makeConnectionElement = envelope.getBody().getFirstChildWithName(new QName (mcNamespaceValue,Sandesha2Constants.WSRM_COMMON.MAKE_CONNECTION));
makeConnection.fromOMElement(makeConnectionElement);
Identifier identifier = makeConnection.getIdentifier();
@@ -50,15 +51,15 @@
Address address = makeConnection.getAddress();
assertNotNull(address);
- assertEquals(address.getAddress(),"http://docs.oasis-open.org/wsrx/wsrm/200608/anonymous?id=550e8400-e29b-11d4-a716-446655440000");
+ assertEquals(address.getAddress(),"http://docs.oasis-open.org/wsrx/wsrm/200702/anonymous?id=550e8400-e29b-11d4-a716-446655440000");
}
public void testToSOAPEnvelope() throws SandeshaException {
- MakeConnection makeConnection = new MakeConnection (rmNamespaceValue);
+ MakeConnection makeConnection = new MakeConnection (mcNamespaceValue);
- Address address = new Address (rmNamespaceValue);
- address.setAddress("http://docs.oasis-open.org/wsrx/wsrm/200608/anonymous?id=550e8400-e29b-11d4-a716-446655440000");
+ Address address = new Address (mcNamespaceValue);
+ address.setAddress("http://docs.oasis-open.org/wsrx/wsrm/200702/anonymous?id=550e8400-e29b-11d4-a716-446655440000");
Identifier identifier = new Identifier (rmNamespaceValue);
identifier.setIndentifer("uuid:c3671020-15e0-11da-9b3b-f0439d4867bd");
@@ -69,15 +70,14 @@
makeConnection.toSOAPEnvelope(envelope);
OMElement makeConnectionElement = envelope.getBody().getFirstChildWithName(
- new QName (rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.MAKE_CONNECTION));
+ new QName (mcNamespaceValue,Sandesha2Constants.WSRM_COMMON.MAKE_CONNECTION));
assertNotNull(makeConnectionElement);
OMElement addressElement = makeConnectionElement.getFirstChildWithName(
- new QName (rmNamespaceValue,Sandesha2Constants.WSA.ADDRESS));
+ new QName (mcNamespaceValue,Sandesha2Constants.WSA.ADDRESS));
assertNotNull(addressElement);
String addressValue = addressElement.getText();
- assertEquals(addressValue,"http://docs.oasis-open.org/wsrx/wsrm/200608/anonymous?id=550e8400-e29b-11d4-a716-446655440000");
-
+ assertEquals(addressValue,"http://docs.oasis-open.org/wsrx/wsrm/200702/anonymous?id=550e8400-e29b-11d4-a716-446655440000");
OMElement identifierElement = makeConnectionElement.getFirstChildWithName(
new QName (rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.IDENTIFIER));
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MessagePendingTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MessagePendingTest.java?view=diff&rev=508417&r1=508416&r2=508417
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MessagePendingTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MessagePendingTest.java Fri Feb 16 06:23:46 2007
@@ -30,7 +30,7 @@
public class MessagePendingTest extends SandeshaTestCase {
SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
- String rmNamespace = Sandesha2Constants.SPEC_2006_08.NS_URI;
+ String mcNamespace = Sandesha2Constants.SPEC_2007_02.MC_NS_URI;
public MessagePendingTest() {
super("MessagePendingTest");
@@ -38,11 +38,11 @@
public void testFromOMElement() throws SandeshaException {
- MessagePending messagePending = new MessagePending (rmNamespace);
+ MessagePending messagePending = new MessagePending (mcNamespace);
SOAPEnvelope env = getSOAPEnvelope("", "MessagePending.xml");
OMElement messagePendingElement = env.getHeader().getFirstChildWithName(
- new QName (rmNamespace,Sandesha2Constants.WSRM_COMMON.MESSAGE_PENDING));
+ new QName (mcNamespace,Sandesha2Constants.WSRM_COMMON.MESSAGE_PENDING));
messagePending.fromOMElement(messagePendingElement);
assertTrue(messagePending.isPending());
@@ -50,7 +50,7 @@
public void testToOMElement() throws SandeshaException {
- MessagePending messagePending = new MessagePending (rmNamespace);
+ MessagePending messagePending = new MessagePending (mcNamespace);
messagePending.setPending(true);
@@ -58,7 +58,7 @@
messagePending.toSOAPEnvelope(env);
OMElement messagePendingElement = env.getHeader().getFirstChildWithName(
- new QName (rmNamespace,Sandesha2Constants.WSRM_COMMON.MESSAGE_PENDING));
+ new QName (mcNamespace,Sandesha2Constants.WSRM_COMMON.MESSAGE_PENDING));
assertNotNull(messagePendingElement);
OMAttribute attribute = messagePendingElement.getAttribute(
new QName (Sandesha2Constants.WSRM_COMMON.PENDING));
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org