ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chamik...@apache.org
Subject svn commit: r349889 [2/2] - in /webservices/sandesha/trunk/src/org/apache/sandesha2: ./ handlers/ msgprocessors/ policy/ storage/beans/ storage/inmemory/ util/ workers/ wsrm/
Date Wed, 30 Nov 2005 06:05:22 GMT
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java?rev=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java Tue Nov 29 22:03:23 2005
@@ -18,7 +18,7 @@
 package org.apache.sandesha2.util;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.wsrm.RMElements;
@@ -52,36 +52,36 @@
 		elements.fromSOAPEnvelope(msgCtx.getEnvelope());
 
 		if (elements.getCreateSequence() != null)
-			rmMsgContext.setMessagePart(Constants.MessageParts.CREATE_SEQ,
+			rmMsgContext.setMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ,
 					elements.getCreateSequence());
 
 		if (elements.getCreateSequenceResponse() != null)
 			rmMsgContext.setMessagePart(
-					Constants.MessageParts.CREATE_SEQ_RESPONSE, elements
+					Sandesha2Constants.MessageParts.CREATE_SEQ_RESPONSE, elements
 							.getCreateSequenceResponse());
 
 		if (elements.getSequence() != null)
-			rmMsgContext.setMessagePart(Constants.MessageParts.SEQUENCE,
+			rmMsgContext.setMessagePart(Sandesha2Constants.MessageParts.SEQUENCE,
 					elements.getSequence());
 
 		if (elements.getSequenceAcknowledgement() != null)
 			rmMsgContext.setMessagePart(
-					Constants.MessageParts.SEQ_ACKNOWLEDGEMENT, elements
+					Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT, elements
 							.getSequenceAcknowledgement());
 
 		if (elements.getTerminateSequence() != null)
-			rmMsgContext.setMessagePart(Constants.MessageParts.TERMINATE_SEQ,
+			rmMsgContext.setMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ,
 					elements.getTerminateSequence());
 
 		if (elements.getAckRequested() != null)
-			rmMsgContext.setMessagePart(Constants.MessageParts.ACK_REQUEST,
+			rmMsgContext.setMessagePart(Sandesha2Constants.MessageParts.ACK_REQUEST,
 					elements.getAckRequested());
 
 	}
 
 	/**
 	 * This is used to validate the message.
-	 * Also set an Message type. Possible types are given in the Constants.MessageTypes interface.
+	 * Also set an Message type. Possible types are given in the Sandesha2Constants.MessageTypes interface.
 	 * 
 	 * @param rmMsgCtx
 	 * @return
@@ -91,20 +91,20 @@
 			throws SandeshaException {
 
 		//Setting message type.
-		if (rmMsgCtx.getMessagePart(Constants.MessageParts.CREATE_SEQ) != null)
-			rmMsgCtx.setMessageType(Constants.MessageTypes.CREATE_SEQ);
+		if (rmMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ) != null)
+			rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.CREATE_SEQ);
 		else if (rmMsgCtx
-				.getMessagePart(Constants.MessageParts.CREATE_SEQ_RESPONSE) != null)
-			rmMsgCtx.setMessageType(Constants.MessageTypes.CREATE_SEQ_RESPONSE);
-		else if (rmMsgCtx.getMessagePart(Constants.MessageParts.TERMINATE_SEQ) != null)
-			rmMsgCtx.setMessageType(Constants.MessageTypes.TERMINATE_SEQ);
-		else if (rmMsgCtx.getMessagePart(Constants.MessageParts.SEQUENCE) != null)
-			rmMsgCtx.setMessageType(Constants.MessageTypes.APPLICATION);
+				.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ_RESPONSE) != null)
+			rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.CREATE_SEQ_RESPONSE);
+		else if (rmMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ) != null)
+			rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.TERMINATE_SEQ);
+		else if (rmMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE) != null)
+			rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.APPLICATION);
 		else if (rmMsgCtx
-				.getMessagePart(Constants.MessageParts.SEQ_ACKNOWLEDGEMENT) != null)
-			rmMsgCtx.setMessageType(Constants.MessageTypes.ACK);
+				.getMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT) != null)
+			rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.ACK);
 		else
-			rmMsgCtx.setMessageType(Constants.MessageTypes.UNKNOWN);
+			rmMsgCtx.setMessageType(Sandesha2Constants.MessageTypes.UNKNOWN);
 
 		return true;
 	}

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java?rev=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java Tue Nov 29 22:03:23 2005
@@ -21,12 +21,12 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.policy.RMPolicyBean;
 
 /**
- * Loads properties from sandesha2.properties file (from Constants if this is not available).
+ * Loads properties from sandesha2.properties file (from Sandesha2Constants if this is not available).
  * 
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
  */
@@ -45,7 +45,7 @@
 	private void loadProperties (InputStream in) {
 		try {
 			if (in==null)
-				in = Thread.currentThread().getContextClassLoader().getResourceAsStream(Constants.PROPERTY_FILE);
+				in = Thread.currentThread().getContextClassLoader().getResourceAsStream(Sandesha2Constants.PROPERTY_FILE);
 			
 			Properties properties = new Properties ();
 			if (in!=null) {
@@ -89,7 +89,7 @@
 	 */
 	private void loadExponentialBackoff (Properties properties) {
 		
-		String expoBackoffStr = properties.getProperty(Constants.Properties.ExponentialBackoff);
+		String expoBackoffStr = properties.getProperty(Sandesha2Constants.Properties.ExponentialBackoff);
 		boolean loaded = false;
 		
 		if (expoBackoffStr!=null) {
@@ -104,7 +104,7 @@
 		}
 		
 		if (!loaded)
-			propertyBean.setExponentialBackoff(Constants.Properties.DefaultValues.ExponentialBackoff);
+			propertyBean.setExponentialBackoff(Sandesha2Constants.Properties.DefaultValues.ExponentialBackoff);
 	}
 	
 	
@@ -115,7 +115,7 @@
 	 */
 	private void loadRetransmissionInterval (Properties properties) {
 		
-		String retransmissionIntStr = properties.getProperty(Constants.Properties.RetransmissionInterval);
+		String retransmissionIntStr = properties.getProperty(Sandesha2Constants.Properties.RetransmissionInterval);
 		boolean loaded = false;
 		
 		if (retransmissionIntStr!=null) {
@@ -133,7 +133,7 @@
 		}
 		
 		if (!loaded)
-			propertyBean.setRetransmissionInterval(Constants.Properties.DefaultValues.RetransmissionInterval);
+			propertyBean.setRetransmissionInterval(Sandesha2Constants.Properties.DefaultValues.RetransmissionInterval);
 	}
 	
 	/**
@@ -143,7 +143,7 @@
 	 */
 	private void loadAcknowledgementInterval (Properties properties) {
 		
-		String acknowledgementIntStr = properties.getProperty(Constants.Properties.AcknowledgementInterval);
+		String acknowledgementIntStr = properties.getProperty(Sandesha2Constants.Properties.AcknowledgementInterval);
 		boolean loaded = false;
 		
 		if (acknowledgementIntStr!=null) {
@@ -161,7 +161,7 @@
 		}
 		
 		if (!loaded)
-			propertyBean.setAcknowledgementInterval(Constants.Properties.DefaultValues.AcknowledgementInterval);
+			propertyBean.setAcknowledgementInterval(Sandesha2Constants.Properties.DefaultValues.AcknowledgementInterval);
 	}
 	
 	/**
@@ -171,8 +171,8 @@
 	 */
 	private void loadInactivityTimeout (Properties properties) {
 		
-		String inactivityTimeoutStr = properties.getProperty(Constants.Properties.InactivityTimeout);
-		String inactivityTimeoutMeasure = properties.getProperty(Constants.Properties.InactivityTimeoutMeasure);
+		String inactivityTimeoutStr = properties.getProperty(Sandesha2Constants.Properties.InactivityTimeout);
+		String inactivityTimeoutMeasure = properties.getProperty(Sandesha2Constants.Properties.InactivityTimeoutMeasure);
 		
 		
 		boolean loaded = false;
@@ -194,7 +194,7 @@
 		}
 		
 		if (!loaded)
-			propertyBean.setInactiveTimeoutInterval(Constants.Properties.DefaultValues.InactivityTimeout,Constants.Properties.DefaultValues.InactivityTimeoutMeasure);
+			propertyBean.setInactiveTimeoutInterval(Sandesha2Constants.Properties.DefaultValues.InactivityTimeout,Sandesha2Constants.Properties.DefaultValues.InactivityTimeoutMeasure);
 	}
 	
 	/**
@@ -203,7 +203,7 @@
 	 * @param properties
 	 */
 	private void loadStoragemanagerClass (Properties properties) {
-		String storageMgrClassStr = properties.getProperty(Constants.Properties.StorageManager);
+		String storageMgrClassStr = properties.getProperty(Sandesha2Constants.Properties.StorageManager);
 		boolean loaded = false;
 		
 		if (storageMgrClassStr!=null) {
@@ -213,11 +213,11 @@
 		}
 		
 		if (!loaded)
-			propertyBean.setStorageManagerClass(Constants.Properties.DefaultValues.StorageManager);
+			propertyBean.setStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.StorageManager);
 	}
 	
 	private void loadInOrderInvocation (Properties properties) {
-		String inOrderInvocation = properties.getProperty(Constants.Properties.InOrderInvocation);
+		String inOrderInvocation = properties.getProperty(Sandesha2Constants.Properties.InOrderInvocation);
 		boolean loaded = false;
 		
 		if (inOrderInvocation!=null) {
@@ -232,7 +232,7 @@
 		}
 		
 		if (!loaded)
-			propertyBean.setInOrder(Constants.Properties.DefaultValues.InvokeInOrder);
+			propertyBean.setInOrder(Sandesha2Constants.Properties.DefaultValues.InvokeInOrder);
 		
 	}
 	

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java Tue Nov 29 22:03:23 2005
@@ -33,9 +33,10 @@
 import org.apache.axis2.description.AxisOperationFactory;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.Sandesha2Constants.ClientAPI;
 import org.apache.sandesha2.policy.RMPolicyBean;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
@@ -62,8 +63,8 @@
 
 	private static void setUpMessage(MessageContext rmMsgCtx) {
 		//Seting RMPolicyBean
-		if (rmMsgCtx.getProperty(Constants.WSP.RM_POLICY_BEAN)==null)
-			rmMsgCtx.setProperty(Constants.WSP.RM_POLICY_BEAN, PropertyManager.getInstance().getRMPolicyBean());
+		if (rmMsgCtx.getProperty(Sandesha2Constants.WSP.RM_POLICY_BEAN)==null)
+			rmMsgCtx.setProperty(Sandesha2Constants.WSP.RM_POLICY_BEAN, PropertyManager.getInstance().getRMPolicyBean());
 	}
 
 	/**
@@ -146,7 +147,7 @@
 				.getServiceContext();
 		if (serviceContext != null) {
 			String offeredSequence = (String) serviceContext
-					.getProperty(Constants.OFFERED_SEQUENCE_ID);
+					.getProperty(ClientAPI.OFFERED_SEQUENCE_ID);
 			if (offeredSequence != null && !"".equals(offeredSequence)) {
 				SequenceOffer offerPart = new SequenceOffer(factory);
 				Identifier identifier = new Identifier(factory);
@@ -157,9 +158,9 @@
 		}
 
 		SequencePropertyBean replyToBean = seqPropMgr.retrieve(internalSequenceId,
-				Constants.SequenceProperties.REPLY_TO_EPR);
+				Sandesha2Constants.SequenceProperties.REPLY_TO_EPR);
 		SequencePropertyBean toBean = seqPropMgr.retrieve(internalSequenceId,
-				Constants.SequenceProperties.TO_EPR);
+				Sandesha2Constants.SequenceProperties.TO_EPR);
 
 		if (toBean == null || toBean.getValue() == null)
 			throw new SandeshaException("To EPR is not set.");
@@ -169,7 +170,7 @@
 		EndpointReference acksToEPR = null;
 
 		if (acksTo == null || "".equals(acksTo))
-			acksTo = Constants.WSA.NS_URI_ANONYMOUS;
+			acksTo = Sandesha2Constants.WSA.NS_URI_ANONYMOUS;
 
 		acksToEPR = new EndpointReference(acksTo);
 
@@ -185,7 +186,7 @@
 		createSequencePart.setAcksTo(new AcksTo(
 				new Address(acksToEPR, factory), factory));
 
-		createSeqRMMsg.setMessagePart(Constants.MessageParts.CREATE_SEQ,
+		createSeqRMMsg.setMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ,
 				createSequencePart);
 
 		try {
@@ -194,9 +195,9 @@
 			throw new SandeshaException(e1.getMessage());
 		}
 
-		createSeqRMMsg.setAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE);
+		createSeqRMMsg.setAction(Sandesha2Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE);
 		createSeqRMMsg
-				.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE);
+				.setSOAPAction(Sandesha2Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE);
 
 		return createSeqRMMsg;
 	}
@@ -266,7 +267,7 @@
 		Identifier identifier = new Identifier(factory);
 		identifier.setIndentifer(sequenceId);
 		terminateSequencePart.setIdentifier(identifier);
-		terminateRMMessage.setMessagePart(Constants.MessageParts.TERMINATE_SEQ,
+		terminateRMMessage.setMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ,
 				terminateSequencePart);
 
 		return terminateRMMessage;
@@ -289,7 +290,7 @@
 				.getSOAPVersion(createSeqMessage.getSOAPEnvelope()));
 
 		IOMRMElement messagePart = createSeqMessage
-				.getMessagePart(Constants.MessageParts.CREATE_SEQ);
+				.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
 		CreateSequence cs = (CreateSequence) messagePart;
 
 		CreateSequenceResponse response = new CreateSequenceResponse(factory);
@@ -320,9 +321,9 @@
 		SOAPEnvelope envelope = factory.getDefaultEnvelope();
 		response.toOMElement(envelope.getBody());
 		outMessage
-				.setWSAAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE_RESPONSE);
+				.setWSAAction(Sandesha2Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE_RESPONSE);
 		outMessage
-				.setSoapAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE);
+				.setSoapAction(Sandesha2Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE);
 
 		String newMessageId = SandeshaUtil.getUUID();
 		outMessage.setMessageID(newMessageId);
@@ -375,7 +376,7 @@
 				.getSequencePropretyBeanMgr();
 
 		SequencePropertyBean seqBean = seqPropMgr.retrieve(sequenceId,
-				Constants.SequenceProperties.RECEIVED_MESSAGES);
+				Sandesha2Constants.SequenceProperties.RECEIVED_MESSAGES);
 		String msgNoList = (String) seqBean.getValue();
 
 		ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(msgNoList,factory);
@@ -387,9 +388,9 @@
 
 		sequenceAck.toOMElement(envelope.getHeader());
 		applicationMsg
-				.setAction(Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT);
+				.setAction(Sandesha2Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT);
 		applicationMsg
-				.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT);
+				.setSOAPAction(Sandesha2Constants.WSRM.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT);
 		applicationMsg.setMessageId(SandeshaUtil.getUUID());
 
 	}
@@ -419,7 +420,7 @@
 			setUpMessage(ackMsgCtx);
 
 			Sequence reqSequence = (Sequence) applicationRMMsgCtx
-					.getMessagePart(Constants.MessageParts.SEQUENCE);
+					.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
 			if (reqSequence == null)
 				throw new SandeshaException(
 						"Sequence part of application message is null");

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java Tue Nov 29 22:03:23 2005
@@ -19,7 +19,7 @@
 
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -29,7 +29,7 @@
 
 	public static SOAPFactory getSOAPFactory(int SOAPVersion) {
 
-		if (SOAPVersion == Constants.SOAPVersion.v1_1)
+		if (SOAPVersion == Sandesha2Constants.SOAPVersion.v1_1)
 			return OMAbstractFactory.getSOAP11Factory();
 		else
 			return OMAbstractFactory.getSOAP12Factory();

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java?rev=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java Tue Nov 29 22:03:23 2005
@@ -20,7 +20,7 @@
 import org.apache.sandesha2.policy.RMPolicyBean;
 
 /**
- * Used to hold peoperties loaded from sandesha2.properties file or Constants.
+ * Used to hold peoperties loaded from sandesha2.properties file or Sandesha2Constants.
  * 
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
  */

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Tue Nov 29 22:03:23 2005
@@ -53,7 +53,7 @@
 import org.apache.axis2.transport.http.HTTPTransportUtils;
 import org.apache.axis2.util.UUIDGenerator;
 import org.apache.axis2.util.Utils;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.storage.StorageManager;
@@ -311,17 +311,17 @@
 
 	public static String getMessageTypeString(int messageType) {
 		switch (messageType) {
-		case Constants.MessageTypes.CREATE_SEQ:
+		case Sandesha2Constants.MessageTypes.CREATE_SEQ:
 			return "CreateSequence";
-		case Constants.MessageTypes.CREATE_SEQ_RESPONSE:
+		case Sandesha2Constants.MessageTypes.CREATE_SEQ_RESPONSE:
 			return "CreateSequenceResponse";
-		case Constants.MessageTypes.ACK:
+		case Sandesha2Constants.MessageTypes.ACK:
 			return "Acknowledgement";
-		case Constants.MessageTypes.APPLICATION:
+		case Sandesha2Constants.MessageTypes.APPLICATION:
 			return "Application";
-		case Constants.MessageTypes.TERMINATE_SEQ:
+		case Sandesha2Constants.MessageTypes.TERMINATE_SEQ:
 			return "TerminateSequence";
-		case Constants.MessageTypes.UNKNOWN:
+		case Sandesha2Constants.MessageTypes.UNKNOWN:
 			return "Unknown";
 		default:
 			return "Error";
@@ -329,8 +329,8 @@
 	}
 
 	public static boolean isGloballyProcessableMessageType(int type) {
-		if (type == Constants.MessageTypes.ACK
-				|| type == Constants.MessageTypes.TERMINATE_SEQ) {
+		if (type == Sandesha2Constants.MessageTypes.ACK
+				|| type == Sandesha2Constants.MessageTypes.TERMINATE_SEQ) {
 			return true;
 		}
 
@@ -338,10 +338,10 @@
 	}
 
 	public static boolean isDuplicateDropRequiredMsgType(int rmMessageType) {
-		if (rmMessageType == Constants.MessageTypes.APPLICATION)
+		if (rmMessageType == Sandesha2Constants.MessageTypes.APPLICATION)
 			return true;
 
-		if (rmMessageType == Constants.MessageTypes.CREATE_SEQ_RESPONSE)
+		if (rmMessageType == Sandesha2Constants.MessageTypes.CREATE_SEQ_RESPONSE)
 			return true;
 
 		return false;
@@ -412,10 +412,10 @@
 			throws SandeshaException {
 		String namespaceName = envelope.getNamespace().getName();
 		if (namespaceName.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI))
-			return Constants.SOAPVersion.v1_1;
+			return Sandesha2Constants.SOAPVersion.v1_1;
 		else if (namespaceName
 				.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI))
-			return Constants.SOAPVersion.v1_2;
+			return Sandesha2Constants.SOAPVersion.v1_2;
 		else
 			throw new SandeshaException("Unknown SOAP version");
 	}
@@ -432,16 +432,16 @@
 		OMElement sequenceElem = null;
 		if (header != null)
 			sequenceElem = header.getFirstChildWithName(new QName(
-					Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE));
+					Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE));
 
 		if (sequenceElem != null)
 			rmGlobalMsg = true;
 
-		if (Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT
+		if (Sandesha2Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT
 				.equals(action))
 			rmGlobalMsg = true;
 
-		if (Constants.WSRM.Actions.ACTION_TERMINATE_SEQUENCE.equals(action))
+		if (Sandesha2Constants.WSRM.Actions.ACTION_TERMINATE_SEQUENCE.equals(action))
 			rmGlobalMsg = true;
 
 		return rmGlobalMsg;
@@ -529,9 +529,9 @@
 			newMessageContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
 					referenceMessage
 							.getProperty(HTTPConstants.HTTPOutTransportInfo));
-			newMessageContext.setProperty(Constants.WSP.RM_POLICY_BEAN,
+			newMessageContext.setProperty(Sandesha2Constants.WSP.RM_POLICY_BEAN,
 					referenceMessage
-					.getProperty(Constants.WSP.RM_POLICY_BEAN));
+					.getProperty(Sandesha2Constants.WSP.RM_POLICY_BEAN));
 
 			return newMessageContext;
 

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java Tue Nov 29 22:03:23 2005
@@ -10,7 +10,7 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.AbstractContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.storage.StorageManager;
@@ -43,7 +43,7 @@
 			throw new AxisFault("ReplyTo is null");
 
 		CreateSequence createSequence = (CreateSequence) createSequenceMsg
-				.getMessagePart(Constants.MessageParts.CREATE_SEQ);
+				.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
 		if (createSequence == null)
 			throw new AxisFault("Create Sequence Part is null");
 
@@ -67,13 +67,13 @@
 				.getSequencePropretyBeanMgr();
 
 		SequencePropertyBean receivedMsgBean = new SequencePropertyBean(
-				sequenceId, Constants.SequenceProperties.RECEIVED_MESSAGES, "");
+				sequenceId, Sandesha2Constants.SequenceProperties.RECEIVED_MESSAGES, "");
 		SequencePropertyBean toBean = new SequencePropertyBean(sequenceId,
-				Constants.SequenceProperties.TO_EPR, replyTo);
+				Sandesha2Constants.SequenceProperties.TO_EPR, replyTo);
 		SequencePropertyBean replyToBean = new SequencePropertyBean(sequenceId,
-				Constants.SequenceProperties.REPLY_TO_EPR, to);
+				Sandesha2Constants.SequenceProperties.REPLY_TO_EPR, to);
 		SequencePropertyBean acksToBean = new SequencePropertyBean(sequenceId,
-				Constants.SequenceProperties.ACKS_TO_EPR, acksTo);
+				Sandesha2Constants.SequenceProperties.ACKS_TO_EPR, acksTo);
 
 		seqPropMgr.insert(receivedMsgBean);
 		seqPropMgr.insert(toBean);
@@ -108,21 +108,21 @@
 		EndpointReference toEPR = firstAplicationMsgCtx.getTo();
 		EndpointReference replyToEPR = firstAplicationMsgCtx.getReplyTo();
 		String acksTo = (String) firstAplicationMsgCtx
-				.getProperty(Constants.ClientProperties.AcksTo);
+				.getProperty(Sandesha2Constants.ClientAPI.AcksTo);
 
 		if (toEPR == null)
 			throw new SandeshaException("WS-Addressing To is null");
 
 		SequencePropertyBean toBean = new SequencePropertyBean(iternalSequenceId,
-				Constants.SequenceProperties.TO_EPR, toEPR);
+				Sandesha2Constants.SequenceProperties.TO_EPR, toEPR);
 
 		//Default value for acksTo is anonymous
 		if (acksTo == null)
-			acksTo = Constants.WSA.NS_URI_ANONYMOUS;
+			acksTo = Sandesha2Constants.WSA.NS_URI_ANONYMOUS;
 
 		EndpointReference acksToEPR = new EndpointReference(acksTo);
 		SequencePropertyBean acksToBean = new SequencePropertyBean(
-				iternalSequenceId, Constants.SequenceProperties.ACKS_TO_EPR,
+				iternalSequenceId, Sandesha2Constants.SequenceProperties.ACKS_TO_EPR,
 				acksToEPR);
 		seqPropMgr.insert(toBean);
 		seqPropMgr.insert(acksToBean);

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java Tue Nov 29 22:03:23 2005
@@ -24,10 +24,11 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.TerminateManager;
+import org.apache.sandesha2.Sandesha2Constants.ClientAPI;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
@@ -97,8 +98,8 @@
 				//Getting the incomingSequenceIdList
 				SequencePropertyBean sequencePropertyBean = (SequencePropertyBean) sequencePropMgr
 						.retrieve(
-								Constants.SequenceProperties.ALL_SEQUENCES,
-								Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
+								Sandesha2Constants.SequenceProperties.ALL_SEQUENCES,
+								Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
 				if (sequencePropertyBean == null)
 					continue;
 
@@ -136,7 +137,7 @@
 						RMMsgContext rmMsg = MsgInitializer
 								.initializeMessage(msgToInvoke);
 						Sequence seq = (Sequence) rmMsg
-								.getMessagePart(Constants.MessageParts.SEQUENCE);
+								.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
 						long msgNo = seq.getMessageNumber().getMessageNumber();
 
 						try {
@@ -149,7 +150,7 @@
 							Object debug = null;
 							if (serviceContext != null) {
 								debug = serviceContext
-										.getProperty(Constants.SANDESHA_DEBUG_MODE);
+										.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
 								if (debug != null && "on".equals(debug)) {
 									System.out
 											.println("DEBUG: Invoker invoking a '"
@@ -175,9 +176,9 @@
 												sequenceId)).iterator();
 
 						//terminate (AfterInvocation)
-						if (rmMsg.getMessageType() == Constants.MessageTypes.APPLICATION) {
+						if (rmMsg.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
 							Sequence sequence = (Sequence) rmMsg
-									.getMessagePart(Constants.MessageParts.SEQUENCE);
+									.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
 							if (sequence.getLastMessage() != null) {
 								TerminateManager.terminateAfterInvocation(
 										context, sequenceId);

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Tue Nov 29 22:03:23 2005
@@ -25,10 +25,11 @@
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.sandesha2.AcknowledgementManager;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.TerminateManager;
+import org.apache.sandesha2.Sandesha2Constants.ClientAPI;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
 import org.apache.sandesha2.storage.beans.SenderBean;
@@ -92,7 +93,7 @@
 						Object debug = null;
 						if (serviceContext != null) {
 							debug = serviceContext
-									.getProperty(Constants.SANDESHA_DEBUG_MODE);
+									.getProperty(ClientAPI.SANDESHA_DEBUG_MODE);
 							if (debug != null && "on".equals(debug)) {
 								System.out
 										.println("DEBUG: Sender is sending a '"
@@ -103,7 +104,7 @@
 							}
 						}
 
-						if (rmMsgCtx.getMessageType() == Constants.MessageTypes.APPLICATION) {
+						if (rmMsgCtx.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
 							//piggybacking if an ack if available for the same
 							// sequence.
 							AcknowledgementManager
@@ -128,9 +129,9 @@
 							checkForSyncResponses(msgCtx);
 						
 						
-						if (rmMsgCtx.getMessageType()==Constants.MessageTypes.TERMINATE_SEQ) {
+						if (rmMsgCtx.getMessageType()==Sandesha2Constants.MessageTypes.TERMINATE_SEQ) {
 							//terminate sending side.
-							TerminateSequence terminateSequence = (TerminateSequence) rmMsgCtx.getMessagePart(Constants.MessageParts.TERMINATE_SEQ);
+							TerminateSequence terminateSequence = (TerminateSequence) rmMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ);
 							String sequenceID = terminateSequence.getIdentifier().getIdentifier();
 							ConfigurationContext configContext = msgCtx.getSystemContext();
 							
@@ -176,10 +177,10 @@
 	private boolean isResponseExpected(RMMsgContext rmMsgCtx) {
 		boolean responseExpected = false;
 
-		if (rmMsgCtx.getMessageType() == Constants.MessageTypes.CREATE_SEQ) {
+		if (rmMsgCtx.getMessageType() == Sandesha2Constants.MessageTypes.CREATE_SEQ) {
 			responseExpected = true;
 		}
-		if (rmMsgCtx.getMessageType() == Constants.MessageTypes.APPLICATION) {
+		if (rmMsgCtx.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
 			//a ack may arrive. (not a application response)
 			if (rmMsgCtx.getMessageContext().getAxisOperation()
 					.getMessageExchangePattern().equals(

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java Tue Nov 29 22:03:23 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -42,9 +42,9 @@
 	public Accept(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		acceptElement = factory.createOMElement(
-				Constants.WSRM.ACCEPT, rmNamespace);
+				Sandesha2Constants.WSRM.ACCEPT, rmNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -54,7 +54,7 @@
 	public Object fromOMElement(OMElement element) throws OMException {
 
 		OMElement acceptPart = element.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.ACCEPT));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.ACCEPT));
 		if (acceptPart == null)
 			throw new OMException(
 					"Passed element does not contain an Accept part");
@@ -63,7 +63,7 @@
 		acksTo.fromOMElement(acceptPart);
 
 		acceptElement = factory.createOMElement(
-				Constants.WSRM.ACCEPT, rmNamespace);
+				Sandesha2Constants.WSRM.ACCEPT, rmNamespace);
 
 		return this;
 	}
@@ -82,7 +82,7 @@
 		element.addChild(acceptElement);
 
 		acceptElement = factory.createOMElement(
-				Constants.WSRM.ACCEPT, rmNamespace);
+				Sandesha2Constants.WSRM.ACCEPT, rmNamespace);
 
 		return element;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java Tue Nov 29 22:03:23 2005
@@ -25,7 +25,7 @@
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.soap.SOAPHeader;
 import org.apache.axis2.soap.SOAPHeaderBlock;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * Represent the AckRequested header block.
@@ -49,9 +49,9 @@
 	public AckRequested(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		ackRequestedElement = factory.createOMElement(
-				Constants.WSRM.ACK_REQUESTED, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_REQUESTED, rmNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -65,7 +65,7 @@
 					"Cant add the Ack Requested part to a non-header element");
 
 		OMElement ackReqPart = header.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.ACK_REQUESTED));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.ACK_REQUESTED));
 
 		if (ackReqPart == null)
 			throw new OMException(
@@ -75,7 +75,7 @@
 		identifier.fromOMElement(ackReqPart);
 
 		OMElement msgNoPart = ackReqPart.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.MSG_NUMBER));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.MSG_NUMBER));
 
 		if (msgNoPart != null) {
 			messageNumber = new MessageNumber(factory);
@@ -83,7 +83,7 @@
 		}
 
 		ackRequestedElement = factory.createOMElement(
-				Constants.WSRM.ACK_REQUESTED, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_REQUESTED, rmNamespace);
 
 		return this;
 	}
@@ -100,7 +100,7 @@
 
 		SOAPHeader SOAPHdr = (SOAPHeader) header;
 		SOAPHeaderBlock ackReqHdrBlock = SOAPHdr.addHeaderBlock(
-				Constants.WSRM.ACK_REQUESTED, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_REQUESTED, rmNamespace);
 		ackReqHdrBlock.setMustUnderstand(true);
 
 		identifier.toOMElement(ackReqHdrBlock);
@@ -110,7 +110,7 @@
 		}
 
 		ackRequestedElement = factory.createOMElement(
-				Constants.WSRM.ACK_REQUESTED, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_REQUESTED, rmNamespace);
 
 		return header;
 	}
@@ -135,8 +135,8 @@
 		SOAPHeader header = envelope.getHeader();
 		
 		//detach if already exist.
-		OMElement elem = header.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-				Constants.WSRM.ACK_REQUESTED));
+		OMElement elem = header.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+				Sandesha2Constants.WSRM.ACK_REQUESTED));
 		if (elem!=null)
 			elem.detach();
 		

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Tue Nov 29 22:03:23 2005
@@ -23,7 +23,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -45,9 +45,9 @@
 	public AcknowledgementRange(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		acknowledgementRangeElement = factory.createOMElement(
-				Constants.WSRM.ACK_RANGE, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_RANGE, rmNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -60,9 +60,9 @@
 			throw new OMException("The passed element is null");
 
 		OMAttribute lowerAttrib = ackRangePart.getAttribute(new QName(
-				Constants.WSRM.LOWER));
+				Sandesha2Constants.WSRM.LOWER));
 		OMAttribute upperAttrib = ackRangePart.getAttribute(new QName(
-				Constants.WSRM.UPPER));
+				Sandesha2Constants.WSRM.UPPER));
 
 		if (lowerAttrib == null || upperAttrib == null)
 			throw new OMException(
@@ -79,7 +79,7 @@
 		}
 
 		acknowledgementRangeElement = factory.createOMElement(
-				Constants.WSRM.ACK_RANGE, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_RANGE, rmNamespace);
 
 		return this;
 	}
@@ -96,9 +96,9 @@
 					"Cant set Ack Range part since Upper or Lower is not set to the correct value");
 
 		OMAttribute lowerAttrib = factory.createOMAttribute(
-				Constants.WSRM.LOWER, null, Long.toString(lowerValue));
+				Sandesha2Constants.WSRM.LOWER, null, Long.toString(lowerValue));
 		OMAttribute upperAttrib = factory.createOMAttribute(
-				Constants.WSRM.UPPER, null, Long.toString(upperValue));
+				Sandesha2Constants.WSRM.UPPER, null, Long.toString(upperValue));
 
 		acknowledgementRangeElement.addAttribute(lowerAttrib);
 		acknowledgementRangeElement.addAttribute(upperAttrib);
@@ -106,7 +106,7 @@
 		sequenceAckElement.addChild(acknowledgementRangeElement);
 
 		acknowledgementRangeElement = factory.createOMElement(
-				Constants.WSRM.ACK_RANGE, rmNamespace);
+				Sandesha2Constants.WSRM.ACK_RANGE, rmNamespace);
 
 		return sequenceAckElement;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Tue Nov 29 22:03:23 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -45,9 +45,9 @@
 	public AcksTo(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		acksToElement = factory.createOMElement(
-				Constants.WSRM.ACKS_TO, rmNamespace);
+				Sandesha2Constants.WSRM.ACKS_TO, rmNamespace);
 	}
 	
 	public AcksTo (Address address,SOAPFactory factory) {
@@ -61,7 +61,7 @@
 
 	public Object fromOMElement(OMElement element) throws OMException {
 		OMElement acksToPart = element.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.ACKS_TO));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.ACKS_TO));
 
 		if (acksToPart == null)
 			throw new OMException(
@@ -71,7 +71,7 @@
 		address.fromOMElement(acksToPart);
 
 		acksToElement = factory.createOMElement(
-				Constants.WSRM.ACKS_TO, rmNamespace);
+				Sandesha2Constants.WSRM.ACKS_TO, rmNamespace);
 
 		return this;
 	}
@@ -84,13 +84,13 @@
 			throw new OMException("Cant set AcksTo. Address is null");
 
 		OMElement acksToPart = element.getFirstChildWithName(new QName(
-				Constants.WSA.NS_URI_ADDRESSING, Constants.WSRM.ACKS_TO));
+				Sandesha2Constants.WSA.NS_URI_ADDRESSING, Sandesha2Constants.WSRM.ACKS_TO));
 
 		address.toOMElement(acksToElement);
 		element.addChild(acksToElement);
 
 		acksToElement =factory.createOMElement(
-				Constants.WSRM.ACKS_TO, rmNamespace);
+				Sandesha2Constants.WSRM.ACKS_TO, rmNamespace);
 
 		return element;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java Tue Nov 29 22:03:23 2005
@@ -13,7 +13,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -33,10 +33,10 @@
 
 	public Address(SOAPFactory factory) {
 		this.factory = factory;
-		rmNamespace = factory.createOMNamespace(Constants.WSA.NS_URI_ADDRESSING,
-				Constants.WSA.NS_PREFIX_ADDRESSING);
+		rmNamespace = factory.createOMNamespace(Sandesha2Constants.WSA.NS_URI_ADDRESSING,
+				Sandesha2Constants.WSA.NS_PREFIX_ADDRESSING);
 		addressElement = factory.createOMElement(
-				Constants.WSA.ADDRESS, rmNamespace);
+				Sandesha2Constants.WSA.ADDRESS, rmNamespace);
 	}
 	
 	public Address (EndpointReference epr,SOAPFactory factory) {
@@ -47,7 +47,7 @@
 	public Object fromOMElement(OMElement element) throws OMException {
 
 		OMElement addressPart = element.getFirstChildWithName(new QName(
-				Constants.WSA.NS_URI_ADDRESSING, Constants.WSA.ADDRESS));
+				Sandesha2Constants.WSA.NS_URI_ADDRESSING, Sandesha2Constants.WSA.ADDRESS));
 		if (addressPart == null)
 			throw new OMException(
 					"Cant find an Address element in the given part");
@@ -59,7 +59,7 @@
 		addressElement = addressPart;
 		epr = new EndpointReference(addressText);
 		addressElement = factory.createOMElement(
-				Constants.WSA.ADDRESS, rmNamespace);
+				Sandesha2Constants.WSA.ADDRESS, rmNamespace);
 		return this;
 
 	}
@@ -81,7 +81,7 @@
 		element.addChild(addressElement);
 
 		addressElement = factory.createOMElement(
-				Constants.WSA.ADDRESS, rmNamespace);
+				Sandesha2Constants.WSA.ADDRESS, rmNamespace);
 
 		return element;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java Tue Nov 29 22:03:23 2005
@@ -24,7 +24,7 @@
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * Represent the CreateSequence body element.
@@ -52,9 +52,9 @@
 	public CreateSequence(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		createSequenceElement = factory.createOMElement(
-				Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
 	}
 	
 	public CreateSequence (AcksTo acksTo,SOAPFactory factory) {
@@ -69,29 +69,29 @@
 	public Object fromOMElement(OMElement bodyElement) throws OMException {
 
 		OMElement createSequencePart = bodyElement
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.CREATE_SEQUENCE));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.CREATE_SEQUENCE));
 		if (createSequencePart == null)
 			throw new OMException(
 					"Create sequence is not present in the passed element");
 
 		createSequenceElement = factory.createOMElement(
-				Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
 
 		acksTo = new AcksTo(factory);
 		acksTo.fromOMElement(createSequencePart);
 
 		OMElement offerPart = createSequencePart
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.SEQUENCE_OFFER));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.SEQUENCE_OFFER));
 		if (offerPart != null) {
 			sequenceOffer = new SequenceOffer(factory);
 			sequenceOffer.fromOMElement(createSequencePart);
 		}
 
 		OMElement expiresPart = createSequenceElement
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.EXPIRES));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.EXPIRES));
 		if (expiresPart != null) {
 			expires = new Expires(factory);
 			expires.fromOMElement(createSequencePart);
@@ -124,7 +124,7 @@
 		soapBody.addChild(createSequenceElement);
 
 		createSequenceElement = factory.createOMElement(
-				Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
 		return soapBody;
 	}
 
@@ -148,8 +148,8 @@
 		SOAPBody body = envelope.getBody();
 		
 		//detach if already exist.
-		OMElement elem = body.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-				Constants.WSRM.CREATE_SEQUENCE));
+		OMElement elem = body.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE));
 		if (elem!=null)
 			elem.detach();
 		

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Tue Nov 29 22:03:23 2005
@@ -24,7 +24,7 @@
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * Adds the CreateSequenceResponse body part.
@@ -50,9 +50,9 @@
 	public CreateSequenceResponse(SOAPFactory factory) {
 		this.factory = factory;
 		createSeqResNoNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		createSequenceResponseElement = factory.createOMElement(
-				Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
 				createSeqResNoNamespace);
 	}
 
@@ -69,30 +69,30 @@
 		SOAPBody SOAPBody = (SOAPBody) bodyElement;
 
 		OMElement createSeqResponsePart = SOAPBody
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
 		if (createSeqResponsePart == null)
 			throw new OMException(
 					"The passed element does not contain a create seqence response part");
 
 		createSequenceResponseElement = factory.createOMElement(
-				Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
 				createSeqResNoNamespace);
 
 		identifier = new Identifier(factory);
 		identifier.fromOMElement(createSeqResponsePart);
 
 		OMElement expiresPart = createSeqResponsePart
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.EXPIRES));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.EXPIRES));
 		if (expiresPart != null) {
 			expires = new Expires(factory);
 			expires.fromOMElement(createSeqResponsePart);
 		}
 
 		OMElement acceptPart = createSeqResponsePart
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.ACCEPT));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.ACCEPT));
 		if (acceptPart != null) {
 			accept = new Accept(factory);
 			accept.fromOMElement(createSeqResponsePart);
@@ -129,7 +129,7 @@
 		SOAPBody.addChild(createSequenceResponseElement);
 
 		createSequenceResponseElement = factory.createOMElement(
-				Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
 				createSeqResNoNamespace);
 
 		return SOAPBody;
@@ -163,8 +163,8 @@
 		SOAPBody body = envelope.getBody();
 		
 		//detach if already exist.
-		OMElement elem = body.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-				Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
+		OMElement elem = body.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+				Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
 		if (elem!=null)
 			elem.detach();
 		

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java Tue Nov 29 22:03:23 2005
@@ -23,7 +23,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -44,14 +44,14 @@
 	public Expires(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		expiresElement = factory.createOMElement(
-				Constants.WSRM.EXPIRES, rmNamespace);
+				Sandesha2Constants.WSRM.EXPIRES, rmNamespace);
 	}
 
 	public Object fromOMElement(OMElement element) throws OMException {
 		OMElement expiresPart = element.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.EXPIRES));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.EXPIRES));
 		if (expiresPart == null)
 			throw new OMException(
 					"Passed elemenet does not have a Expires part");
@@ -60,7 +60,7 @@
 			throw new OMException("The duration value is not valid");
 
 		expiresElement = factory.createOMElement(
-				Constants.WSRM.EXPIRES, rmNamespace);
+				Sandesha2Constants.WSRM.EXPIRES, rmNamespace);
 
 		duration = expiresText;
 		return element;
@@ -82,7 +82,7 @@
 		element.addChild(expiresElement);
 
 		expiresElement = factory.createOMElement(
-				Constants.WSRM.EXPIRES, rmNamespace);
+				Sandesha2Constants.WSRM.EXPIRES, rmNamespace);
 
 		return element;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java Tue Nov 29 22:03:23 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -43,9 +43,9 @@
 	public FaultCode(SOAPFactory factory) {
 		this.factory = factory;
 		rmNameSpace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		faultCodeElement = factory.createOMElement(
-				Constants.WSRM.FAULT_CODE, rmNameSpace);
+				Sandesha2Constants.WSRM.FAULT_CODE, rmNameSpace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -59,8 +59,8 @@
 					"Can't add Fault Code part since the passed element is null");
 
 		OMElement faultCodePart = sequenceFault
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_PREFIX_RM,
-						Constants.WSRM.FAULT_CODE));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_PREFIX_RM,
+						Sandesha2Constants.WSRM.FAULT_CODE));
 
 		if (faultCodePart == null)
 			throw new OMException(
@@ -69,7 +69,7 @@
 		this.faultCode = faultCodePart.getText();
 
 		faultCodeElement = factory.createOMElement(
-				Constants.WSRM.FAULT_CODE, rmNameSpace);
+				Sandesha2Constants.WSRM.FAULT_CODE, rmNameSpace);
 
 		return sequenceFault;
 

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java Tue Nov 29 22:03:23 2005
@@ -28,9 +28,9 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
-public class Identifier implements Constants, IOMRMElement {
+public class Identifier implements Sandesha2Constants, IOMRMElement {
 
 	private OMElement identifierElement;
 
@@ -43,9 +43,9 @@
 	public Identifier(SOAPFactory factory) {
 		this.factory = factory;
 		wsrmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		identifierElement = factory.createOMElement(
-				Constants.WSRM.IDENTIFIER, wsrmNamespace);
+				Sandesha2Constants.WSRM.IDENTIFIER, wsrmNamespace);
 	}
 
 	public void setIndentifer(String identifier) {
@@ -64,12 +64,12 @@
 	public Object fromOMElement(OMElement element) throws OMException {
 		
 		OMElement identifierPart = element.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.IDENTIFIER));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.IDENTIFIER));
 		if (identifierPart == null)
 			throw new OMException(
 					"The parsed element does not contain an identifier part");
 		identifierElement = factory.createOMElement(
-				Constants.WSRM.IDENTIFIER, wsrmNamespace);
+				Sandesha2Constants.WSRM.IDENTIFIER, wsrmNamespace);
 
 		String identifierText = identifierPart.getText();
 		if (identifierText == null || identifierText == "")
@@ -89,7 +89,7 @@
 		element.addChild(identifierElement);
 
 		identifierElement = factory.createOMElement(
-				Constants.WSRM.IDENTIFIER, wsrmNamespace);
+				Sandesha2Constants.WSRM.IDENTIFIER, wsrmNamespace);
 
 		return element;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java Tue Nov 29 22:03:23 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -41,9 +41,9 @@
 	public LastMessage(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		lastMessageElement = factory.createOMElement(
-				Constants.WSRM.LAST_MSG, rmNamespace);
+				Sandesha2Constants.WSRM.LAST_MSG, rmNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -52,13 +52,13 @@
 
 	public Object fromOMElement(OMElement element) throws OMException {
 		OMElement lastMessagePart = element.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.LAST_MSG));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.LAST_MSG));
 		if (lastMessagePart == null)
 			throw new OMException(
 					"The passed element does not contain a Last Message part");
 
 		lastMessageElement = factory.createOMElement(
-				Constants.WSRM.LAST_MSG, rmNamespace);
+				Sandesha2Constants.WSRM.LAST_MSG, rmNamespace);
 
 		return this;
 	}
@@ -71,7 +71,7 @@
 		sequenceElement.addChild(lastMessageElement);
 
 		lastMessageElement = factory.createOMElement(
-				Constants.WSRM.LAST_MSG, rmNamespace);
+				Sandesha2Constants.WSRM.LAST_MSG, rmNamespace);
 
 		return sequenceElement;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java Tue Nov 29 22:03:23 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -41,8 +41,8 @@
 	
 	public MessageNumber(SOAPFactory factory){
 		this.factory = factory;
-	    rmNamespace = factory.createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-		messageNoElement = factory.createOMElement(Constants.WSRM.MSG_NUMBER,rmNamespace);
+	    rmNamespace = factory.createOMNamespace(Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
+		messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM.MSG_NUMBER,rmNamespace);
 	}
 	
 	public long getMessageNumber(){
@@ -54,11 +54,11 @@
 	
 	public Object fromOMElement(OMElement seqenceElement) throws OMException {
 		OMElement msgNumberPart = seqenceElement.getFirstChildWithName( 
-				new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.MSG_NUMBER));
+				new QName (Sandesha2Constants.WSRM.NS_URI_RM,Sandesha2Constants.WSRM.MSG_NUMBER));
 		if (msgNumberPart==null)
 			throw new OMException ("The passed sequnce element does not contain a message number part");
 		
-		messageNoElement = factory.createOMElement(Constants.WSRM.MSG_NUMBER,rmNamespace);
+		messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM.MSG_NUMBER,rmNamespace);
 
 		String msgNoStr = msgNumberPart.getText();
 		messageNumber = Long.parseLong(msgNoStr);
@@ -73,7 +73,7 @@
 		messageNoElement.setText(Long.toString(messageNumber));
 		element.addChild(messageNoElement);
 		
-		messageNoElement = factory.createOMElement(Constants.WSRM.MSG_NUMBER,rmNamespace);
+		messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM.MSG_NUMBER,rmNamespace);
 		
 		return element;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java Tue Nov 29 22:03:23 2005
@@ -20,7 +20,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -39,9 +39,9 @@
 		
 	public Nack(SOAPFactory factory){
 		this.factory = factory;
-		rmNamespace = factory.createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+		rmNamespace = factory.createOMNamespace(Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		nackElement = factory.createOMElement(
-				Constants.WSRM.NACK,rmNamespace);
+				Sandesha2Constants.WSRM.NACK,rmNamespace);
 	}
 	
 	public OMElement getOMElement() throws OMException {
@@ -51,7 +51,7 @@
 
 	public Object fromOMElement(OMElement nackElement) throws OMException{
 		/*OMElement nackPart = sequenceAckElement.getFirstChildWithName(
-				new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.NACK));*/
+				new QName (Sandesha2Constants.WSRM.NS_URI_RM,Sandesha2Constants.WSRM.NACK));*/
 		
 		if (nackElement==null)
 			throw new OMException ("Passed seq ack element does not contain a nack part");
@@ -63,7 +63,7 @@
 		}
 		
 		nackElement = factory.createOMElement(
-				Constants.WSRM.NACK,rmNamespace);
+				Sandesha2Constants.WSRM.NACK,rmNamespace);
 		
 		return this;
 	} 
@@ -82,7 +82,7 @@
 		sequenceAckElement.addChild(nackElement);
 
 		nackElement = factory.createOMElement(
-				Constants.WSRM.NACK,rmNamespace);
+				Sandesha2Constants.WSRM.NACK,rmNamespace);
 		
 		return sequenceAckElement;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java Tue Nov 29 22:03:23 2005
@@ -23,7 +23,7 @@
 import org.apache.axis2.soap.SOAP11Constants;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.util.SOAPAbstractFactory;
 
 /**
@@ -57,12 +57,12 @@
 		
 		//Ya I know. Could hv done it directly :D (just to make it consistent)
 		if (envelope.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI))
-			factory = SOAPAbstractFactory.getSOAPFactory(Constants.SOAPVersion.v1_1);
+			factory = SOAPAbstractFactory.getSOAPFactory(Sandesha2Constants.SOAPVersion.v1_1);
 		else
-			factory = SOAPAbstractFactory.getSOAPFactory(Constants.SOAPVersion.v1_2);
+			factory = SOAPAbstractFactory.getSOAPFactory(Sandesha2Constants.SOAPVersion.v1_2);
 			
 		OMElement sequenceElement = envelope.getHeader().getFirstChildWithName(
-				new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE));
+				new QName(Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE));
 		if (sequenceElement != null) {
 			sequence = new Sequence(factory);
 			sequence.fromOMElement(envelope.getHeader());
@@ -70,16 +70,16 @@
 
 		OMElement sequenceAckElement = envelope.getHeader()
 				.getFirstChildWithName(
-						new QName(Constants.WSRM.NS_URI_RM,
-								Constants.WSRM.SEQUENCE_ACK));
+						new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+								Sandesha2Constants.WSRM.SEQUENCE_ACK));
 		if (sequenceAckElement != null) {
 			sequenceAcknowledgement = new SequenceAcknowledgement(factory);
 			sequenceAcknowledgement.fromOMElement(envelope.getHeader());
 		}
 
 		OMElement createSeqElement = envelope.getBody().getFirstChildWithName(
-				new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.CREATE_SEQUENCE));
+				new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.CREATE_SEQUENCE));
 		
 		if (createSeqElement != null) {
 			createSequence = new CreateSequence(factory);
@@ -88,8 +88,8 @@
 
 		OMElement createSeqResElement = envelope.getBody()
 				.getFirstChildWithName(
-						new QName(Constants.WSRM.NS_URI_RM,
-								Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
+						new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+								Sandesha2Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
 		if (createSeqResElement != null) {
 			createSequenceResponse = new CreateSequenceResponse(factory);
 			createSequenceResponse.fromOMElement(envelope.getBody());
@@ -97,8 +97,8 @@
 
 		OMElement terminateSeqElement = envelope.getBody()
 				.getFirstChildWithName(
-						new QName(Constants.WSRM.NS_URI_RM,
-								Constants.WSRM.TERMINATE_SEQUENCE));
+						new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+								Sandesha2Constants.WSRM.TERMINATE_SEQUENCE));
 		if (terminateSeqElement != null) {
 			terminateSequence = new TerminateSequence(factory);
 			terminateSequence.fromOMElement(envelope.getBody());
@@ -106,8 +106,8 @@
 
 		OMElement ackRequestedElement = envelope.getHeader()
 				.getFirstChildWithName(
-						new QName(Constants.WSRM.NS_URI_RM,
-								Constants.WSRM.ACK_REQUESTED));
+						new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+								Sandesha2Constants.WSRM.ACK_REQUESTED));
 		if (ackRequestedElement != null) {
 			ackRequested = new AckRequested(factory);
 			ackRequested.fromOMElement(envelope.getHeader());

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java Tue Nov 29 22:03:23 2005
@@ -25,7 +25,7 @@
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.soap.SOAPHeader;
 import org.apache.axis2.soap.SOAPHeaderBlock;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -50,9 +50,9 @@
 	public Sequence(SOAPFactory factory) {
 		this.factory = factory;
 		seqNoNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		sequenceElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE, seqNoNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -67,14 +67,14 @@
 					"Sequence element cannot be added to non-header element");
 
 		OMElement sequencePart = sequenceElement = headerElement
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.SEQUENCE));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.SEQUENCE));
 		if (sequencePart == null)
 			throw new OMException(
 					"Cannot find Sequence element in the given element");
 
 		sequenceElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE, seqNoNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
 
 		identifier = new Identifier(factory);
 		messageNumber = new MessageNumber(factory);
@@ -82,8 +82,8 @@
 		messageNumber.fromOMElement(sequencePart);
 
 		OMElement lastMessageElement = sequencePart
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.LAST_MSG));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.LAST_MSG));
 
 		if (lastMessageElement != null) {
 			lastMessage = new LastMessage(factory);
@@ -115,7 +115,7 @@
 
 
 		SOAPHeaderBlock sequenceHeaderBlock = soapHeader.addHeaderBlock(
-				Constants.WSRM.SEQUENCE, seqNoNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
 		sequenceHeaderBlock.setMustUnderstand(true);
 		identifier.toOMElement(sequenceHeaderBlock);
 		messageNumber.toOMElement(sequenceHeaderBlock);
@@ -126,7 +126,7 @@
 		//resetting the element. So that subsequest toOMElement calls will
 		// attach a different object.
 		this.sequenceElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE, seqNoNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE, seqNoNamespace);
 
 		return headerElement;
 	}
@@ -159,8 +159,8 @@
 		SOAPHeader header = envelope.getHeader();
 		
 		//detach if already exist.
-		OMElement elem = header.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-				Constants.WSRM.SEQUENCE));
+		OMElement elem = header.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+				Sandesha2Constants.WSRM.SEQUENCE));
 		if (elem!=null)
 			elem.detach();
 		

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Tue Nov 29 22:03:23 2005
@@ -28,7 +28,7 @@
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.soap.SOAPHeader;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * Adds the SequenceAcknowledgement header block.
@@ -55,9 +55,9 @@
 	public SequenceAcknowledgement(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		sequenceAcknowledgementElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_ACK, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_ACK, rmNamespace);
 		acknowledgementRangeList = new ArrayList();
 		nackList = new ArrayList();
 	}
@@ -74,7 +74,7 @@
 
 		SOAPHeader header = (SOAPHeader) element;
 		OMElement sequenceAckPart = header.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE_ACK));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE_ACK));
 
 		if (sequenceAckPart == null)
 			throw new OMException(
@@ -84,7 +84,7 @@
 		identifier.fromOMElement(sequenceAckPart);
 
 		Iterator ackRangeParts = sequenceAckPart.getChildrenWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.ACK_RANGE));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.ACK_RANGE));
 
 		while (ackRangeParts.hasNext()) {
 			OMElement ackRangePart = (OMElement) ackRangeParts.next();
@@ -95,7 +95,7 @@
 		}
 
 		Iterator nackParts = sequenceAckPart.getChildrenWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NACK));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NACK));
 
 		while (nackParts.hasNext()) {
 			OMElement nackPart = (OMElement) nackParts.next();
@@ -105,7 +105,7 @@
 		}
 
 		sequenceAcknowledgementElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_ACK, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_ACK, rmNamespace);
 
 		return this;
 	}
@@ -143,7 +143,7 @@
 		SOAPHeader.addChild(sequenceAcknowledgementElement);
 
 		sequenceAcknowledgementElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_ACK, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_ACK, rmNamespace);
 
 		return header;
 	}
@@ -188,7 +188,7 @@
 
 		//detach if already exist.
 		OMElement elem = header.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE_ACK));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE_ACK));
 		if (elem != null)
 			elem.detach();
 

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java Tue Nov 29 22:03:23 2005
@@ -23,7 +23,7 @@
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * Adds the SequenceFault header block.
@@ -45,9 +45,9 @@
 	public SequenceFault(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		sequenceFaultElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -61,15 +61,15 @@
 					"Cant get Sequence Fault part from a non-header element");
 
 		OMElement sequenceFaultPart = body.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE_FAULT));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.SEQUENCE_FAULT));
 
 		if (sequenceFaultPart == null)
 			throw new OMException(
 					"The passed element does not contain a Sequence Fault element");
 
 		OMElement faultCodePart = sequenceFaultPart
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.FAULT_CODE));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.FAULT_CODE));
 
 		if (faultCodePart != null) {
 			faultCode = new FaultCode(factory);
@@ -77,7 +77,7 @@
 		}
 
 		sequenceFaultElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
 
 		return this;
 
@@ -99,7 +99,7 @@
 		body.addChild(sequenceFaultElement);
 
 		sequenceFaultElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
 
 		return body;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java Tue Nov 29 22:03:23 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * @author Chamikara Jayalath <chamikaramj@gmail.com>
@@ -44,9 +44,9 @@
 	public SequenceOffer(SOAPFactory factory) {
 		this.factory = factory;
 		rmNamespace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		sequenceOfferElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -56,21 +56,21 @@
 	public Object fromOMElement(OMElement createSequenceElement)
 			throws OMException {
 		OMElement sequenceOfferPart = createSequenceElement
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.SEQUENCE_OFFER));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.SEQUENCE_OFFER));
 		if (sequenceOfferPart == null)
 			throw new OMException(
 					"The passed element does not contain a SequenceOffer part");
 
 		sequenceOfferElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
 
 		identifier = new Identifier(factory);
 		identifier.fromOMElement(sequenceOfferPart);
 
 		OMElement expiresPart = sequenceOfferPart
-				.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-						Constants.WSRM.EXPIRES));
+				.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+						Sandesha2Constants.WSRM.EXPIRES));
 		if (expiresPart != null) {
 			expires = new Expires(factory);
 			expires.fromOMElement(sequenceOfferElement);
@@ -97,7 +97,7 @@
 		createSequenceElement.addChild(sequenceOfferElement);
 
 		sequenceOfferElement = factory.createOMElement(
-				Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
+				Sandesha2Constants.WSRM.SEQUENCE_OFFER, rmNamespace);
 
 		return createSequenceElement;
 	}

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=349889&r1=349888&r2=349889&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java Tue Nov 29 22:03:23 2005
@@ -24,7 +24,7 @@
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.Sandesha2Constants;
 
 /**
  * Adds the Terminate Sequence body part.
@@ -47,9 +47,9 @@
 	public TerminateSequence(SOAPFactory factory) {
 		this.factory = factory;
 		rmNameSpace = factory.createOMNamespace(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.NS_PREFIX_RM);
 		terminateSequenceElement = factory.createOMElement(
-				Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
+				Sandesha2Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
 	}
 
 	public OMElement getOMElement() throws OMException {
@@ -63,7 +63,7 @@
 					"Cant add terminate sequence to a non body element");
 
 		OMElement terminateSeqPart = body.getFirstChildWithName(new QName(
-				Constants.WSRM.NS_URI_RM, Constants.WSRM.TERMINATE_SEQUENCE));
+				Sandesha2Constants.WSRM.NS_URI_RM, Sandesha2Constants.WSRM.TERMINATE_SEQUENCE));
 
 		if (terminateSeqPart == null)
 			throw new OMException(
@@ -73,7 +73,7 @@
 		identifier.fromOMElement(terminateSeqPart);
 
 		terminateSequenceElement = factory.createOMElement(
-				Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
+				Sandesha2Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
 
 		return this;
 	}
@@ -96,7 +96,7 @@
 		body.addChild(terminateSequenceElement);
 
 		terminateSequenceElement = factory.createOMElement(
-				Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
+				Sandesha2Constants.WSRM.TERMINATE_SEQUENCE, rmNameSpace);
 
 		return body;
 	}
@@ -113,8 +113,8 @@
 		SOAPBody body = envelope.getBody();
 		
 		//detach if already exist.
-		OMElement elem = body.getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
-				Constants.WSRM.TERMINATE_SEQUENCE));
+		OMElement elem = body.getFirstChildWithName(new QName(Sandesha2Constants.WSRM.NS_URI_RM,
+				Sandesha2Constants.WSRM.TERMINATE_SEQUENCE));
 		if (elem!=null)
 			elem.detach();
 		



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