Author: chamikara
Date: Mon Nov 20 19:57:49 2006
New Revision: 477493
URL: http://svn.apache.org/viewvc?view=rev&rev=477493
Log:
Patch from Paul, and some other similar fixes
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/RMMsgContext.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/AckRequested.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/IOMRMPart.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/MessagePending.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/RMElements.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/Sequence.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/wsrm/SequenceTest.java
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/RMMsgContext.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/RMMsgContext.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/RMMsgContext.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/RMMsgContext.java
Mon Nov 20 19:57:49 2006
@@ -31,9 +31,7 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.util.SOAPAbstractFactory;
-import org.apache.sandesha2.wsrm.IOMRMElement;
import org.apache.sandesha2.wsrm.IOMRMPart;
-import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
/**
* This class is used to hold a MessageContext within Sandesha. This is used to
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/AckRequested.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/AckRequested.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/AckRequested.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/AckRequested.java
Mon Nov 20 19:57:49 2006
@@ -26,6 +26,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
@@ -115,6 +116,12 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory =
(SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
toOMElement(header);
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/IOMRMPart.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/IOMRMPart.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/IOMRMPart.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/IOMRMPart.java
Mon Nov 20 19:57:49 2006
@@ -17,7 +17,6 @@
package org.apache.sandesha2.wsrm;
-import org.apache.sandesha2.SandeshaException;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/MessagePending.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/MessagePending.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/MessagePending.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/MessagePending.java
Mon Nov 20 19:57:49 2006
@@ -24,6 +24,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.Constants;
@@ -48,6 +49,11 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) throws
SandeshaException {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory =
(SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new
QName(namespaceValue,
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/RMElements.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/RMElements.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/RMElements.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/RMElements.java
Mon Nov 20 19:57:49 2006
@@ -108,7 +108,7 @@
new QName(rmNamespaceValue,
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
if (sequenceElement != null) {
sequence = new Sequence(rmNamespaceValue);
- sequence.fromOMElement(envelope.getHeader());
+ sequence.fromOMElement(sequenceElement);
}
OMElement createSeqElement =
envelope.getBody().getFirstChildWithName(
@@ -193,7 +193,7 @@
Sandesha2Constants.WSRM_COMMON.USES_SEQUENCE_STR));
if (usesSequenceSTRElement != null) {
usesSequenceSTR = new UsesSequenceSTR(factory,
rmNamespaceValue);
- usesSequenceSTR.fromOMElement(envelope.getHeader());
+ usesSequenceSTR.fromOMElement(usesSequenceSTRElement);
}
OMElement makeConnectionElement =
envelope.getBody().getFirstChildWithName(
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/Sequence.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/Sequence.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/Sequence.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/Sequence.java
Mon Nov 20 19:57:49 2006
@@ -58,20 +58,7 @@
return namespaceValue;
}
- public Object fromOMElement(OMElement headerElement) throws
OMException,SandeshaException {
-
- SOAPHeader header = (SOAPHeader) headerElement;
- if (header == null)
- throw new OMException(
- SandeshaMessageHelper.getMessage(
-
SandeshaMessageKeys.seqElementCannotBeAddedToNonHeader));
-
- OMElement sequencePart =
headerElement.getFirstChildWithName(new QName(namespaceValue,
-
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
- if (sequencePart == null)
- throw new OMException(SandeshaMessageHelper.getMessage(
-
SandeshaMessageKeys.noSequencePartInElement,
- headerElement.toString()));
+ public Object fromOMElement(OMElement sequencePart) throws
OMException,SandeshaException {
identifier = new Identifier(namespaceValue);
messageNumber = new MessageNumber(namespaceValue);
@@ -146,6 +133,11 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory =
(SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new
QName(namespaceValue,
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Mon Nov 20 19:57:49 2006
@@ -28,6 +28,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
@@ -243,6 +244,12 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) throws
SandeshaException {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory =
(SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
toOMElement(header);
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
Mon Nov 20 19:57:49 2006
@@ -56,12 +56,7 @@
return namespaceValue;
}
- public Object fromOMElement(OMElement header) throws
OMException,SandeshaException {
-
- OMFactory factory = header.getOMFactory();
- if (factory==null)
- factory = defaultFactory;
-
+ public Object fromOMElement(OMElement usesSequenceStrElement) throws
OMException,SandeshaException {
return this;
}
@@ -94,6 +89,11 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) throws
SandeshaException {
SOAPHeader header = envelope.getHeader();
+ if (header==null) {
+ SOAPFactory factory =
(SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new QName(
namespaceValue,
Sandesha2Constants.WSRM_COMMON.USES_SEQUENCE_STR));
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/wsrm/SequenceTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/wsrm/SequenceTest.java?view=diff&rev=477493&r1=477492&r2=477493
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/wsrm/SequenceTest.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/wsrm/SequenceTest.java
Mon Nov 20 19:57:49 2006
@@ -21,6 +21,7 @@
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -39,7 +40,12 @@
public void testFromOMElement() throws SandeshaException {
SOAPEnvelope env = getSOAPEnvelope("", "Sequence.xml");
Sequence sequence = new Sequence(rmNamespace);
- sequence.fromOMElement(env.getHeader());
+
+ SOAPHeader header = env.getHeader();
+ OMElement sequenceElement = header.getFirstChildWithName(
+ new QName
(rmNamespace,Sandesha2Constants.WSRM_COMMON.SEQUENCE));
+
+ sequence.fromOMElement(sequenceElement);
Identifier identifier = sequence.getIdentifier();
assertEquals("uuid:879da420-1624-11da-bed9-84d13db13902",
identifier.getIdentifier());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
