ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chamik...@apache.org
Subject svn commit: r240304 - in /webservices/sandesha/trunk: ./ src/org/apache/sandesha2/wsrm/
Date Fri, 26 Aug 2005 18:15:58 GMT
Author: chamikara
Date: Fri Aug 26 11:14:14 2005
New Revision: 240304

URL: http://svn.apache.org/viewcvs?rev=240304&view=rev
Log:
applied the patch

Modified:
    webservices/sandesha/trunk/maven.xml
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java

Modified: webservices/sandesha/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/maven.xml?rev=240304&r1=240303&r2=240304&view=diff
==============================================================================
--- webservices/sandesha/trunk/maven.xml (original)
+++ webservices/sandesha/trunk/maven.xml Fri Aug 26 11:14:14 2005
@@ -30,11 +30,11 @@
         <ant:jar jarfile="${basedir}/target/dist/${service.jar.name}" basedir="${maven.build.dir}/samples/classes"
/>
     </goal>
 
-    <goal name="jar.copy" prereqs="module.jar,ping.jar">
+    <goal name="jar.copy" prereqs="module.jar,interop.jar">
         <property environment="env1"/>
         <property name="webapps" value="${env1.CATALINA_HOME}/webapps"/>
         <ant:copy file="${basedir}/target/dist/sandesha.jar" todir="${webapps}/axis2/WEB-INF/modules"/>
-        <ant:copy file="${basedir}/target/dist/echo.jar" todir="${webapps}/axis2/WEB-INF/services"/>
+        <ant:copy file="${basedir}/target/dist/InteropService.jar" todir="${webapps}/axis2/WEB-INF/services"/>
     </goal>
 
     <!--    <preGoal name="java:compile">-->

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java?rev=240304&r1=240303&r2=240304&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Fri Aug 26 11:14:14
2005
@@ -18,6 +18,9 @@
 
 import java.util.Iterator;
 
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
@@ -57,7 +60,9 @@
 			}else{
 				OMElement omElement = (OMElement)omNode;
 				if (omElement.getLocalName().equals(Constants.WSRM.ACKS_TO)){
-					String uri = omElement.getText();
+					OMElement addressElement = omElement.getFirstChildWithName(
+							new QName(AddressingConstants.EPR_ADDRESS));
+					String uri = addressElement.getText();
 					EPR = new EndpointReference(uri);
 					return true;
 				}else{

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java?rev=240304&r1=240303&r2=240304&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Fri
Aug 26 11:14:14 2005
@@ -71,6 +71,7 @@
 	public Identifier getIdentifier(){
 		return identifier;
 	}
+	
 	public void setAccept(Accept accept){
 		this.accept = accept;
 	}

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=240304&r1=240303&r2=240304&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java Fri Aug 26 11:14:14
2005
@@ -44,10 +44,6 @@
 				Constants.WSRM.IDENTIFIER, wsuNamespace);
 	}
 
-	public void setURI(String uri) throws OMException {
-		identifierElement.addChild(OMAbstractFactory.getSOAP11Factory().createText(uri));
-	}
-
 	public void setIndentifer(String identifier) {
 		this.identifier = identifier;
 	}
@@ -89,7 +85,7 @@
 			throws OMException {
 		//soapheaderblock will be given or anyother block reference to the requirment
 		if (identifier == null || identifier == "") {
-			throw new OMException("Set Identifier");
+			throw new OMException("identifier is not set .. ");
 		}
 		identifierElement.addChild(OMAbstractFactory.getSOAP11Factory().createText(
 				identifier));
@@ -118,4 +114,4 @@
 	public int hashCode() {
 		return identifier.hashCode();
 	}
-}
\ No newline at end of file
+}

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=240304&r1=240303&r2=240304&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
Fri Aug 26 11:14:14 2005
@@ -24,6 +24,7 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPHeader;
 import org.apache.axis2.soap.SOAPHeaderBlock;
@@ -69,21 +70,36 @@
 		SOAPHeader soapHeader = envelope.getHeader();
 		Iterator iterator = soapHeader.getChildren();
 		while (iterator.hasNext()){
-			OMElement omElement = (OMElement)iterator.next();
+			OMNode omNode = (OMNode) iterator.next();
+			
+			if (!(omNode instanceof OMElement)) {
+				continue;
+			}
+			OMElement omElement = (OMElement) omNode;
+			
 			if (omElement.getLocalName().equals(Constants.WSRM.SEQUENCE_ACK)){
 				Iterator childIterator = omElement.getChildren();
 				while (childIterator.hasNext()){
-					OMElement childElement = (OMElement)childIterator.next();
+					OMNode childOMNode = (OMNode) childIterator.next();
+					
+					if (!(childOMNode instanceof OMElement)) {
+						continue;
+					}
+					
+					OMElement childElement = (OMElement) childOMNode;
+					
 					if (childElement.getLocalName().equals(Constants.WSRM.ACK_RANGE)){
 						AcknowledgementRange ackRange = new AcknowledgementRange();
 						ackRange.fromSOAPEnvelope(childElement);
 						acknowledgementRanges.add(ackRange);
 					}
+					
 					if (childElement.getLocalName().equals(Constants.WSRM.NACK)){
 						Nack nack = new Nack();	
 						nack.fromSOAPEnvelope(childElement);
 						nackList.add(nack);
 					}
+					
 					if ( childElement.getLocalName().equals(Constants.WSRM.IDENTIFIER)){
 						identifier = new Identifier();
 						identifier.fromSOAPEnvelope(envelope);



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org


Mime
View raw message