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/09/06 05:31:43 UTC
svn commit: r440594 [2/2] - in
/webservices/sandesha/trunk/java/src/org/apache/sandesha2: ./ client/
handlers/ i18n/ msgprocessors/ util/ workers/ wsrm/
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=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java Tue Sep 5 20:31:41 2006
@@ -42,18 +42,15 @@
private Identifier identifier;
private MessageNumber messageNumber;
private LastMessage lastMessage = null;
- private SOAPFactory defaultFactory;
private boolean mustUnderstand = true;
private String namespaceValue = null;
- private OMElement element;
- public Sequence(SOAPFactory factory,String namespaceValue) throws SandeshaException {
+ public Sequence(String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
namespaceValue));
- this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
}
@@ -76,9 +73,8 @@
SandeshaMessageKeys.noSequencePartInElement,
headerElement.toString()));
- element = sequencePart;
- identifier = new Identifier(defaultFactory,namespaceValue);
- messageNumber = new MessageNumber(defaultFactory,namespaceValue);
+ identifier = new Identifier(namespaceValue);
+ messageNumber = new MessageNumber(namespaceValue);
identifier.fromOMElement(sequencePart);
messageNumber.fromOMElement(sequencePart);
@@ -86,7 +82,7 @@
.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.LAST_MSG));
if (lastMessageElement != null) {
- lastMessage = new LastMessage(defaultFactory,namespaceValue);
+ lastMessage = new LastMessage(namespaceValue);
lastMessage.fromOMElement(sequencePart);
}
@@ -109,8 +105,6 @@
SandeshaMessageKeys.seqPartIsNull));
OMFactory factory = headerElement.getOMFactory();
- if (factory==null)
- factory = defaultFactory;
OMNamespace rmNamespace = factory.createOMNamespace(
namespaceValue, Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
@@ -174,13 +168,10 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
return true;
return false;
}
- public OMElement getOMElement() {
- return element;
- }
}
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=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Tue Sep 5 20:31:41 2006
@@ -51,7 +51,6 @@
private boolean mustUnderstand = false;
private AckNone ackNone = null;
private AckFinal ackFinal = null;
- private OMElement ackElement = null;
public SequenceAcknowledgement(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
@@ -75,7 +74,7 @@
if (factory==null)
factory = defaultFactory;
- identifier = new Identifier(defaultFactory,namespaceValue);
+ identifier = new Identifier(namespaceValue);
identifier.fromOMElement(sequenceAckElement);
Iterator ackRangeParts = sequenceAckElement.getChildrenWithName(new QName(
@@ -104,7 +103,7 @@
if (SpecSpecificConstants.isAckFinalAllowed(rmSpecVersion)) {
OMElement ackFinalPart = sequenceAckElement.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.FINAL));
if (ackFinalPart!=null) {
- ackFinal = new AckFinal (defaultFactory,namespaceValue);
+ ackFinal = new AckFinal (namespaceValue);
ackFinal.fromOMElement(sequenceAckElement);
}
}
@@ -112,7 +111,7 @@
if (SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
OMElement ackNonePart = sequenceAckElement.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.NONE));
if (ackNonePart!=null) {
- ackNone = new AckNone (defaultFactory,namespaceValue);
+ ackNone = new AckNone (namespaceValue);
ackNone.fromOMElement(sequenceAckElement);
}
}
@@ -164,7 +163,7 @@
//setting a 'None' when nothing is there (for the correct RM version)
if (ackNone==null && acknowledgementRangeList.size()==0 && nackList.size()==0 && SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
- ackNone = new AckNone (factory,namespaceValue);
+ ackNone = new AckNone (namespaceValue);
}
if (ackNone!=null) {
@@ -265,7 +264,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
return true;
return false;
@@ -287,7 +286,4 @@
this.ackNone = ackNone;
}
- public OMElement getOMElement() {
- return ackElement;
- }
}
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=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java Tue Sep 5 20:31:41 2006
@@ -24,7 +24,6 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
@@ -38,17 +37,14 @@
private FaultCode faultCode;
- private SOAPFactory defaultFactory;
-
private String namespaceValue = null;
- public SequenceFault(SOAPFactory factory,String namespaceValue) throws SandeshaException {
+ public SequenceFault(String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
namespaceValue));
- this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
}
@@ -75,7 +71,7 @@
.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
if (faultCodePart != null) {
- faultCode = new FaultCode(defaultFactory,namespaceValue);
+ faultCode = new FaultCode(namespaceValue);
faultCode.fromOMElement(sequenceFaultPart);
}
@@ -89,9 +85,7 @@
SandeshaMessageKeys.seqFaultCannotBeExtractedToNonHeader));
OMFactory factory = body.getOMFactory();
- if (factory==null)
- factory = defaultFactory;
-
+
OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement sequenceFaultElement =factory.createOMElement(
Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT, rmNamespace);
@@ -115,7 +109,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2006_08.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=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java Tue Sep 5 20:31:41 2006
@@ -39,17 +39,14 @@
private Expires expires = null;
- private OMFactory defaultFactory;
-
private String namespaceValue = null;
- public SequenceOffer(OMFactory factory,String namespaceValue) throws SandeshaException {
+ public SequenceOffer(String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
namespaceValue));
- this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
}
@@ -67,13 +64,13 @@
SandeshaMessageKeys.noSeqOfferInElement,
createSequenceElement.toString()));
- identifier = new Identifier(defaultFactory,namespaceValue);
+ identifier = new Identifier(namespaceValue);
identifier.fromOMElement(sequenceOfferPart);
OMElement expiresPart = sequenceOfferPart
.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.EXPIRES));
if (expiresPart != null) {
- expires = new Expires(defaultFactory,namespaceValue);
+ expires = new Expires(namespaceValue);
expires.fromOMElement(sequenceOfferPart);
}
@@ -88,8 +85,6 @@
SandeshaMessageKeys.nullMsgId));
OMFactory factory = createSequenceElement.getOMFactory();
- if (factory==null)
- factory = defaultFactory;
OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement sequenceOfferElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER, rmNamespace);
@@ -117,7 +112,7 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2006_08.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=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java Tue Sep 5 20:31:41 2006
@@ -39,19 +39,14 @@
private Identifier identifier;
- private SOAPFactory defaultFactory;
-
private String namespaceValue = null;
- private OMElement element;
-
- public TerminateSequence(SOAPFactory factory, String namespaceValue) throws SandeshaException {
+ public TerminateSequence(String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
namespaceValue));
- this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
}
@@ -65,8 +60,6 @@
throw new OMException(SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
- element = body;
-
OMElement terminateSeqPart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
@@ -75,7 +68,7 @@
SandeshaMessageKeys.noTerminateSeqInElement,
body.toString()));
- identifier = new Identifier(defaultFactory,namespaceValue);
+ identifier = new Identifier(namespaceValue);
identifier.fromOMElement(terminateSeqPart);
return this;
@@ -92,8 +85,6 @@
SandeshaMessageKeys.nullMsgId));
OMFactory factory= body.getOMFactory();
- if (factory==null)
- factory = defaultFactory;
OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement terminateSequenceElement = factory.createOMElement(
@@ -129,13 +120,10 @@
if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
return true;
- if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
return true;
return false;
}
- public OMElement getOMElement() {
- return element;
- }
}
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=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java Tue Sep 5 20:31:41 2006
@@ -39,19 +39,14 @@
private Identifier identifier;
- private SOAPFactory defaultFactory;
-
private String namespaceValue = null;
- private OMElement element;
-
- public TerminateSequenceResponse(SOAPFactory factory, String namespaceValue) throws SandeshaException {
+ public TerminateSequenceResponse(String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
throw new SandeshaException (SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.unknownSpec,
namespaceValue));
- this.defaultFactory = factory;
this.namespaceValue = namespaceValue;
}
@@ -66,8 +61,6 @@
SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
- element = body;
-
OMElement terminateSeqResponsePart = body.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
@@ -77,7 +70,7 @@
SandeshaMessageKeys.noTerminateSeqResponseInElement,
body.toString()));
- identifier = new Identifier(defaultFactory,namespaceValue);
+ identifier = new Identifier(namespaceValue);
identifier.fromOMElement(terminateSeqResponsePart);
return this;
@@ -94,8 +87,6 @@
SandeshaMessageKeys.nullMsgId));
OMFactory factory = body.getOMFactory();
- if (factory==null)
- factory = defaultFactory;
OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
OMElement terminateSequenceResponseElement = factory.createOMElement(
@@ -128,14 +119,10 @@
}
public boolean isNamespaceSupported (String namespaceName) {
- if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+ if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
return true;
return false;
- }
-
- public OMElement getOMElement() {
- return element;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org