ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chamik...@apache.org
Subject svn commit: r264193 - in /webservices/sandesha/trunk: config/ samples/interop/ src/org/apache/sandesha2/ src/org/apache/sandesha2/handlers/ src/org/apache/sandesha2/msgprocessors/ src/org/apache/sandesha2/msgreceivers/ src/org/apache/sandesha2/storage/...
Date Mon, 29 Aug 2005 18:17:55 GMT
Author: chamikara
Date: Mon Aug 29 11:15:41 2005
New Revision: 264193

URL: http://svn.apache.org/viewcvs?rev=264193&view=rev
Log:
Sync ping is working upto terminate sequence.

Added:
    webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Modified:
    webservices/sandesha/trunk/config/module.xml
    webservices/sandesha/trunk/samples/interop/service.xml
    webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgCreator.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerInHandler.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java

Modified: webservices/sandesha/trunk/config/module.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/module.xml?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/module.xml (original)
+++ webservices/sandesha/trunk/config/module.xml Mon Aug 29 11:15:41 2005
@@ -13,14 +13,21 @@
     </outflow>
 
 
+
     <operation name="CreateSequence" mep="http://www.w3.org/2004/08/wsdl/in-out">
         <messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
+        <parameter name="wsamapping" locked="xsd:false">http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence</parameter>
     </operation> 
+    
+    <operation name="TerminateSequence" mep="http://www.w3.org/2004/08/wsdl/in-only">
+        <messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
+        <parameter name="wsamapping" locked="xsd:false">http://schemas.xmlsoap.org/ws/2005/02/rm/TerminateSequence</parameter>
+    </operation>
 
 <!--
     <operation name="CreateSequence" mep="http://www.w3.org/2004/08/wsdl/in-out">
-        <parameter name="Mapping">http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence</parameter>
+        <parameter name="wsamapping" >http://schemas.xmlsoap.org/ws/2005/02/rm/CreateSequence</parameter>
         <messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>
     </operation>
---> 
+ -->
 </module>

Modified: webservices/sandesha/trunk/samples/interop/service.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/samples/interop/service.xml?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/samples/interop/service.xml (original)
+++ webservices/sandesha/trunk/samples/interop/service.xml Mon Aug 29 11:15:41 2005
@@ -7,12 +7,16 @@
 
     <module ref="sandesha" />
 
-    <!-- <operation name="ping" />  
-    <operation name="echoString" /> -->
+    <operation name="ping">  
+        <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"
/>
+    </operation>
 
+    <operation name="echoString" />
 
+<!--
     <operation name="ping">
 		<messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver" />
 	</operation> 
+-->
     
 </service>

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java Mon Aug 29 11:15:41
2005
@@ -69,6 +69,7 @@
 
 	public interface WSA {
 		String NS_URI_ANONYMOUS = "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous";
+		String NS_ADDRESSING = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
 	}
 
 	String RM_HEADERS = "rmHeaders";

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java Mon Aug 29 11:15:41
2005
@@ -40,7 +40,15 @@
 		RMElements elements = new RMElements ();
 		elements.fromSOAPEnvelope(msgCtx.getEnvelope());
 		
-		rmMsgContext.setMessagePart(Constants.MESSAGE_PART_CREATE_SEQ,elements.getCreateSequence());
+		String acksTo = elements.getCreateSequence().getAcksTo().getEndPointReference().getAddress();
+		boolean acksToPresent = (acksTo!=null)&&(!acksTo.equals(""));
+		
+		if(acksToPresent){
+			System.out.println("AcksTo:" + elements.getCreateSequence().getAcksTo().getEndPointReference().getAddress());
+			rmMsgContext.setMessagePart(Constants.MESSAGE_PART_CREATE_SEQ,elements.getCreateSequence());
+		}
+		
+		//TODO do similar checks to other parts too.
 		rmMsgContext.setMessagePart(Constants.MESSAGE_PART_CREATE_SEQ_RESPONSE,elements.getCreateSequenceResponse());
 		rmMsgContext.setMessagePart(Constants.MESSAGE_PART_SEQUENCE ,elements.getSequence());
 		rmMsgContext.setMessagePart(Constants.MESSAGE_PART_SEQ_ACKNOWLEDGEMENT,elements.getSequenceAcknowledgement());

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java Mon Aug 29 11:15:41
2005
@@ -22,6 +22,7 @@
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.addressing.om.AddressingHeaders;
@@ -42,7 +43,7 @@
 	
 	public RMMsgContext (){
 		rmMessageParts = new HashMap ();
-		messageType = Constants.MESSAGE_PART_UNKNOWN;
+		messageType = Constants.MESSAGE_TYPE_UNKNOWN;
 	}
 	
 	public RMMsgContext (MessageContext ctx){
@@ -92,6 +93,11 @@
 	public SOAPEnvelope getSOAPEnvelope () {
 		return msgContext.getEnvelope();
 	}
+	
+	public void setSOAPEnvelop (SOAPEnvelope envelope) throws AxisFault {
+		msgContext.setEnvelope(envelope);
+	}
+	
 	public void test (){
 		String opearaitonName = msgContext.getOperationContext().getAxisOperation().getName().getLocalPart();
 		System.out.println ("Operation is:" + opearaitonName);
@@ -105,6 +111,26 @@
 		}catch (Exception ex){
 			ex.printStackTrace();
 		}
+	}
+	
+	public void setFrom (EndpointReference epr) {
+		msgContext.setFrom(epr);
+	}
+	
+	public void setTo (EndpointReference epr){
+		msgContext.setTo(epr);
+	}
+	
+	public void setMessageId (String messageId){
+		msgContext.setMessageID(messageId);
+	}
+	
+	public void setAction (String action){
+		msgContext.setWSAAction(action);
+	}
+	
+	public void setRelatesTo (RelatesTo relatesTo){
+		msgContext.setRelatesTo(relatesTo);
 	}
 	
 	

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgCreator.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgCreator.java Mon Aug 29 11:15:41
2005
@@ -29,11 +29,14 @@
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.soap.impl.llom.soap11.SOAP11Factory;
 import org.apache.sandesha2.wsrm.Accept;
+import org.apache.sandesha2.wsrm.AckRequested;
+import org.apache.sandesha2.wsrm.AcknowledgementRange;
 import org.apache.sandesha2.wsrm.AcksTo;
 import org.apache.sandesha2.wsrm.CreateSequence;
 import org.apache.sandesha2.wsrm.CreateSequenceResponse;
 import org.apache.sandesha2.wsrm.IOMRMElement;
 import org.apache.sandesha2.wsrm.Identifier;
+import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
 
 /**
  * @author
@@ -50,12 +53,13 @@
 		
 		Identifier identifier = new Identifier();
 		// TODO : set the an appropriate id 
+		
 		identifier.setIndentifer("uuid:temp-id-of-sandesha");
 		response.setIdentifier(identifier);
 		Accept accept = new Accept();
 		EndpointReference acksToEPR = createSeqMessage.getTo();  
 		AcksTo acksTo = new AcksTo(acksToEPR);
-		//accept.setAcksTo(acksTo);
+		accept.setAcksTo(acksTo);
 		response.setAccept(accept);
 	
 		SOAPEnvelope envolope1 = outMessage.getEnvelope();
@@ -90,5 +94,28 @@
         outMessage.setEnvelope(envelope);
         RMMsgContext createSeqResponse = new RMMsgContext(outMessage);
 		return createSeqResponse;
+	}
+	
+	public static void createAckMessage (RMMsgContext applicationMsg) throws AxisFault {
+		SOAPEnvelope envelope = applicationMsg.getSOAPEnvelope();
+		if(envelope==null) {
+			SOAPEnvelope newEnvelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+			applicationMsg.setSOAPEnvelop(envelope);
+		}
+		
+		envelope = applicationMsg.getSOAPEnvelope();
+		SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement ();
+		Identifier id = new Identifier ();
+		id.setIndentifer("uuid:temp-id-of-sandesha");
+		sequenceAck.setIdentifier(id);
+		AcknowledgementRange range = new AcknowledgementRange ();
+		range.setMaxValue(1);
+		range.setMinValue(1);
+		sequenceAck.addAcknowledgementRanges(range);
+		sequenceAck.toSOAPEnvelope(envelope);
+		applicationMsg.setAction("http://schemas.xmlsoap.org/ws/2005/02/rm/SequenceAcknowledgement");
+		applicationMsg.setMessageId("uuid:msg-id-of-first-ack");
+		
+		
 	}
 }

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerInHandler.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerInHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerInHandler.java Mon
Aug 29 11:15:41 2005
@@ -39,6 +39,7 @@
 		String opearaitonName = msgCtx.getOperationContext().getAxisOperation().getName().getLocalPart();
 		System.out.println ("Operation is:" + opearaitonName);
 		
+		msgCtx.setProperty("aaaa","abcd");
 		RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(msgCtx);
 		MsgValidator.validateMessage(rmMsgCtx);
 		

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java Mon
Aug 29 11:15:41 2005
@@ -20,13 +20,39 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.MsgInitializer;
+import org.apache.sandesha2.MsgValidator;
+import org.apache.sandesha2.RMMsgContext;
+import org.apache.sandesha2.RMMsgCreator;
+import org.apache.sandesha2.msgreceivers.RMMessageReceiver;
+import org.apache.wsdl.MessageReference;
+import org.apache.wsdl.WSDLConstants;
 
 /**
  * @author 
  */
 public class ServerOutHandler extends AbstractHandler {
 
-	public void invoke(MessageContext arg0) throws AxisFault {
-		// TODO create invoke logic
+	public void invoke(MessageContext msgCtx) throws AxisFault {
+		System.out.println ("Server out handler called");
+		
+		RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(msgCtx);
+		MsgValidator.validateMessage(rmMsgCtx);
+	
+	
+		//getting the request message.
+		MessageContext reqMsgCtx = msgCtx.getOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN);
+		RMMsgContext requestRMMsgCtx = MsgInitializer.initializeMessage(reqMsgCtx);
+		MsgValidator.validateMessage(requestRMMsgCtx);
+		
+
+		
+		if(requestRMMsgCtx.getMessageType()!=Constants.MESSAGE_TYPE_CREATE_SEQ){
+			//set acknowledgement
+			RMMsgCreator.createAckMessage (rmMsgCtx);
+			
+		}
+		
 	}
 }

Added: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=264193&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Mon Aug 29 11:15:41 2005
@@ -0,0 +1,25 @@
+/*
+ * Created on Aug 29, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.apache.sandesha2.msgprocessors;
+
+import org.apache.sandesha2.RMMsgContext;
+
+/**
+ * @author 
+ * 
+ */
+public class ApplicationMsgProcessor implements MsgProcessor {
+
+	public void processMessage(RMMsgContext rmMsgCtx)
+			throws MsgProcessorException {
+
+		//rmMsgCtx.
+		System.out.println ("Application msg processor called");
+		
+
+	}
+}

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
Mon Aug 29 11:15:41 2005
@@ -31,7 +31,7 @@
 			case (Constants.MESSAGE_TYPE_CREATE_SEQ):
 				return new CreateSeqMsgProcessor ();
 			default:
-				return null;
+				return new ApplicationMsgProcessor ();
 		}
 	}
 }

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
Mon Aug 29 11:15:41 2005
@@ -18,8 +18,12 @@
 package org.apache.sandesha2.msgreceivers;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.MessageInformationHeaders;
+import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
@@ -30,6 +34,7 @@
 import org.apache.axis2.soap.SOAP12Constants;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.sandesha2.Constants;
 import org.apache.sandesha2.MsgInitializer;
 import org.apache.sandesha2.MsgValidator;
@@ -37,26 +42,83 @@
 import org.apache.sandesha2.RMMsgCreator;
 
 /**
- * @author  
+ * @author
  */
 
-public class RMMessageReceiver extends AbstractInOutSyncMessageReceiver {
+public class RMMessageReceiver extends AbstractMessageReceiver {
 
-	public void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage) throws
AxisFault {
+	public void invokeBusinessLogic(MessageContext inMessage,
+			MessageContext outMessage) throws AxisFault {
 
 		System.out.println("RM Msg Receiver was called");
 		RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(inMessage);
 		MsgValidator.validateMessage(rmMsgCtx);
 
 		if (rmMsgCtx.getMessageType() == Constants.MESSAGE_TYPE_CREATE_SEQ) {
-			
+
 			RMMsgContext createSeqResponse = RMMsgCreator
-					.createCreateSeqResponseMsg(rmMsgCtx,outMessage);
+					.createCreateSeqResponseMsg(rmMsgCtx, outMessage);
 
 			//createSeqResponse.serializeSOAPEnvelop();
 			outMessage.setResponseWritten(true);
+		} else {
+			outMessage.setResponseWritten(true);
 		}
 
+	}
+
+	public final void receive(MessageContext messgeCtx) throws AxisFault {
+
+		RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(messgeCtx);
+		MsgValidator.validateMessage(rmMsgCtx);
+
+		if (rmMsgCtx.getMessageType() == Constants.MESSAGE_TYPE_CREATE_SEQ) {
+			MessageContext newmsgCtx = new MessageContext(messgeCtx
+					.getSystemContext(), messgeCtx.getSessionContext(),
+					messgeCtx.getTransportIn(), messgeCtx.getTransportOut());
+
+			newmsgCtx
+					.setMessageInformationHeaders(new MessageInformationHeaders());
+			MessageInformationHeaders oldMessageInfoHeaders = messgeCtx
+					.getMessageInformationHeaders();
+			MessageInformationHeaders messageInformationHeaders = new MessageInformationHeaders();
+			messageInformationHeaders.setTo(oldMessageInfoHeaders.getReplyTo());
+			messageInformationHeaders.setFaultTo(oldMessageInfoHeaders
+					.getFaultTo());
+			messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
+			messageInformationHeaders
+					.setRelatesTo(new RelatesTo(
+							oldMessageInfoHeaders.getMessageId(),
+							AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
+			newmsgCtx.setMessageInformationHeaders(messageInformationHeaders);
+			newmsgCtx.setOperationContext(messgeCtx.getOperationContext());
+			newmsgCtx.setServiceContext(messgeCtx.getServiceContext());
+			newmsgCtx.setProperty(MessageContext.TRANSPORT_OUT, messgeCtx
+					.getProperty(MessageContext.TRANSPORT_OUT));
+			newmsgCtx.setProperty(HTTPConstants.HTTPOutTransportInfo, messgeCtx
+					.getProperty(HTTPConstants.HTTPOutTransportInfo));
+
+			//Setting the charater set encoding
+			newmsgCtx
+					.setProperty(
+							MessageContext.CHARACTER_SET_ENCODING,
+							messgeCtx
+									.getProperty(MessageContext.CHARACTER_SET_ENCODING));
+
+			newmsgCtx.setDoingREST(messgeCtx.isDoingREST());
+			newmsgCtx.setDoingMTOM(messgeCtx.isDoingMTOM());
+			newmsgCtx.setServerSide(messgeCtx.isServerSide());
+
+			invokeBusinessLogic(messgeCtx, newmsgCtx);
+
+			AxisEngine engine = new AxisEngine(messgeCtx.getOperationContext()
+					.getServiceContext().getEngineContext());
+			engine.send(newmsgCtx);
+		} else {
+			//TODO: Check weather terminate
+			  
+			//TODO: Do terminate processing
+		}
 	}
 
 	private SOAPFactory getSOAPFactory(MessageContext inMessage)

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java?rev=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
Mon Aug 29 11:15:41 2005
@@ -17,8 +17,10 @@
 package org.apache.sandesha2.storage.beans;
 
 /**
- * @author Sanka Samaranayake <ssanka@gmail.com>
+ * @author 
+ * 
  */
+
 public class SequencePropertyBean {
 
 	private String sequenceId;
@@ -26,39 +28,26 @@
 	private String value;
 	
 	
-	/**
-	 * @return Returns the name.
-	 */
 	public String getName() {
 		return name;
 	}
-	/**
-	 * @param name The name to set.
-	 */
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	/**
-	 * @return Returns the sequenceId.
-	 */
+
 	public String getSequenceId() {
 		return sequenceId;
 	}
-	/**
-	 * @param sequenceId The sequenceId to set.
-	 */
+
 	public void setSequenceId(String sequenceId) {
 		this.sequenceId = sequenceId;
 	}
-	/**
-	 * @return Returns the value.
-	 */
+
 	public String getValue() {
 		return value;
 	}
-	/**
-	 * @param value The value to set.
-	 */
+
 	public void setValue(String value) {
 		this.value = value;
 	}

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=264193&r1=264192&r2=264193&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Mon Aug 29 11:15:41
2005
@@ -36,6 +36,7 @@
 public class AcksTo implements IOMRMElement{
 	private EndpointReference EPR;
 	private OMElement acksToElement;
+	//private OMElement addressElement;
 	
 	OMNamespace acksToNameSpace = 
 		OMAbstractFactory.getSOAP11Factory().createOMNamespace(
@@ -43,11 +44,16 @@
 	public AcksTo(EndpointReference EPR){
 		acksToElement = OMAbstractFactory.getSOAP11Factory().createOMElement(
 				Constants.WSRM.ACKS_TO,acksToNameSpace);
+		//addressElement = acksToElement;
+		
 		this.EPR = EPR;
 	}
 	public OMElement getSOAPElement() throws OMException {
-		acksToElement.addChild(OMAbstractFactory.getSOAP12Factory()
+		OMElement addressElement = OMAbstractFactory.getSOAP11Factory().createOMElement(AddressingConstants.EPR_ADDRESS,
+				Constants.WSA.NS_ADDRESSING,AddressingConstants.WSA_DEFAULT_PRFIX);
+		addressElement.addChild(OMAbstractFactory.getSOAP11Factory()
 				.createText(EPR.getAddress()));
+		acksToElement.addChild(addressElement);
 		return acksToElement;
 	}
 
@@ -77,8 +83,12 @@
 		return this;
 	}
 	public OMElement toSOAPEnvelope(OMElement messageElement) throws OMException {
-		acksToElement.addChild(OMAbstractFactory.getSOAP11Factory().createText(
+		OMElement addressElement = OMAbstractFactory.getSOAP11Factory().createOMElement(AddressingConstants.EPR_ADDRESS,
+				Constants.WSA.NS_ADDRESSING,AddressingConstants.WSA_DEFAULT_PRFIX);
+		addressElement.addChild(OMAbstractFactory.getSOAP11Factory().createText(
 				EPR.getAddress()));
+		acksToElement.addChild(addressElement);
+		
 		messageElement.addChild(acksToElement);
 		return messageElement;
 	}



---------------------------------------------------------------------
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