You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/02/26 08:22:29 UTC
svn commit: r381068 [2/2] - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/
msgprocessors/ msgreceivers/ util/ wsrm/
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java Sat Feb 25 23:22:25 2006
@@ -33,19 +33,18 @@
public class FaultCode implements IOMRMElement {
private OMElement faultCodeElement;
-
String faultCode = null;
-
SOAPFactory factory;
-
OMNamespace rmNameSpace = null;
-
- public FaultCode(SOAPFactory factory) {
+ String namespaceValue = null;
+
+ public FaultCode(SOAPFactory factory, String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
rmNameSpace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
faultCodeElement = factory.createOMElement(
- Sandesha2Constants.WSRM.FAULT_CODE, rmNameSpace);
+ Sandesha2Constants.WSRM_COMMON.FAULT_CODE, rmNameSpace);
}
public OMElement getOMElement() throws OMException {
@@ -59,8 +58,8 @@
"Can't add Fault Code part since the passed element is null");
OMElement faultCodePart = sequenceFault
- .getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_PREFIX_RM,
- Sandesha2Constants.WSRM.FAULT_CODE));
+ .getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
if (faultCodePart == null)
throw new OMException(
@@ -69,7 +68,7 @@
this.faultCode = faultCodePart.getText();
faultCodeElement = factory.createOMElement(
- Sandesha2Constants.WSRM.FAULT_CODE, rmNameSpace);
+ Sandesha2Constants.WSRM_COMMON.FAULT_CODE, rmNameSpace);
return sequenceFault;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java Sat Feb 25 23:22:25 2006
@@ -33,19 +33,18 @@
public class Identifier implements Sandesha2Constants, IOMRMElement {
private OMElement identifierElement;
-
private String identifier = null;
-
OMNamespace wsrmNamespace = null;
-
private SOAPFactory factory;
+ String namespaceValue = null;
- public Identifier(SOAPFactory factory) {
+ public Identifier(SOAPFactory factory, String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
wsrmNamespace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
identifierElement = factory.createOMElement(
- Sandesha2Constants.WSRM.IDENTIFIER, wsrmNamespace);
+ Sandesha2Constants.WSRM_COMMON.IDENTIFIER, wsrmNamespace);
}
public void setIndentifer(String identifier) {
@@ -64,12 +63,12 @@
public Object fromOMElement(OMElement element) throws OMException {
OMElement identifierPart = element.getFirstChildWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.IDENTIFIER));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.IDENTIFIER));
if (identifierPart == null)
throw new OMException(
"The parsed element does not contain an identifier part");
identifierElement = factory.createOMElement(
- Sandesha2Constants.WSRM.IDENTIFIER, wsrmNamespace);
+ Sandesha2Constants.WSRM_COMMON.IDENTIFIER, wsrmNamespace);
String identifierText = identifierPart.getText();
if (identifierText == null || identifierText == "")
@@ -89,7 +88,7 @@
element.addChild(identifierElement);
identifierElement = factory.createOMElement(
- Sandesha2Constants.WSRM.IDENTIFIER, wsrmNamespace);
+ Sandesha2Constants.WSRM_COMMON.IDENTIFIER, wsrmNamespace);
return element;
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java Sat Feb 25 23:22:25 2006
@@ -33,17 +33,17 @@
public class LastMessage implements IOMRMElement {
private OMElement lastMessageElement;
-
OMNamespace rmNamespace = null;
-
SOAPFactory factory;
-
- public LastMessage(SOAPFactory factory) {
+ String namespaceValue = null;
+
+ public LastMessage(SOAPFactory factory,String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
rmNamespace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
lastMessageElement = factory.createOMElement(
- Sandesha2Constants.WSRM.LAST_MSG, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.LAST_MSG, rmNamespace);
}
public OMElement getOMElement() throws OMException {
@@ -52,13 +52,13 @@
public Object fromOMElement(OMElement element) throws OMException {
OMElement lastMessagePart = element.getFirstChildWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.LAST_MSG));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.LAST_MSG));
if (lastMessagePart == null)
throw new OMException(
"The passed element does not contain a Last Message part");
lastMessageElement = factory.createOMElement(
- Sandesha2Constants.WSRM.LAST_MSG, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.LAST_MSG, rmNamespace);
return this;
}
@@ -71,7 +71,7 @@
sequenceElement.addChild(lastMessageElement);
lastMessageElement = factory.createOMElement(
- Sandesha2Constants.WSRM.LAST_MSG, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.LAST_MSG, rmNamespace);
return sequenceElement;
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java Sat Feb 25 23:22:25 2006
@@ -34,15 +34,15 @@
private long messageNumber;
private OMElement messageNoElement;
-
OMNamespace rmNamespace = null;
-
SOAPFactory factory;
+ String namespaceValue = null;
- public MessageNumber(SOAPFactory factory){
+ public MessageNumber(SOAPFactory factory,String namespaceValue){
this.factory = factory;
- rmNamespace = factory.createOMNamespace(Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
- messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM.MSG_NUMBER,rmNamespace);
+ this.namespaceValue = namespaceValue;
+ rmNamespace = factory.createOMNamespace(namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+ messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.MSG_NUMBER,rmNamespace);
}
public long getMessageNumber(){
@@ -54,11 +54,11 @@
public Object fromOMElement(OMElement seqenceElement) throws OMException {
OMElement msgNumberPart = seqenceElement.getFirstChildWithName(
- new QName (Sandesha2Constants.WSRM.NS_URI_RM,Sandesha2Constants.WSRM.MSG_NUMBER));
+ new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.MSG_NUMBER));
if (msgNumberPart==null)
throw new OMException ("The passed sequnce element does not contain a message number part");
- messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM.MSG_NUMBER,rmNamespace);
+ messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.MSG_NUMBER,rmNamespace);
String msgNoStr = msgNumberPart.getText();
messageNumber = Long.parseLong(msgNoStr);
@@ -73,7 +73,7 @@
messageNoElement.setText(Long.toString(messageNumber));
element.addChild(messageNoElement);
- messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM.MSG_NUMBER,rmNamespace);
+ messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.MSG_NUMBER,rmNamespace);
return element;
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java Sat Feb 25 23:22:25 2006
@@ -29,19 +29,19 @@
*/
public class Nack implements IOMRMElement {
+
private OMElement nackElement;
private long nackNumber;
-
SOAPFactory factory;
-
OMNamespace rmNamespace = null;
-
+ String namespaceValue = null;
- public Nack(SOAPFactory factory){
+ public Nack(SOAPFactory factory,String namespaceValue){
this.factory = factory;
- rmNamespace = factory.createOMNamespace(Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ this.namespaceValue = namespaceValue;
+ rmNamespace = factory.createOMNamespace(namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
nackElement = factory.createOMElement(
- Sandesha2Constants.WSRM.NACK,rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.NACK,rmNamespace);
}
public OMElement getOMElement() throws OMException {
@@ -63,7 +63,7 @@
}
nackElement = factory.createOMElement(
- Sandesha2Constants.WSRM.NACK,rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.NACK,rmNamespace);
return this;
}
@@ -82,7 +82,7 @@
sequenceAckElement.addChild(nackElement);
nackElement = factory.createOMElement(
- Sandesha2Constants.WSRM.NACK,rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.NACK,rmNamespace);
return sequenceAckElement;
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java Sat Feb 25 23:22:25 2006
@@ -16,15 +16,18 @@
*/
package org.apache.sandesha2.wsrm;
+import java.util.ArrayList;
+
import javax.xml.namespace.QName;
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.util.SOAPAbstractFactory;
import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.om.OMException;
import org.apache.ws.commons.soap.SOAP11Constants;
import org.apache.ws.commons.soap.SOAPEnvelope;
import org.apache.ws.commons.soap.SOAPFactory;
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
+import org.apache.ws.commons.soap.SOAPHeader;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -35,81 +38,82 @@
public class RMElements {
private Sequence sequence = null;
-
private SequenceAcknowledgement sequenceAcknowledgement = null;
-
private CreateSequence createSequence = null;
-
private CreateSequenceResponse createSequenceResponse = null;
-
private TerminateSequence terminateSequence = null;
-
private AckRequested ackRequested = null;
+ private SOAPFactory factory = null;
+ String rmNamespaceValue = null;
- private SOAPFactory factory;
-
- public void fromSOAPEnvelope(SOAPEnvelope envelope) {
+ public void fromSOAPEnvelope(SOAPEnvelope envelope, String action) {
if (envelope == null)
throw new OMException("The passed envelope is null");
SOAPFactory factory;
-
+
//Ya I know. Could hv done it directly :D (just to make it consistent)
if (envelope.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI))
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;
+
OMElement sequenceElement = envelope.getHeader().getFirstChildWithName(
- new QName(Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE));
+ new QName(rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE));
if (sequenceElement != null) {
- sequence = new Sequence(factory);
+ sequence = new Sequence(factory,rmNamespaceValue);
sequence.fromOMElement(envelope.getHeader());
}
OMElement sequenceAckElement = envelope.getHeader()
.getFirstChildWithName(
- new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.SEQUENCE_ACK));
+ new QName(rmNamespaceValue,
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
if (sequenceAckElement != null) {
- sequenceAcknowledgement = new SequenceAcknowledgement(factory);
+ sequenceAcknowledgement = new SequenceAcknowledgement(factory,rmNamespaceValue);
sequenceAcknowledgement.fromOMElement(envelope.getHeader());
}
OMElement createSeqElement = envelope.getBody().getFirstChildWithName(
- new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.CREATE_SEQUENCE));
+ new QName(rmNamespaceValue,
+ Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE));
if (createSeqElement != null) {
- createSequence = new CreateSequence(factory);
+ createSequence = new CreateSequence(factory,rmNamespaceValue);
createSequence.fromOMElement(envelope.getBody());
}
OMElement createSeqResElement = envelope.getBody()
.getFirstChildWithName(
- new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
+ new QName(rmNamespaceValue,
+ Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE_RESPONSE));
if (createSeqResElement != null) {
- createSequenceResponse = new CreateSequenceResponse(factory);
+ createSequenceResponse = new CreateSequenceResponse(factory,rmNamespaceValue);
createSequenceResponse.fromOMElement(envelope.getBody());
}
OMElement terminateSeqElement = envelope.getBody()
.getFirstChildWithName(
- new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.TERMINATE_SEQUENCE));
+ new QName(rmNamespaceValue,
+ Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
if (terminateSeqElement != null) {
- terminateSequence = new TerminateSequence(factory);
+ terminateSequence = new TerminateSequence(factory,rmNamespaceValue);
terminateSequence.fromOMElement(envelope.getBody());
}
OMElement ackRequestedElement = envelope.getHeader()
.getFirstChildWithName(
- new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.ACK_REQUESTED));
+ new QName(rmNamespaceValue,
+ Sandesha2Constants.WSRM_COMMON.ACK_REQUESTED));
if (ackRequestedElement != null) {
- ackRequested = new AckRequested(factory);
+ ackRequested = new AckRequested(factory,rmNamespaceValue);
ackRequested.fromOMElement(envelope.getHeader());
}
}
@@ -184,5 +188,42 @@
public void setAckRequested(AckRequested ackRequested) {
this.ackRequested = ackRequested;
+ }
+
+ 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_2005_10.NS_URI);
+ if (headers!=null && headers.size()>0)
+ return Sandesha2Constants.SPEC_2005_10.NS_URI;
+ }
+
+ //rm control messages with parts in the body will be identified by the wsa:action.
+ if (action==null)
+ return null;
+
+ if (action.equals(Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE))
+ return Sandesha2Constants.SPEC_2005_02.NS_URI;
+ if (action.equals(Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE_RESPONSE))
+ return Sandesha2Constants.SPEC_2005_02.NS_URI;
+ if (action.equals(Sandesha2Constants.SPEC_2005_02.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT))
+ return Sandesha2Constants.SPEC_2005_02.NS_URI;
+ if (action.equals(Sandesha2Constants.SPEC_2005_02.Actions.ACTION_TERMINATE_SEQUENCE))
+ return Sandesha2Constants.SPEC_2005_02.NS_URI;
+
+ if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE))
+ return Sandesha2Constants.SPEC_2005_10.NS_URI;
+ if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE_RESPONSE))
+ return Sandesha2Constants.SPEC_2005_10.NS_URI;
+ if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT))
+ return Sandesha2Constants.SPEC_2005_10.NS_URI;
+ if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE))
+ return Sandesha2Constants.SPEC_2005_10.NS_URI;
+
+ return null; //a version could not be found
}
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java Sat Feb 25 23:22:25 2006
@@ -36,25 +36,21 @@
public class Sequence implements IOMRMPart {
private OMElement sequenceElement;
-
private Identifier identifier;
-
private MessageNumber messageNumber;
-
private LastMessage lastMessage = null;
-
private SOAPFactory factory;
-
OMNamespace seqNoNamespace = null;
-
private boolean mustUnderstand = true;
-
- public Sequence(SOAPFactory factory) {
+ String namespaceValue = null;
+
+ public Sequence(SOAPFactory factory,String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
seqNoNamespace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
sequenceElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE, seqNoNamespace);
}
public OMElement getOMElement() throws OMException {
@@ -69,26 +65,26 @@
"Sequence element cannot be added to non-header element");
OMElement sequencePart = sequenceElement = headerElement
- .getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.SEQUENCE));
+ .getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE));
if (sequencePart == null)
throw new OMException(
"Cannot find Sequence element in the given element");
sequenceElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE, seqNoNamespace);
- identifier = new Identifier(factory);
- messageNumber = new MessageNumber(factory);
+ identifier = new Identifier(factory,namespaceValue);
+ messageNumber = new MessageNumber(factory,namespaceValue);
identifier.fromOMElement(sequencePart);
messageNumber.fromOMElement(sequencePart);
OMElement lastMessageElement = sequencePart
- .getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.LAST_MSG));
+ .getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.LAST_MSG));
if (lastMessageElement != null) {
- lastMessage = new LastMessage(factory);
+ lastMessage = new LastMessage(factory,namespaceValue);
lastMessage.fromOMElement(sequencePart);
}
@@ -117,7 +113,7 @@
SOAPHeaderBlock sequenceHeaderBlock = soapHeader.addHeaderBlock(
- Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE, seqNoNamespace);
//soapHeader.addChild(sequenceHeaderBlock);
//OMElement elem1 = factory.createOMElement("test","http://test1","test2");
//soapHeader.addChild(elem1)
@@ -133,7 +129,7 @@
//resetting the element. So that subsequest toOMElement calls will
// attach a different object.
this.sequenceElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE, seqNoNamespace);
return headerElement;
}
@@ -166,8 +162,8 @@
SOAPHeader header = envelope.getHeader();
//detach if already exist.
- OMElement elem = header.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.SEQUENCE));
+ OMElement elem = header.getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE));
if (elem!=null)
elem.detach();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Sat Feb 25 23:22:25 2006
@@ -42,25 +42,21 @@
public class SequenceAcknowledgement implements IOMRMPart {
private OMElement sequenceAcknowledgementElement;
-
private Identifier identifier;
-
private ArrayList acknowledgementRangeList;
-
private ArrayList nackList;
-
OMNamespace rmNamespace = null;
-
SOAPFactory factory;
-
+ String namespaceValue = null;
private boolean mustUnderstand = true;
- public SequenceAcknowledgement(SOAPFactory factory) {
+ public SequenceAcknowledgement(SOAPFactory factory,String namespaceValue) {
+ this.namespaceValue = namespaceValue;
this.factory = factory;
rmNamespace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
sequenceAcknowledgementElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_ACK, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK, rmNamespace);
acknowledgementRangeList = new ArrayList();
nackList = new ArrayList();
}
@@ -77,38 +73,38 @@
SOAPHeader header = (SOAPHeader) element;
OMElement sequenceAckPart = header.getFirstChildWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE_ACK));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
if (sequenceAckPart == null)
throw new OMException(
"The passed element does not contain a seqence ackknowledgement Part");
- identifier = new Identifier(factory);
+ identifier = new Identifier(factory,namespaceValue);
identifier.fromOMElement(sequenceAckPart);
Iterator ackRangeParts = sequenceAckPart.getChildrenWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.ACK_RANGE));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.ACK_RANGE));
while (ackRangeParts.hasNext()) {
OMElement ackRangePart = (OMElement) ackRangeParts.next();
- AcknowledgementRange ackRange = new AcknowledgementRange(factory);
+ AcknowledgementRange ackRange = new AcknowledgementRange(factory,namespaceValue);
ackRange.fromOMElement(ackRangePart);
acknowledgementRangeList.add(ackRange);
}
Iterator nackParts = sequenceAckPart.getChildrenWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NACK));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NACK));
while (nackParts.hasNext()) {
OMElement nackPart = (OMElement) nackParts.next();
- Nack nack = new Nack(factory);
+ Nack nack = new Nack(factory,namespaceValue);
nack.fromOMElement(nackPart);
nackList.add(nack);
}
sequenceAcknowledgementElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_ACK, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK, rmNamespace);
return this;
}
@@ -121,7 +117,7 @@
SOAPHeader SOAPHeader = (SOAPHeader) header;
SOAPHeaderBlock sequenceAcknowledgementHeaderBlock = SOAPHeader.addHeaderBlock(
- Sandesha2Constants.WSRM.SEQUENCE_ACK,rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK,rmNamespace);
if (sequenceAcknowledgementHeaderBlock == null)
throw new OMException(
@@ -150,7 +146,7 @@
SOAPHeader.addChild(sequenceAcknowledgementHeaderBlock);
sequenceAcknowledgementElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_ACK, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK, rmNamespace);
return header;
}
@@ -195,7 +191,7 @@
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE_ACK));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
if (elem != null)
elem.detach();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java Sat Feb 25 23:22:25 2006
@@ -34,20 +34,20 @@
*/
public class SequenceFault implements IOMRMElement {
+
private OMElement sequenceFaultElement;
-
private FaultCode faultCode;
-
SOAPFactory factory;
-
OMNamespace rmNamespace = null;
+ String namespaceValue = null;
- public SequenceFault(SOAPFactory factory) {
+ public SequenceFault(SOAPFactory factory,String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
rmNamespace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
sequenceFaultElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT, rmNamespace);
}
public OMElement getOMElement() throws OMException {
@@ -61,23 +61,23 @@
"Cant get Sequence Fault part from a non-header element");
OMElement sequenceFaultPart = body.getFirstChildWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE_FAULT));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT));
if (sequenceFaultPart == null)
throw new OMException(
"The passed element does not contain a Sequence Fault element");
OMElement faultCodePart = sequenceFaultPart
- .getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.FAULT_CODE));
+ .getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
if (faultCodePart != null) {
- faultCode = new FaultCode(factory);
+ faultCode = new FaultCode(factory,namespaceValue);
faultCode.fromOMElement(sequenceFaultPart);
}
sequenceFaultElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT, rmNamespace);
return this;
@@ -99,7 +99,7 @@
body.addChild(sequenceFaultElement);
sequenceFaultElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT, rmNamespace);
return body;
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java Sat Feb 25 23:22:25 2006
@@ -31,22 +31,21 @@
*/
public class SequenceOffer implements IOMRMElement {
+
private OMElement sequenceOfferElement;
-
private Identifier identifier = null;
-
private Expires expires = null;
-
SOAPFactory factory;
-
OMNamespace rmNamespace = null;
+ String namespaceValue = null;
- public SequenceOffer(SOAPFactory factory) {
+ public SequenceOffer(SOAPFactory factory,String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
rmNamespace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
sequenceOfferElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER, rmNamespace);
}
public OMElement getOMElement() throws OMException {
@@ -56,23 +55,23 @@
public Object fromOMElement(OMElement createSequenceElement)
throws OMException {
OMElement sequenceOfferPart = createSequenceElement
- .getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.SEQUENCE_OFFER));
+ .getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER));
if (sequenceOfferPart == null)
throw new OMException(
"The passed element does not contain a SequenceOffer part");
sequenceOfferElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER, rmNamespace);
- identifier = new Identifier(factory);
+ identifier = new Identifier(factory,namespaceValue);
identifier.fromOMElement(sequenceOfferPart);
OMElement expiresPart = sequenceOfferPart
- .getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.EXPIRES));
+ .getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.EXPIRES));
if (expiresPart != null) {
- expires = new Expires(factory);
+ expires = new Expires(factory,namespaceValue);
expires.fromOMElement(sequenceOfferElement);
}
@@ -97,7 +96,7 @@
createSequenceElement.addChild(sequenceOfferElement);
sequenceOfferElement = factory.createOMElement(
- Sandesha2Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
+ Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER, rmNamespace);
return createSequenceElement;
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java?rev=381068&r1=381067&r2=381068&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java Sat Feb 25 23:22:25 2006
@@ -37,19 +37,18 @@
public class TerminateSequence implements IOMRMPart {
private OMElement terminateSequenceElement;
-
private Identifier identifier;
-
OMNamespace rmNameSpace = null;
-
SOAPFactory factory;
-
- public TerminateSequence(SOAPFactory factory) {
+ String namespaceValue = null;
+
+ public TerminateSequence(SOAPFactory factory, String namespaceValue) {
this.factory = factory;
+ this.namespaceValue = namespaceValue;
rmNameSpace = factory.createOMNamespace(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
terminateSequenceElement = factory.createOMElement(
- Sandesha2Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
+ Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE, rmNameSpace);
}
public OMElement getOMElement() throws OMException {
@@ -63,17 +62,17 @@
"Cant add terminate sequence to a non body element");
OMElement terminateSeqPart = body.getFirstChildWithName(new QName(
- Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.TERMINATE_SEQUENCE));
+ namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
if (terminateSeqPart == null)
throw new OMException(
"passed element does not contain a terminate sequence part");
- identifier = new Identifier(factory);
+ identifier = new Identifier(factory,namespaceValue);
identifier.fromOMElement(terminateSeqPart);
terminateSequenceElement = factory.createOMElement(
- Sandesha2Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
+ Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE, rmNameSpace);
return this;
}
@@ -96,7 +95,7 @@
body.addChild(terminateSequenceElement);
terminateSequenceElement = factory.createOMElement(
- Sandesha2Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
+ Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE, rmNameSpace);
return body;
}
@@ -113,8 +112,8 @@
SOAPBody body = envelope.getBody();
//detach if already exist.
- OMElement elem = body.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
- Sandesha2Constants.WSRM.TERMINATE_SEQUENCE));
+ OMElement elem = body.getFirstChildWithName(new QName(namespaceValue,
+ Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
if (elem!=null)
elem.detach();
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org