ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chamik...@apache.org
Subject svn commit: r374591 - in /webservices/sandesha/trunk/src/org/apache/sandesha2: ./ handlers/ msgprocessors/ storage/inmemory/ transport/ util/ workers/ wsrm/
Date Fri, 03 Feb 2006 06:57:21 GMT
Author: chamikara
Date: Thu Feb  2 22:55:42 2006
New Revision: 374591

URL: http://svn.apache.org/viewcvs?rev=374591&view=rev
Log:
Code to send the messages through the Sandesha2TransportSender.
Refactored code to comply with the recent refactoring of Axis2.
Made InmemoryStorageManagers thread safe (need a bit more work)
Bug fixes.

Added:
    webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportOutDesc.java
Modified:
    webservices/sandesha/trunk/src/org/apache/sandesha2/FaultData.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/SOAPFaultEnvelopeCreator.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportSender.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/FaultData.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/FaultData.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/FaultData.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/FaultData.java Thu Feb  2 22:55:42 2006
@@ -17,7 +17,7 @@
 
 package org.apache.sandesha2;
 
-import org.apache.axis2.om.OMElement;
+import org.apache.ws.commons.om.OMElement;
 
 /**
  * Used to hold data related to a RM Fault.

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java Thu Feb  2 22:55:42 2006
@@ -25,7 +25,7 @@
 import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.context.AbstractContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPEnvelope;
 import org.apache.sandesha2.util.SOAPAbstractFactory;
 import org.apache.sandesha2.wsrm.IOMRMElement;
 import org.apache.sandesha2.wsrm.IOMRMPart;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/SOAPFaultEnvelopeCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SOAPFaultEnvelopeCreator.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SOAPFaultEnvelopeCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SOAPFaultEnvelopeCreator.java Thu Feb  2 22:55:42 2006
@@ -19,18 +19,18 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMConstants;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPFault;
-import org.apache.axis2.soap.SOAPFaultCode;
-import org.apache.axis2.soap.SOAPFaultDetail;
-import org.apache.axis2.soap.SOAPFaultReason;
-import org.apache.axis2.soap.SOAPFaultSubCode;
-import org.apache.axis2.soap.SOAPFaultText;
-import org.apache.axis2.soap.SOAPFaultValue;
+import org.apache.ws.commons.om.OMConstants;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPFault;
+import org.apache.ws.commons.soap.SOAPFaultCode;
+import org.apache.ws.commons.soap.SOAPFaultDetail;
+import org.apache.ws.commons.soap.SOAPFaultReason;
+import org.apache.ws.commons.soap.SOAPFaultSubCode;
+import org.apache.ws.commons.soap.SOAPFaultText;
+import org.apache.ws.commons.soap.SOAPFaultValue;
 import org.apache.sandesha2.util.SOAPAbstractFactory;
 import org.apache.sandesha2.util.SandeshaUtil;
 import org.apache.sandesha2.wsrm.FaultCode;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java Thu Feb  2 22:55:42 2006
@@ -350,7 +350,7 @@
 	
 	String MESSAGE_STORE_KEY = "Sandesha2MessageStoreKey";
 
-	String ORIGINAL_TRANSPORT_SENDER = "Sandesha2OriginalTransportSender";
+	String ORIGINAL_TRANSPORT_OUT_DESC = "Sandesha2OriginalTransportSender";
 	
 	String SET_SEND_TO_TRUE = "Sandesha2SetSendToTrue";
 	

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Thu Feb  2 22:55:42 2006
@@ -27,7 +27,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPBody;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sandesha2.RMMsgContext;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java Thu Feb  2 22:55:42 2006
@@ -31,11 +31,12 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.axis2.transport.TransportSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -52,6 +53,7 @@
 import org.apache.sandesha2.storage.beans.CreateSeqBean;
 import org.apache.sandesha2.storage.beans.SenderBean;
 import org.apache.sandesha2.storage.beans.SequencePropertyBean;
+import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
 import org.apache.sandesha2.transport.Sandesha2TransportSender;
 import org.apache.sandesha2.util.MsgInitializer;
 import org.apache.sandesha2.util.PropertyManager;
@@ -383,11 +385,6 @@
 			processResponseMessage(rmMsgCtx, internalSequenceId, messageNumber);
 
 		}
-
-		// cannot pause since the message have to be saved at the sender
-		// pausing the message
-		msgCtx.pause();
-
 		responseProcessTransaction.commit();
 	}
 
@@ -472,6 +469,10 @@
 
 		// this will be set to true in the sender
 		createSeqEntry.setSend(true);
+		
+		createSeqMsg.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING,
+				Sandesha2Constants.VALUE_FALSE);
+		
 		createSeqEntry
 				.setMessageType(Sandesha2Constants.MessageTypes.CREATE_SEQ);
 		retransmitterMgr.insert(createSeqEntry);
@@ -480,28 +481,27 @@
 		// sending the message once through our sender.
 		AxisEngine engine = new AxisEngine(createSeqMsg
 				.getConfigurationContext());
-		Sandesha2TransportSender sender = new Sandesha2TransportSender();
 
-		// message will be stored in the Sandesha2TransportSender
+		// message will be stored in the Sandesha2TransportSender		
 		createSeqMsg.setProperty(Sandesha2Constants.MESSAGE_STORE_KEY, key);
-		// sender.setMessageStoreKey(key);
-
-		TransportSender oldSender = createSeqMsg.getTransportOut().getSender();
-		createSeqMsg.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_SENDER,
-				oldSender);
+		
+		TransportOutDescription transportOut = createSeqMsg.getTransportOut();
+		
+		createSeqMsg.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_OUT_DESC,
+				transportOut);
 		createSeqMsg.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE,
 				Sandesha2Constants.VALUE_TRUE);
 		createSeqMsg.setProperty(Sandesha2Constants.MESSAGE_STORE_KEY, key);
-
-		// setting the sandesha2 sender as the sender.
-		// createSeqMsg.getTransportOut().setSender(sender);
-
-		// try {
-		// log.info ("Sending create seq msg...");
-		// engine.send(createSeqMsg);
-		// } catch (AxisFault e) {
-		// throw new SandeshaException (e.getMessage());
-		// }
+		
+		Sandesha2TransportOutDesc sandesha2TransportOutDesc = new Sandesha2TransportOutDesc ();
+		createSeqMsg.setTransportOut(sandesha2TransportOutDesc);
+
+		 try {
+			 log.info ("Sending create seq msg...");
+			 engine.send(createSeqMsg);
+		 } catch (AxisFault e) {
+			 throw new SandeshaException (e.getMessage());
+		 }
 
 	}
 
@@ -706,7 +706,7 @@
 		if (outSequenceBean == null || outSequenceBean.getValue() == null) {
 			appMsgEntry.setSend(false);
 		} else {
-			appMsgEntry.setSend(false);
+			appMsgEntry.setSend(true);
 			// Send will be set to true at the sender.
 			msg.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE,
 					Sandesha2Constants.VALUE_TRUE);
@@ -722,14 +722,12 @@
 		TransportSender sender = msg.getTransportOut().getSender();
 
 		if (sender != null) {
-			Sandesha2TransportSender sandesha2Sender = new Sandesha2TransportSender();
-
+			Sandesha2TransportOutDesc sandesha2TransportOutDesc = new Sandesha2TransportOutDesc ();
 			msg.setProperty(Sandesha2Constants.MESSAGE_STORE_KEY, storageKey);
-			// sandesha2Sender.setMessageStoreKey(storageKey);
-
-			// msg.getTransportOut().setSender(sandesha2Sender);
-			msg.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_SENDER,
-					sender);
+			msg.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_OUT_DESC,
+					msg.getTransportOut());
+			msg.setTransportOut(sandesha2TransportOutDesc);
+			
 		}
 
 	}

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Thu Feb  2 22:55:42 2006
@@ -39,6 +39,7 @@
 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.SenderBean;
 import org.apache.sandesha2.storage.beans.SequencePropertyBean;
+import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
 import org.apache.sandesha2.transport.Sandesha2TransportSender;
 import org.apache.sandesha2.util.RMMsgCreator;
 import org.apache.sandesha2.util.SandeshaUtil;
@@ -151,7 +152,6 @@
 
 			//TODO - Process Nack
 		}
-
 		
 		//setting acked message date.
 		//TODO add details specific to each message.
@@ -221,7 +221,6 @@
 				terminateTransaction.commit();
 			}
 		}
-		
 	
 		//stopping the progress of the message further.
 		rmMsgCtx.pause();	
@@ -317,6 +316,10 @@
 		
 		//this will be set to true at the sender.
 		terminateBean.setSend(true);
+		
+		terminateRMMessage.getMessageContext().setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING,
+				Sandesha2Constants.VALUE_FALSE);
+		
 		terminateBean.setReSend(false);
 
 		SenderBeanMgr retramsmitterMgr = storageManager
@@ -333,23 +336,21 @@
 		
 		//This should be dumped to the storage by the sender
 		TransportOutDescription transportOut = terminateRMMessage.getMessageContext().getTransportOut();
-		Sandesha2TransportSender sandesha2Sender = new Sandesha2TransportSender ();
-		TransportSender originalSender = transportOut.getSender();
-		terminateRMMessage.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_SENDER,originalSender);
+		
+		terminateRMMessage.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_OUT_DESC,transportOut);
 		
 		terminateRMMessage.setProperty(Sandesha2Constants.MESSAGE_STORE_KEY,key);
-		//sandesha2Sender.setMessageStoreKey(key);
 		
 		terminateRMMessage.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE,Sandesha2Constants.VALUE_TRUE);
 		
-		//transportOut.setSender(sandesha2Sender);
+		terminateRMMessage.getMessageContext().setTransportOut(new Sandesha2TransportOutDesc ());
 		
 	    AxisEngine engine = new AxisEngine (incomingAckRMMsg.getMessageContext().getConfigurationContext());
-//	    try {
-//			engine.send(terminateRMMessage.getMessageContext());
-//		} catch (AxisFault e) {
-//			throw new SandeshaException (e.getMessage());
-//		}
+	    try {
+			engine.send(terminateRMMessage.getMessageContext());
+		} catch (AxisFault e) {
+			throw new SandeshaException (e.getMessage());
+		}
 	    
 	}
 	

Modified: 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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Thu Feb  2 22:55:42 2006
@@ -32,8 +32,8 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sandesha2.RMMsgContext;
@@ -50,6 +50,7 @@
 import org.apache.sandesha2.storage.beans.NextMsgBean;
 import org.apache.sandesha2.storage.beans.SenderBean;
 import org.apache.sandesha2.storage.beans.SequencePropertyBean;
+import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
 import org.apache.sandesha2.transport.Sandesha2TransportSender;
 import org.apache.sandesha2.util.MsgInitializer;
 import org.apache.sandesha2.util.PropertyManager;
@@ -406,6 +407,10 @@
 			
 			//this will be set to true in the sender.
 			ackBean.setSend(true);
+			
+			ackMsgCtx.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING,
+					Sandesha2Constants.VALUE_FALSE);
+			
 			ackBean.setMessageType(Sandesha2Constants.MessageTypes.ACK);
 			
 			//the internalSequenceId value of the retransmitter Table for the
@@ -441,6 +446,8 @@
 			//removing old acks.
 			SenderBean findBean = new SenderBean();
 			findBean.setMessageType(Sandesha2Constants.MessageTypes.ACK);
+			
+			//this will be set to true in the sandesha2TransportSender.
 			findBean.setSend(true);
 			findBean.setReSend(false);
 			Collection coll = retransmitterBeanMgr.find(findBean);
@@ -460,22 +467,20 @@
 			asyncAckTransaction.commit();
 
 			//passing the message through sandesha2sender
-			Sandesha2TransportSender sandesha2Sender = new Sandesha2TransportSender ();
-			TransportOutDescription transportOut = ackMsgCtx.getTransportOut();
-			ackMsgCtx.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_SENDER,transportOut.getSender());
+
+			ackMsgCtx.setProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_OUT_DESC,ackMsgCtx.getTransportOut());
 			ackMsgCtx.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE,Sandesha2Constants.VALUE_TRUE);
 			
 			ackMsgCtx.setProperty(Sandesha2Constants.MESSAGE_STORE_KEY,key);
-			//sandesha2Sender.setMessageStoreKey(key);
 			
-			//transportOut.setSender(sandesha2Sender);
+			ackMsgCtx.setTransportOut(new Sandesha2TransportOutDesc ());
 			
 			AxisEngine engine = new AxisEngine (configCtx);
-//			try {
-//				engine.send(ackMsgCtx);
-//			} catch (AxisFault e) {
-//				throw new SandeshaException (e.getMessage());
-//			}
+			try {
+				engine.send(ackMsgCtx);
+			} catch (AxisFault e) {
+				throw new SandeshaException (e.getMessage());
+			}
 			
 			SandeshaUtil.startSenderForTheSequence(configCtx,sequenceId);
 		}

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Thu Feb  2 22:55:42 2006
@@ -24,7 +24,7 @@
 import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.sandesha2.RMMsgContext;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java Thu Feb  2 22:55:42 2006
@@ -51,27 +51,27 @@
 		}
 	}
 
-	public boolean insert(CreateSeqBean bean) {
+	public synchronized boolean insert(CreateSeqBean bean) {
 		table.put(bean.getCreateSeqMsgID(), bean);
 		return true;
 	}
 
-	public boolean delete(String msgId) {
+	public synchronized boolean delete(String msgId) {
 		return table.remove(msgId) != null;
 	}
 
-	public CreateSeqBean retrieve(String msgId) {
+	public synchronized CreateSeqBean retrieve(String msgId) {
 		return (CreateSeqBean) table.get(msgId);
 	}
 
-	public boolean update(CreateSeqBean bean) {
+	public synchronized boolean update(CreateSeqBean bean) {
 		if (!table.contains(bean))
 			return false;
 
 		return table.put(bean.getCreateSeqMsgID(), bean) != null;
 	}
 
-	public Collection find(CreateSeqBean bean) {
+	public synchronized Collection find(CreateSeqBean bean) {
 		ArrayList beans = new ArrayList();
 		if (bean == null)
 			return beans;
@@ -105,11 +105,11 @@
 		return beans;
 	}
 
-	public ResultSet find(String query) {
+	public synchronized ResultSet find(String query) {
 		throw new UnsupportedOperationException("selectRS() is not supported");
 	}
 	
-	public CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException {
+	public synchronized CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException {
 		Collection coll = find(bean);
 		if (coll.size()>1) {
 			String message = "Non-Unique result";

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java Thu Feb  2 22:55:42 2006
@@ -50,24 +50,24 @@
 		}
 	}
 
-	public boolean insert(InvokerBean bean) {
+	public synchronized boolean insert(InvokerBean bean) {
 		table.put(bean.getMessageContextRefKey(), bean);
 		return true;
 	}
 
-	public boolean delete(String key) {
+	public synchronized boolean delete(String key) {
 		return table.remove(key) != null;
 	}
 
-	public InvokerBean retrieve(String key) {
+	public synchronized InvokerBean retrieve(String key) {
 		return (InvokerBean) table.get(key);
 	}
 
-	public ResultSet find(String query) {
+	public synchronized ResultSet find(String query) {
 		throw new UnsupportedOperationException("selectRS() is not implemented");
 	}
 
-	public Collection find(InvokerBean bean) {
+	public synchronized Collection find(InvokerBean bean) {
 		ArrayList beans = new ArrayList();
 		Iterator iterator = table.values().iterator();
 
@@ -95,14 +95,14 @@
 		return beans;
 	}
 
-	public boolean update(InvokerBean bean) {
+	public synchronized boolean update(InvokerBean bean) {
 		if (!table.contains(bean))
 			return false;
 
 		return table.put(bean.getMessageContextRefKey(), bean) != null;
 	}
 	
-	public InvokerBean findUnique (InvokerBean bean) throws SandeshaException {
+	public synchronized InvokerBean findUnique (InvokerBean bean) throws SandeshaException {
 		Collection coll = find(bean);
 		if (coll.size()>1) {
 			String message = "Non-Unique result";

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java Thu Feb  2 22:55:42 2006
@@ -51,24 +51,24 @@
 		}
 	}
 
-	public boolean delete(String sequenceId) {
+	public synchronized boolean delete(String sequenceId) {
 		return table.remove(sequenceId) != null;
 	}
 
-	public NextMsgBean retrieve(String sequenceId) {
+	public synchronized NextMsgBean retrieve(String sequenceId) {
 		return (NextMsgBean) table.get(sequenceId);
 	}
 
-	public boolean insert(NextMsgBean bean) {
+	public synchronized boolean insert(NextMsgBean bean) {
 		table.put(bean.getSequenceID(), bean);
 		return true;
 	}
 
-	public ResultSet find(String query) {
+	public synchronized ResultSet find(String query) {
 		throw new UnsupportedOperationException("selectRS() is not supported");
 	}
 
-	public Collection find(NextMsgBean bean) {
+	public synchronized Collection find(NextMsgBean bean) {
 		ArrayList beans = new ArrayList();
 		Iterator iterator = table.values().iterator();
 
@@ -97,18 +97,18 @@
 		return beans;
 	}
 
-	public boolean update(NextMsgBean bean) {
+	public synchronized boolean update(NextMsgBean bean) {
 		if (!table.contains(bean))
 			return false;
 
 		return table.put(bean.getSequenceID(), bean) != null;
 	}
 
-	public Collection retrieveAll() {
+	public synchronized Collection retrieveAll() {
 		return table.values();
 	}
 	
-	public NextMsgBean findUnique(NextMsgBean bean) throws SandeshaException {
+	public synchronized NextMsgBean findUnique(NextMsgBean bean) throws SandeshaException {
 		Collection coll = find(bean);
 		if (coll.size()>1) {
 			String message = "Non-Unique result";

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java Thu Feb  2 22:55:42 2006
@@ -50,22 +50,22 @@
 		}
 	}
 
-	public boolean delete(String MessageId) {
+	public synchronized boolean delete(String MessageId) {
 		return table.remove(MessageId) != null;
 	}
 
-	public SenderBean retrieve(String MessageId) {
+	public synchronized SenderBean retrieve(String MessageId) {
 		return (SenderBean) table.get(MessageId);
 	}
 
-	public boolean insert(SenderBean bean) throws SandeshaStorageException {
+	public synchronized boolean insert(SenderBean bean) throws SandeshaStorageException {
 		if (bean.getMessageID() == null)
 			throw new SandeshaStorageException("Key (MessageId) is null. Cant insert.");
 		table.put(bean.getMessageID(), bean);
 		return true;
 	}
 
-	public Collection find(String internalSequenceID) {
+	public synchronized Collection find(String internalSequenceID) {
 		
 		ArrayList arrayList = new ArrayList ();
 		if (internalSequenceID==null || "".equals(internalSequenceID))
@@ -82,7 +82,7 @@
 		return arrayList;
 	}
 
-	public Collection find(SenderBean bean) {
+	public synchronized Collection find(SenderBean bean) {
 		ArrayList beans = new ArrayList();
 		Iterator iterator = ((Hashtable) table).values().iterator();
 
@@ -130,7 +130,7 @@
 		return beans;
 	}
 
-	public Collection findMsgsToSend() {
+	public synchronized Collection findMsgsToSend() {
 		ArrayList beans = new ArrayList();
 		Iterator iterator = table.keySet().iterator();
 
@@ -153,7 +153,7 @@
 		return beans;
 	}
 
-	private ArrayList findBeansWithMsgNo(ArrayList list, long msgNo) {
+	private synchronized ArrayList findBeansWithMsgNo(ArrayList list, long msgNo) {
 		ArrayList beans = new ArrayList();
 
 		Iterator it = list.iterator();
@@ -166,14 +166,14 @@
 		return beans;
 	}
 
-	public boolean update(SenderBean bean) {
+	public synchronized boolean update(SenderBean bean) {
 		if (!table.contains(bean))
 			return false;
 
 		return true; //No need to update. Being a reference does the job.
 	}
 	
-	public SenderBean findUnique(SenderBean bean) throws SandeshaException {
+	public synchronized SenderBean findUnique(SenderBean bean) throws SandeshaException {
 		Collection coll = find(bean);
 		if (coll.size()>1) {
 			String message = "Non-Unique result";
@@ -188,7 +188,7 @@
 			return null;
 	}
 
-	public SenderBean retrieveFromMessageRefKey(String messageContextRefKey) {
+	public synchronized SenderBean retrieveFromMessageRefKey(String messageContextRefKey) {
 		
 		Iterator iter = table.keySet().iterator();
 		while (iter.hasNext()) {

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java Thu Feb  2 22:55:42 2006
@@ -50,27 +50,27 @@
 		}
 	}
 
-	public boolean delete(String sequenceId, String name) {
+	public synchronized boolean delete(String sequenceId, String name) {
 		
 		SequencePropertyBean bean = retrieve( sequenceId,name);
 				
 		return table.remove(sequenceId + ":" + name) != null;
 	}
 
-	public SequencePropertyBean retrieve(String sequenceId, String name) {
+	public synchronized SequencePropertyBean retrieve(String sequenceId, String name) {
 		return (SequencePropertyBean) table.get(sequenceId + ":" + name);
 	}
 
-	public boolean insert(SequencePropertyBean bean) {
+	public synchronized boolean insert(SequencePropertyBean bean) {
 		table.put(bean.getSequenceID() + ":" + bean.getName(), bean);
 		return true;
 	}
 
-	public ResultSet find(String query) {
+	public synchronized ResultSet find(String query) {
 		throw new UnsupportedOperationException("selectRS() is not supported");
 	}
 
-	public Collection find(SequencePropertyBean bean) {
+	public synchronized Collection find(SequencePropertyBean bean) {
 		ArrayList beans = new ArrayList();
 
 		if (bean == null)
@@ -103,7 +103,7 @@
 		return beans;
 	}
 
-	public boolean update(SequencePropertyBean bean) {
+	public synchronized boolean update(SequencePropertyBean bean) {
 		
 		if (bean.getName().equals(Sandesha2Constants.SequenceProperties.COMPLETED_MESSAGES)) {
 			int i = 1;
@@ -120,7 +120,7 @@
 		return bean.getSequenceID() + ":" + bean.getName();
 	}
 	
-	public SequencePropertyBean findUnique(SequencePropertyBean bean) throws SandeshaException {
+	public synchronized SequencePropertyBean findUnique(SequencePropertyBean bean) throws SandeshaException {
 		Collection coll = find(bean);
 		if (coll.size()>1) {
 			String message = "Non-Unique result";
@@ -135,7 +135,7 @@
 			return null;
 	}
 
-	public Collection retrieveAll() {
+	public synchronized Collection retrieveAll() {
 		Collection coll = new ArrayList();
 		
 		Iterator keys = table.keySet().iterator();

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Thu Feb  2 22:55:42 2006
@@ -22,7 +22,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPEnvelope;
 import org.apache.sandesha2.storage.SandeshaStorageException;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.Transaction;
@@ -42,9 +42,20 @@
 
 	private static InMemoryStorageManager instance = null;
     private final String MESSAGE_MAP_KEY = "Sandesha2MessageMap";
+    private CreateSeqBeanMgr  createSeqBeanMgr = null;
+    private NextMsgBeanMgr nextMsgBeanMgr = null;
+    private SequencePropertyBeanMgr sequencePropertyBeanMgr = null;
+    private SenderBeanMgr senderBeanMgr = null;
+    private InvokerBeanMgr invokerBeanMgr = null;
     
 	public InMemoryStorageManager(ConfigurationContext context) {
 		super(context);
+		
+		this.createSeqBeanMgr = new InMemoryCreateSeqBeanMgr (context);
+		this.nextMsgBeanMgr = new InMemoryNextMsgBeanMgr (context);
+		this.senderBeanMgr = new InMemorySenderBeanMgr (context);
+		this.invokerBeanMgr = new InMemoryInvokerBeanMgr (context);
+		this.sequencePropertyBeanMgr = new InMemorySequencePropertyBeanMgr (context);
 	}
 
 	public Transaction getTransaction() {
@@ -52,23 +63,23 @@
 	}
 
 	public CreateSeqBeanMgr getCreateSeqBeanMgr() {
-		return new InMemoryCreateSeqBeanMgr(getContext());
+		return createSeqBeanMgr;
 	}
 
 	public NextMsgBeanMgr getNextMsgBeanMgr() {
-		return new InMemoryNextMsgBeanMgr(getContext());
+		return nextMsgBeanMgr;
 	}
 
 	public SenderBeanMgr getRetransmitterBeanMgr() {
-		return new InMemorySenderBeanMgr(getContext());
+		return senderBeanMgr;
 	}
 
 	public SequencePropertyBeanMgr getSequencePropretyBeanMgr() {
-		return new InMemorySequencePropertyBeanMgr(getContext());
+		return sequencePropertyBeanMgr;
 	}
 
 	public InvokerBeanMgr getStorageMapBeanMgr() {
-		return new InMemoryInvokerBeanMgr(getContext());
+		return invokerBeanMgr;
 	}
 
 	public void init(ConfigurationContext context) {

Added: webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportOutDesc.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportOutDesc.java?rev=374591&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportOutDesc.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportOutDesc.java Thu Feb  2 22:55:42 2006
@@ -0,0 +1,19 @@
+package org.apache.sandesha2.transport;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.description.ParameterIncludeImpl;
+import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.engine.Phase;
+import org.apache.axis2.phaseresolver.PhaseMetadata;
+
+public class Sandesha2TransportOutDesc extends TransportOutDescription {
+
+    public Sandesha2TransportOutDesc() {
+        super (new QName ("Sandesha2TransportOutDesc"));
+        this.setSender(new Sandesha2TransportSender ());
+    }
+    
+    
+	
+}

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportSender.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportSender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/transport/Sandesha2TransportSender.java Thu Feb  2 22:55:42 2006
@@ -26,12 +26,14 @@
 	public void invoke(MessageContext msgContext) throws AxisFault {
 		
 		//setting the correct transport sender.
-		TransportSender sender = (TransportSender) msgContext.getProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_SENDER);
+		//TransportSender sender = (TransportSender) msgContext.getProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_SENDER);
+		TransportOutDescription transportOut = (TransportOutDescription) msgContext.getProperty(Sandesha2Constants.ORIGINAL_TRANSPORT_OUT_DESC);
 		
-		if (sender==null)
+		if (transportOut==null)
 			throw new SandeshaException ("Original transport sender is not present");
 		
-		msgContext.getTransportOut().setSender(sender);
+		//msgContext.getTransportOut().setSender(sender);
+		msgContext.setTransportOut(transportOut);
 		
 		String key =  (String) msgContext.getProperty(Sandesha2Constants.MESSAGE_STORE_KEY);
 		
@@ -51,14 +53,14 @@
 
 		RMMsgContext rmMsg = MsgInitializer.initializeMessage(msgContext);
 		
+		String messageType = SandeshaUtil.getMessageTypeString(rmMsg.getMessageType());
 		SenderBean senderBean = senderBeanMgr.retrieveFromMessageRefKey(key);
 
-	 	String setSendToTrue = (String) msgContext.getProperty(Sandesha2Constants.SET_SEND_TO_TRUE);
-		if (Sandesha2Constants.VALUE_TRUE.equals(setSendToTrue)) {
-
-			senderBean.setSend(true);
-			senderBeanMgr.update(senderBean);
-		}
+//	 	String setSendToTrue = (String) msgContext.getProperty(Sandesha2Constants.SET_SEND_TO_TRUE);
+//		if (Sandesha2Constants.VALUE_TRUE.equals(setSendToTrue)) {
+//			senderBean.setSend(true);
+//			senderBeanMgr.update(senderBean);
+//		}
 		
 		transaction.commit();
 		

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java Thu Feb  2 22:55:42 2006
@@ -30,12 +30,12 @@
 import org.apache.axis2.context.ServiceGroupContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisOperationFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.soap.SOAP11Constants;
+import org.apache.ws.commons.soap.SOAP12Constants;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPHeader;
 import org.apache.axis2.util.Utils;
 import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.FaultData;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java Thu Feb  2 22:55:42 2006
@@ -30,8 +30,8 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisOperationFactory;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.SandeshaException;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java Thu Feb  2 22:55:42 2006
@@ -17,8 +17,8 @@
 
 package org.apache.sandesha2.util;
 
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Thu Feb  2 22:55:42 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.sandesha2.util;
 
+import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,6 +24,10 @@
 import java.util.StringTokenizer;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
@@ -37,12 +42,12 @@
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.soap.SOAP11Constants;
+import org.apache.ws.commons.soap.SOAP12Constants;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPHeader;
 import org.apache.axis2.util.UUIDGenerator;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
@@ -729,6 +734,18 @@
 		}
 		
 		return null;  //not complete yet.
+	}
+	
+	public static void printSOAPEnvelope (SOAPEnvelope envelope, OutputStream out) throws SandeshaException {
+		try {
+			XMLStreamWriter writer =  XMLOutputFactory.newInstance().createXMLStreamWriter(out);
+			System.out.println("\n");
+			envelope.serialize(writer);
+		} catch (XMLStreamException e) {
+			throw new SandeshaException (e.getMessage());
+		} catch (FactoryConfigurationError e) {
+			throw new SandeshaException (e.getMessage());
+		}
 	}
 
 }

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java Thu Feb  2 22:55:42 2006
@@ -16,6 +16,8 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.MessageContextConstants;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.Parameter;
 import org.apache.commons.logging.Log;
@@ -165,17 +167,51 @@
 
 		SequencePropertyBean toBean = new SequencePropertyBean(internalSequenceId,
 				Sandesha2Constants.SequenceProperties.TO_EPR, toEPR.getAddress());
-
-		//Default value for acksTo is anonymous
-		if (acksTo == null)
+		SequencePropertyBean replyToBean = null;
+		SequencePropertyBean acksToBean = null;
+		
+		if (firstAplicationMsgCtx.isServerSide()) {
+			//setting replyTo value, if this is the server side.
+			OperationContext opContext = firstAplicationMsgCtx.getOperationContext();
+			try {
+				MessageContext requestMessage = opContext.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+				if (requestMessage==null) {
+					String message = "Cannot find the request message from the operation context";
+					log.error(message);
+					throw new SandeshaException (message);
+				}
+				
+				EndpointReference replyToEPR = requestMessage.getTo();    //'replyTo' of the response msg is the 'to' value of the req msg.
+				if (replyToEPR!=null) {
+					replyToBean = new SequencePropertyBean (internalSequenceId,Sandesha2Constants.SequenceProperties.REPLY_TO_EPR,replyToEPR.getAddress());
+					acksToBean = new SequencePropertyBean (internalSequenceId,Sandesha2Constants.SequenceProperties.ACKS_TO_EPR,replyToEPR.getAddress());		
+				} else {
+					String message = "To EPR is not present in the request message. Need this information to set acksTo & replyTo value of reply messages";
+					log.error(message);
+					throw new SandeshaException (message);
+				}
+			} catch (AxisFault e) {
+				String message = "Cannot get request message from the operation context";
+				log.error(message);
+				log.error(e.getStackTrace());
+				throw new SandeshaException (message);
+			}
+		}
+		//Default value for acksTo is anonymous  (this happens only for the client side)
+		if (acksToBean==null) {
 			acksTo = Sandesha2Constants.WSA.NS_URI_ANONYMOUS;
 
-		EndpointReference acksToEPR = new EndpointReference(acksTo);
-		SequencePropertyBean acksToBean = new SequencePropertyBean(
+			EndpointReference acksToEPR = new EndpointReference(acksTo);
+		    acksToBean = new SequencePropertyBean(
 				internalSequenceId, Sandesha2Constants.SequenceProperties.ACKS_TO_EPR,
 				acksToEPR.getAddress());
+		}
+		
 		seqPropMgr.insert(toBean);
-		seqPropMgr.insert(acksToBean);
+		if (acksToBean!=null)
+			seqPropMgr.insert(acksToBean);
+		if (replyToBean!=null)
+			seqPropMgr.insert(replyToBean);
 		
 		//saving transportTo value;
 		String transportTo = (String) firstAplicationMsgCtx.getProperty(MessageContextConstants.TRANSPORT_URL);

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Thu Feb  2 22:55:42 2006
@@ -26,8 +26,10 @@
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.axis2.transport.TransportSender;
 import org.apache.axis2.transport.TransportUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -128,10 +130,10 @@
 					//But it will set if it is not set (null)
 					
 					//This is used to make sure that the mesage get passed the Sandesha2TransportSender.
-//					String qualifiedForSending = (String) msgCtx.getProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING);
-//					if (qualifiedForSending!=null && !qualifiedForSending.equals(Sandesha2Constants.VALUE_TRUE)) {
-//						continue;
-//					}
+					String qualifiedForSending = (String) msgCtx.getProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING);
+					if (qualifiedForSending!=null && !qualifiedForSending.equals(Sandesha2Constants.VALUE_TRUE)) {
+						continue;
+					}
 					
 					try {
 
@@ -142,7 +144,8 @@
 												
 						RMMsgContext rmMsgCtx = MsgInitializer
 								.initializeMessage(msgCtx);
-
+						//rmMsgCtx.addSOAPEnvelope();
+						
 						//skip sending if this message has been mentioned as a message not to send (within sandesha2.properties)
 						ArrayList msgsNotToSend = PropertyManager.getInstance().getMessagesNotToSend();
 						//SandeshaPropertyBean propertyBean = (SandeshaPropertyBean) messageContext.getParameter(Sandesha2Constants.SANDESHA2_POLICY_BEAN);
@@ -189,15 +192,21 @@
 						
 						try {
 							//every message should be resumed (pause==false) when sending
-							boolean paused = msgCtx.isPaused();
+//							boolean paused = msgCtx.isPaused();
+							
 							
+//							AxisEngine engine = new AxisEngine(msgCtx
+//									.getConfigurationContext());
+//							if (paused) {
+//								engine.resume(msgCtx);
+//							}else  {
+//								engine.send(msgCtx);
+//							}
 							
-							AxisEngine engine = new AxisEngine(msgCtx
-									.getConfigurationContext());
-							if (paused) {
-								engine.resume(msgCtx);
-							}else  {
-								engine.send(msgCtx);
+							TransportOutDescription transportOutDescription = msgCtx.getTransportOut();
+							TransportSender transportSender = transportOutDescription.getSender();
+							if (transportSender!=null) {
+								transportSender.invoke(msgCtx);
 							}
 							
 						} catch (Exception e) {

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java Thu Feb  2 22:55:42 2006
@@ -18,10 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java Thu Feb  2 22:55:42 2006
@@ -18,13 +18,13 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPHeader;
+import org.apache.ws.commons.soap.SOAPHeaderBlock;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Thu Feb  2 22:55:42 2006
@@ -18,11 +18,11 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMAttribute;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Thu Feb  2 22:55:42 2006
@@ -18,10 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java Thu Feb  2 22:55:42 2006
@@ -9,10 +9,10 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java Thu Feb  2 22:55:42 2006
@@ -18,12 +18,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Thu Feb  2 22:55:42 2006
@@ -18,12 +18,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java Thu Feb  2 22:55:42 2006
@@ -19,10 +19,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java Thu Feb  2 22:55:42 2006
@@ -18,10 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java Thu Feb  2 22:55:42 2006
@@ -24,8 +24,8 @@
  * @author Saminda Abeyruwan  <saminda@opensource.lk>
  */
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
 
 public interface IOMRMElement {
 	public OMElement getOMElement() throws OMException;

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java?rev=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java Thu Feb  2 22:55:42 2006
@@ -17,7 +17,7 @@
 
 package org.apache.sandesha2.wsrm;
 
-import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPEnvelope;
 
 /**
  * This is the base interface for RM infoset objects that are added directly so 

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java Thu Feb  2 22:55:42 2006
@@ -24,10 +24,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 public class Identifier implements Sandesha2Constants, IOMRMElement {

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java Thu Feb  2 22:55:42 2006
@@ -18,10 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java Thu Feb  2 22:55:42 2006
@@ -18,10 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java Thu Feb  2 22:55:42 2006
@@ -16,10 +16,10 @@
  */
 package org.apache.sandesha2.wsrm;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java Thu Feb  2 22:55:42 2006
@@ -18,11 +18,11 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+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;
 

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java Thu Feb  2 22:55:42 2006
@@ -18,13 +18,13 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPHeader;
+import org.apache.ws.commons.soap.SOAPHeaderBlock;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**
@@ -116,6 +116,11 @@
 
 		SOAPHeaderBlock sequenceHeaderBlock = soapHeader.addHeaderBlock(
 				Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
+		//soapHeader.addChild(sequenceHeaderBlock);
+		//OMElement elem1 = factory.createOMElement("test","http://test1","test2");
+		//soapHeader.addChild(elem1)
+		
+		
 		sequenceHeaderBlock.setMustUnderstand(true);
 		identifier.toOMElement(sequenceHeaderBlock);
 		messageNumber.toOMElement(sequenceHeaderBlock);

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Thu Feb  2 22:55:42 2006
@@ -22,12 +22,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
+import org.apache.ws.commons.soap.SOAPHeader;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java Thu Feb  2 22:55:42 2006
@@ -18,11 +18,11 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java Thu Feb  2 22:55:42 2006
@@ -18,10 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**

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=374591&r1=374590&r2=374591&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java Thu Feb  2 22:55:42 2006
@@ -18,12 +18,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMException;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPBody;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 
 /**



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