ws-fx-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chamik...@apache.org
Subject svn commit: r440594 [1/2] - in /webservices/sandesha/trunk/java/src/org/apache/sandesha2: ./ client/ handlers/ i18n/ msgprocessors/ util/ workers/ wsrm/
Date Wed, 06 Sep 2006 03:31:43 GMT
Author: chamikara
Date: Tue Sep  5 20:31:41 2006
New Revision: 440594

URL: http://svn.apache.org/viewvc?view=rev&rev=440594
Log:
Removed the defaultFactory from the RMModel elements.
Removed getElement() method from IOMRMPart.
Updated code to go with the latest WSRM1.1 namespaces - Matt's patch
Corrected the ackProcessing within SandeshaInHandler to go within a transaction - Andrew's patch


Modified:
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceFault.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceOffer.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequence.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/RMMsgContext.java Tue Sep  5 20:31:41 2006
@@ -302,7 +302,7 @@
 		
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(rmNamespaceValue)) { 
 			rmSpecVersion = Sandesha2Constants.SPEC_VERSIONS.v1_0;
-		} else if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(rmNamespaceValue)) {
+		} else if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(rmNamespaceValue)) {
 			rmSpecVersion = Sandesha2Constants.SPEC_VERSIONS.v1_1;
 		}
 	}

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java Tue Sep  5 20:31:41 2006
@@ -27,7 +27,7 @@
 	
 	public interface SPEC_VERSIONS {
 		String v1_0 = "Spec_2005_02";
-		String v1_1 = "Spec_2005_10";
+		String v1_1 = "Spec_2006_08";
 	}
 	
 	public interface SPEC_2005_02 {
@@ -56,41 +56,42 @@
 		}
 	}
 	
-	public interface SPEC_2005_10 {
+	public interface SPEC_2006_08 {
 		
-		String NS_URI = "http://docs.oasis-open.org/ws-rx/wsrm/200602";
+		String NS_URI = "http://docs.oasis-open.org/ws-rx/wsrm/200608";
+        String SEC_NS_URI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
 		
 		public interface Actions {
 			
-			String ACTION_CREATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence";
+			String ACTION_CREATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequence";
 
-			String ACTION_CREATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse";
+			String ACTION_CREATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequenceResponse";
 
-			String ACTION_SEQUENCE_ACKNOWLEDGEMENT = "http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement";
+			String ACTION_SEQUENCE_ACKNOWLEDGEMENT = "http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement";
 
-			String ACTION_TERMINATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence";
+			String ACTION_TERMINATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequence";
 			
-			String ACTION_TERMINATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse";
+			String ACTION_TERMINATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequenceResponse";
 			
-			String ACTION_ACK_REQUEST = "http://docs.oasis-open.org/ws-rx/wsrm/200602/AckRequested";
+			String ACTION_ACK_REQUEST = "http://docs.oasis-open.org/ws-rx/wsrm/200608/AckRequested";
 			
-			String ACTION_CLOSE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence";
+			String ACTION_CLOSE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequence";
 			
-			String ACTION_CLOSE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequenceResponse";
+			String ACTION_CLOSE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequenceResponse";
 			
-			String SOAP_ACTION_CREATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequence";
+			String SOAP_ACTION_CREATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequence";
 
-			String SOAP_ACTION_CREATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CreateSequenceResponse";
+			String SOAP_ACTION_CREATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CreateSequenceResponse";
 
-			String SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT = "http://docs.oasis-open.org/ws-rx/wsrm/200602/SequenceAcknowledgement";
+			String SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT = "http://docs.oasis-open.org/ws-rx/wsrm/200608/SequenceAcknowledgement";
 
-			String SOAP_ACTION_TERMINATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequence";
+			String SOAP_ACTION_TERMINATE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequence";
 			
-			String SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/TerminateSequenceResponse";
+			String SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequenceResponse";
 			
-			String SOAP_ACTION_ACK_REQUEST = "http://docs.oasis-open.org/ws-rx/wsrm/200602/AckRequested";
+			String SOAP_ACTION_ACK_REQUEST = "http://docs.oasis-open.org/ws-rx/wsrm/200608/AckRequested";
 			
-			String SOAP_ACTION_CLOSE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200602/CloseSequence";
+			String SOAP_ACTION_CLOSE_SEQUENCE = "http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequence";
 		}
 	}
 	
@@ -147,6 +148,12 @@
 		String NONE = "None";
 		
 		String FINAL = "Final";
+		
+		String MAKE_CONNECTION = "MakeConnection";
+		
+		String MESSAGE_PENDING = "MessagePending";
+		
+		String PENDING = "pending";
 	}
 
 	public interface WSA {
@@ -507,6 +514,6 @@
 	
 	String [] SPEC_NS_URIS = {
 			SPEC_2005_02.NS_URI,
-			SPEC_2005_10.NS_URI
+			SPEC_2006_08.NS_URI
 	};
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Tue Sep  5 20:31:41 2006
@@ -670,8 +670,8 @@
 
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmSpecVersion);
 
-		AckRequested ackRequested = new AckRequested(factory, rmNamespaceValue);
-		Identifier identifier = new Identifier(factory, rmNamespaceValue);
+		AckRequested ackRequested = new AckRequested(rmNamespaceValue);
+		Identifier identifier = new Identifier(rmNamespaceValue);
 		identifier.setIndentifer(outSequenceID);
 		ackRequested.setIdentifier(identifier);
 
@@ -778,7 +778,7 @@
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmSpecVersion);
 
 		CloseSequence closeSequence = new CloseSequence(factory, rmNamespaceValue);
-		Identifier identifier = new Identifier(factory, rmNamespaceValue);
+		Identifier identifier = new Identifier(rmNamespaceValue);
 		identifier.setIndentifer(sequenceID);
 		closeSequence.setIdentifier(identifier);
 
@@ -1060,8 +1060,8 @@
 		}
 
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmSpecVersion);
-		TerminateSequence terminateSequence = new TerminateSequence(factory, rmNamespaceValue);
-		Identifier identifier = new Identifier(factory, rmNamespaceValue);
+		TerminateSequence terminateSequence = new TerminateSequence(rmNamespaceValue);
+		Identifier identifier = new Identifier(rmNamespaceValue);
 		identifier.setIndentifer(sequenceID);
 		terminateSequence.setIdentifier(identifier);
 		terminateSequence.toSOAPEnvelope(dummyEnvelope);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaInHandler.java Tue Sep  5 20:31:41 2006
@@ -79,10 +79,6 @@
 					// handlers
 		}
 		
-		// Process Ack headers in the message
-		AcknowledgementProcessor ackProcessor = new AcknowledgementProcessor();
-		ackProcessor.processAckHeaders(msgCtx);
-
 		StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(context, context.getAxisConfiguration());
 
 		boolean withinTransaction = false;
@@ -99,6 +95,10 @@
 		boolean rolebacked = false;
 
 		try {
+
+			// Process Ack headers in the message
+			AcknowledgementProcessor ackProcessor = new AcknowledgementProcessor();
+			ackProcessor.processAckHeaders(msgCtx);
 
 			AxisService axisService = msgCtx.getAxisService();
 			if (axisService == null) {

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java Tue Sep  5 20:31:41 2006
@@ -81,6 +81,7 @@
 	public static final String cannotDecideRMVersion="cannotDecideRMVersion";
 	public static final String specVersionPropertyNotAvailable="specVersionPropertyNotAvailable";
 	public static final String specVersionNotSet="specVersionNotSet";
+	public static final String specDoesNotSupportElement="specDoesNotSupportElements";
 		
 	public static final String couldNotSendTerminate="couldNotSendTerminate";
 	public static final String couldNotSendClose="couldNotSendClose";
@@ -169,6 +170,7 @@
 	public static final String invalidAckMessageEntry="invalidAckMessageEntry";
 	public static final String seqPartIsNull="seqPartIsNull";
 	public static final String incomingSequenceNotValidID="incomingSequenceNotValidID";
+	public static final String noMakeConnectionPartInElement="noCloseSequencePartInElement";
 
 	public static final String seqFaultCannotBeExtractedToNonHeader="seqFaultCannotBeExtractedToNonHeader";
 	public static final String seqElementCannotBeAddedToNonHeader="seqElementCannotBeAddedToNonHeader";
@@ -194,6 +196,7 @@
 	public static final String cannotProcessExpires="cannotProcessExpires";
 	public static final String noFaultCode="noFaultCode";
 	public static final String seqAckNonHeader="seqAckNonHeader";
+	public static final String makeConnectionCannotBeAddedToNonBody="makeConnectionCannotBeAddedToNonBody";
 
 	public static final String cannotSetACksTo="cannotSetACksTo";
 	public static final String invalidMsgNumber="invalidMsgNumber";

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties Tue Sep  5 20:31:41 2006
@@ -102,6 +102,7 @@
 cannotDecideRMVersion=Message does not has a valid RM namespace value - cannot decide the RM version.
 specVersionPropertyNotAvailable=''SpecVersion'' sequence property is not available for the incoming sequence {0}: cannot find the RM version for outgoing side.
 specVersionNotSet=Error: 'SpecVersion'' is not set.
+specDoesNotSupportElement=Spec {0} does not support the element {1}
 
 couldNotSendTerminate=Could not send the terminate message due to error {0}.
 couldNotSendClose=Could not send the close sequence message due to error {0}.

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Tue Sep  5 20:31:41 2006
@@ -94,7 +94,9 @@
 		if(tokenBean != null) {
 			SecurityManager secManager = SandeshaUtil.getSecurityManager(configurationContext);
 			SecurityToken token = secManager.recoverSecurityToken(tokenBean.getValue());
-			secManager.checkProofOfPossession(token, ackRequested.getOMElement(), msgContext);
+			
+			//TODO get the ackRequested element from the SOAPEnvelope.
+//			secManager.checkProofOfPossession(token, ackRequested.getOMElement(), msgContext);
 		}
 
 		// Setting the ack depending on AcksTo.

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Tue Sep  5 20:31:41 2006
@@ -118,7 +118,9 @@
 		if(tokenBean != null) {
 			SecurityManager secManager = SandeshaUtil.getSecurityManager(configCtx);
 			SecurityToken token = secManager.recoverSecurityToken(tokenBean.getValue());
-			secManager.checkProofOfPossession(token, sequenceAck.getOMElement(), msgCtx);
+			
+			//TODO get the element from the SOAP Envelope
+//			secManager.checkProofOfPossession(token, sequsenceAck.getOMElement(), msgCtx);
 		}
 		
 		Iterator ackRangeIterator = sequenceAck.getAcknowledgementRanges().iterator();

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Tue Sep  5 20:31:41 2006
@@ -121,7 +121,10 @@
 			SecurityManager secManager = SandeshaUtil.getSecurityManager(msgCtx.getConfigurationContext());
 			OMElement body = msgCtx.getEnvelope().getBody();
 			SecurityToken token = secManager.recoverSecurityToken(tokenBean.getValue());
-			secManager.checkProofOfPossession(token, sequence.getOMElement(), msgCtx);
+			
+			//TODO get the element from the SOAP Envelope
+//			secManager.checkProofOfPossession(token, sequence.getOMElement(), msgCtx);
+			
 			secManager.checkProofOfPossession(token, body, msgCtx);
 		}
 		
@@ -930,8 +933,8 @@
 
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
 
-		Sequence sequence = new Sequence(factory, rmNamespaceValue);
-		MessageNumber msgNumber = new MessageNumber(factory, rmNamespaceValue);
+		Sequence sequence = new Sequence(rmNamespaceValue);
+		MessageNumber msgNumber = new MessageNumber(rmNamespaceValue);
 		msgNumber.setMessageNumber(messageNumber);
 		sequence.setMessageNumber(msgNumber);
 
@@ -957,7 +960,7 @@
 
 			if (requestSequence.getLastMessage() != null) {
 				lastMessage = true;
-				sequence.setLastMessage(new LastMessage(factory, rmNamespaceValue));
+				sequence.setLastMessage(new LastMessage(rmNamespaceValue));
 
 			}
 
@@ -978,7 +981,7 @@
 
 					String specVersion = specVersionBean.getValue();
 					if (SpecSpecificConstants.isLastMessageIndicatorRequired(specVersion))
-						sequence.setLastMessage(new LastMessage(factory, rmNamespaceValue));
+						sequence.setLastMessage(new LastMessage(rmNamespaceValue));
 				}
 			}
 		}
@@ -1001,14 +1004,14 @@
 			identifierStr = (String) outSequenceBean.getValue();
 		}
 
-		Identifier id1 = new Identifier(factory, rmNamespaceValue);
+		Identifier id1 = new Identifier(rmNamespaceValue);
 		id1.setIndentifer(identifierStr);
 		sequence.setIdentifier(id1);
 		rmMsg.setMessagePart(Sandesha2Constants.MessageParts.SEQUENCE, sequence);
 
 		if (addAckRequested) {
-			ackRequested = new AckRequested(factory, rmNamespaceValue);
-			Identifier id2 = new Identifier(factory, rmNamespaceValue);
+			ackRequested = new AckRequested(rmNamespaceValue);
+			Identifier id2 = new Identifier(rmNamespaceValue);
 			id2.setIndentifer(identifierStr);
 			ackRequested.setIdentifier(id2);
 			rmMsg.setMessagePart(Sandesha2Constants.MessageParts.ACK_REQUEST, ackRequested);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Tue Sep  5 20:31:41 2006
@@ -102,7 +102,9 @@
 			SecurityManager secManager = SandeshaUtil.getSecurityManager(context);
 			MessageContext msgcontext = createSeqRMMsg.getMessageContext();
 			token = secManager.getSecurityToken(theSTR, msgcontext);
-			secManager.checkProofOfPossession(token, createSeqPart.getOMElement(), msgcontext);
+			
+			//TODO get the element from the SOAP Envelope
+//			secManager.checkProofOfPossession(token, createSeqPart.getOMElement(), msgcontext);
 		}
 
 		MessageContext outMessage = null;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Tue Sep  5 20:31:41 2006
@@ -254,7 +254,7 @@
 				throw new SandeshaException(message);
 			}
 
-			Identifier identifier = new Identifier(factory, assumedRMNamespace);
+			Identifier identifier = new Identifier(assumedRMNamespace);
 			identifier.setIndentifer(newOutSequenceId);
 
 			sequencePart.setIdentifier(identifier);
@@ -262,7 +262,7 @@
 			AckRequested ackRequestedPart = (AckRequested) applicaionRMMsg
 					.getMessagePart(Sandesha2Constants.MessageParts.ACK_REQUEST);
 			if (ackRequestedPart != null) {
-				Identifier id1 = new Identifier(factory, assumedRMNamespace);
+				Identifier id1 = new Identifier(assumedRMNamespace);
 				id1.setIndentifer(newOutSequenceId);
 				ackRequestedPart.setIdentifier(id1);
 			}

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java Tue Sep  5 20:31:41 2006
@@ -270,8 +270,8 @@
 			String offeredSequence = (String) applicationMsgContext
 					.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
 			if (offeredSequence != null && !"".equals(offeredSequence)) {
-				SequenceOffer offerPart = new SequenceOffer(factory, rmNamespaceValue);
-				Identifier identifier = new Identifier(factory, rmNamespaceValue);
+				SequenceOffer offerPart = new SequenceOffer(rmNamespaceValue);
+				Identifier identifier = new Identifier(rmNamespaceValue);
 				identifier.setIndentifer(offeredSequence);
 				offerPart.setIdentifier(identifier);
 				createSequencePart.setSequenceOffer(offerPart);
@@ -425,8 +425,8 @@
 		SOAPEnvelope envelope = factory.getDefaultEnvelope();
 		terminateRMMessage.setSOAPEnvelop(envelope);
 
-		TerminateSequence terminateSequencePart = new TerminateSequence(factory, rmNamespaceValue);
-		Identifier identifier = new Identifier(factory, rmNamespaceValue);
+		TerminateSequence terminateSequencePart = new TerminateSequence(rmNamespaceValue);
+		Identifier identifier = new Identifier(rmNamespaceValue);
 		identifier.setIndentifer(sequenceId);
 		terminateSequencePart.setIdentifier(identifier);
 		terminateRMMessage.setMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ, terminateSequencePart);
@@ -478,7 +478,7 @@
 		CreateSequenceResponse response = new CreateSequenceResponse(factory, rmNamespaceValue,
 				addressingNamespaceValue);
 
-		Identifier identifier = new Identifier(factory, rmNamespaceValue);
+		Identifier identifier = new Identifier(rmNamespaceValue);
 		identifier.setIndentifer(newSequenceID);
 
 		response.setIdentifier(identifier);
@@ -489,10 +489,10 @@
 
 			if (outSequenceId != null && !"".equals(outSequenceId)) {
 
-				Accept accept = new Accept(factory, rmNamespaceValue, addressingNamespaceValue);
+				Accept accept = new Accept(rmNamespaceValue, addressingNamespaceValue);
 				EndpointReference acksToEPR = createSeqMessage.getTo();
-				AcksTo acksTo = new AcksTo(factory, rmNamespaceValue, addressingNamespaceValue);
-				Address address = new Address(factory, addressingNamespaceValue);
+				AcksTo acksTo = new AcksTo(rmNamespaceValue, addressingNamespaceValue);
+				Address address = new Address(addressingNamespaceValue);
 				address.setEpr(acksToEPR);
 				acksTo.setAddress(address);
 				accept.setAcksTo(acksTo);
@@ -547,8 +547,8 @@
 		String namespace = terminateSeqRMMsg.getRMNamespaceValue();
 		terminateSeqResponseRMMsg.setRMNamespaceValue(namespace);
 
-		TerminateSequenceResponse terminateSequenceResponse = new TerminateSequenceResponse(factory, namespace);
-		Identifier identifier = new Identifier(factory, namespace);
+		TerminateSequenceResponse terminateSequenceResponse = new TerminateSequenceResponse(namespace);
+		Identifier identifier = new Identifier(namespace);
 		identifier.setIndentifer(sequenceID);
 		terminateSequenceResponse.setIdentifier(identifier);
 
@@ -589,7 +589,7 @@
 		closeSeqResponseRMMsg.setRMNamespaceValue(namespace);
 
 		CloseSequenceResponse closeSequenceResponse = new CloseSequenceResponse(factory, namespace);
-		Identifier identifier = new Identifier(factory, namespace);
+		Identifier identifier = new Identifier(namespace);
 		identifier.setIndentifer(sequenceID);
 		closeSequenceResponse.setIdentifier(identifier);
 
@@ -641,7 +641,7 @@
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
 
 		SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement(factory, rmNamespaceValue);
-		Identifier id = new Identifier(factory, rmNamespaceValue);
+		Identifier id = new Identifier(rmNamespaceValue);
 		id.setIndentifer(sequenceId);
 		sequenceAck.setIdentifier(id);
 
@@ -664,7 +664,7 @@
 		if (sequenceClosedBean != null && Sandesha2Constants.VALUE_TRUE.equals(sequenceClosedBean.getValue())) {
 			// sequence is closed. so add the 'Final' part.
 			if (SpecSpecificConstants.isAckFinalAllowed(rmVersion)) {
-				AckFinal ackFinal = new AckFinal(factory, rmNamespaceValue);
+				AckFinal ackFinal = new AckFinal(rmNamespaceValue);
 				sequenceAck.setAckFinal(ackFinal);
 			}
 		}

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java Tue Sep  5 20:31:41 2006
@@ -111,9 +111,9 @@
 			MessageContext faultMessageContext, FaultData faultData,
 			SOAPFactory factory, String rmNamespaceValue) throws SandeshaException {
 
-		SequenceFault sequenceFault = new SequenceFault(factory, rmNamespaceValue);
+		SequenceFault sequenceFault = new SequenceFault(rmNamespaceValue);
 
-		FaultCode faultCode = new FaultCode(factory, rmNamespaceValue);
+		FaultCode faultCode = new FaultCode(rmNamespaceValue);
 		faultCode.setFaultCode(faultData.getSubcode());
 		sequenceFault.setFaultCode(faultCode);
 	}

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Tue Sep  5 20:31:41 2006
@@ -445,7 +445,7 @@
 					Sandesha2Constants.WSRM_COMMON.SEQUENCE));
 
 		if (sequenceElem == null)
-			sequenceElem = header.getFirstChildWithName(new QName(Sandesha2Constants.SPEC_2005_10.NS_URI,
+			sequenceElem = header.getFirstChildWithName(new QName(Sandesha2Constants.SPEC_2006_08.NS_URI,
 					Sandesha2Constants.WSRM_COMMON.SEQUENCE));
 
 		if (sequenceElem != null)
@@ -460,13 +460,13 @@
 		if (Sandesha2Constants.SPEC_2005_02.Actions.ACTION_TERMINATE_SEQUENCE.equals(action))
 			rmGlobalMsg = true;
 
-		if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT.equals(action))
+		if (Sandesha2Constants.SPEC_2006_08.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT.equals(action))
 			rmGlobalMsg = true;
 
-		if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE.equals(action))
+		if (Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE.equals(action))
 			rmGlobalMsg = true;
 
-		if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE_RESPONSE.equals(action))
+		if (Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE_RESPONSE.equals(action))
 			rmGlobalMsg = true;
 
 		return rmGlobalMsg;
@@ -482,7 +482,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE.equals(action))
 			rmGlobalMsg = true;
 
-		if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE.equals(action))
+		if (Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE.equals(action))
 			rmGlobalMsg = true;
 
 		return rmGlobalMsg;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Tue Sep  5 20:31:41 2006
@@ -132,7 +132,7 @@
 		String specVersion = null;
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(messageRMNamespace)) {
 			specVersion = Sandesha2Constants.SPEC_VERSIONS.v1_0;
-		} else if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(messageRMNamespace)) {
+		} else if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(messageRMNamespace)) {
 			specVersion = Sandesha2Constants.SPEC_VERSIONS.v1_1;
 		} else {
 			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SpecSpecificConstants.java Tue Sep  5 20:31:41 2006
@@ -35,7 +35,7 @@
 	public static String getSpecVersionString (String namespaceValue) throws SandeshaException {
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceValue))
 			return Sandesha2Constants.SPEC_VERSIONS.v1_0;
-		else if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceValue))
+		else if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceValue))
 			return Sandesha2Constants.SPEC_VERSIONS.v1_1;
 		else
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
@@ -47,7 +47,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.NS_URI;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -58,7 +58,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -69,7 +69,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE_RESPONSE;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE_RESPONSE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE_RESPONSE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -80,7 +80,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_TERMINATE_SEQUENCE;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -89,7 +89,7 @@
 	
 	public static String getTerminateSequenceResponseAction (String specVersion) throws SandeshaException {
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE_RESPONSE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE_RESPONSE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec));
@@ -101,7 +101,7 @@
 					SandeshaMessageKeys.closeSequenceSpecLevel,
 					specVersion));
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CLOSE_SEQUENCE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -114,7 +114,7 @@
 					SandeshaMessageKeys.closeSequenceSpecLevel,
 					specVersion));
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CLOSE_SEQUENCE_RESPONSE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE_RESPONSE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -125,7 +125,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return null;  //No action defined for ackRequests
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_ACK_REQUEST;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_ACK_REQUEST;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -136,7 +136,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT;
+			return Sandesha2Constants.SPEC_2006_08.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -147,7 +147,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_CREATE_SEQUENCE;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.SOAP_ACTION_CREATE_SEQUENCE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_CREATE_SEQUENCE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -158,7 +158,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -169,7 +169,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_TERMINATE_SEQUENCE;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.SOAP_ACTION_TERMINATE_SEQUENCE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_TERMINATE_SEQUENCE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -178,7 +178,7 @@
 	
 	public static String getTerminateSequenceResponseSOAPAction (String specVersion) throws SandeshaException {
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE;
+			return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_TERMINATE_SEQUENCE_RESPONSE;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -189,7 +189,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			throw new SandeshaException ("this spec version does not define a ackRequest SOAP action");
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.SOAP_ACTION_ACK_REQUEST;
+			return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_ACK_REQUEST;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
@@ -200,7 +200,7 @@
 		if (Sandesha2Constants.SPEC_VERSIONS.v1_0.equals(specVersion)) 
 			return Sandesha2Constants.SPEC_2005_02.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT;
 		else if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(specVersion)) 
-			return Sandesha2Constants.SPEC_2005_10.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT;
+			return Sandesha2Constants.SPEC_2006_08.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT;
 		else 
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java Tue Sep  5 20:31:41 2006
@@ -242,6 +242,9 @@
 						new InvokerBean(null, nextMsgno, sequenceId))
 						.iterator();
 
+				
+				//TODO correct the locking mechanism to have one lock per sequence.
+				
 				if (stMapIt.hasNext()) { //the next Msg entry is present.
 
 					String workId = sequenceId + "::" + nextMsgno; //creating a workId to uniquely identify the
@@ -261,7 +264,6 @@
 					String messageContextKey = bean.getMessageContextRefKey();
 					
 					transaction.commit();
-					
 
 					// start a new worker thread and let it do the invocation.
 					InvokerWorker worker = new InvokerWorker(context,messageContextKey);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Accept.java Tue Sep  5 20:31:41 2006
@@ -37,20 +37,17 @@
 
 	private AcksTo acksTo;
 	
-	private OMFactory defaultFactory;
-	
 	private String rmNamespaceValue;
 	
 	private String addressingNamespaceValue;
 
 
-	public Accept(OMFactory factory, String rmNamespaceValue, String addressingNamespaceValue) throws SandeshaException {
+	public Accept(String rmNamespaceValue, String addressingNamespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(rmNamespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownNamespace,
 					rmNamespaceValue));
 		
-		this.defaultFactory = factory;
 		this.addressingNamespaceValue = addressingNamespaceValue;
 		this.rmNamespaceValue = rmNamespaceValue;
 	}
@@ -62,8 +59,6 @@
 	public Object fromOMElement(OMElement element) throws OMException,SandeshaException {
 
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMElement acceptPart = element.getFirstChildWithName(new QName(
 				rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.ACCEPT));
@@ -72,7 +67,7 @@
 					SandeshaMessageKeys.noAcceptPartInElement,
 					element.toString()));
 
-		acksTo = new AcksTo(defaultFactory,rmNamespaceValue,addressingNamespaceValue);
+		acksTo = new AcksTo(rmNamespaceValue,addressingNamespaceValue);
 		acksTo.fromOMElement(acceptPart);
 
 		return this;
@@ -81,8 +76,6 @@
 	public OMElement toOMElement(OMElement element) throws OMException {
 
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		if (acksTo == null)
 			throw new OMException(SandeshaMessageHelper.getMessage(
@@ -109,7 +102,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckFinal.java Tue Sep  5 20:31:41 2006
@@ -33,17 +33,14 @@
  */
 public class AckFinal implements IOMRMElement {
 
-	private OMFactory defaultfactory;
-	
 	private String namespaceValue = null;
 	
-	public AckFinal(OMFactory factory,String namespaceValue) throws SandeshaException {
+	public AckFinal(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultfactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -54,8 +51,6 @@
 	public Object fromOMElement(OMElement element) throws OMException {
 		
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultfactory;
 		
 		OMElement finalPart = element.getFirstChildWithName(new QName(
 				namespaceValue, Sandesha2Constants.WSRM_COMMON.FINAL));
@@ -71,8 +66,6 @@
 		//soapheaderblock element will be given
 
 		OMFactory factory = sequenceAckElement.getOMFactory();
-		if (factory==null)
-			factory = defaultfactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement finalElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.FINAL, rmNamespace);
@@ -87,7 +80,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return false;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckNone.java Tue Sep  5 20:31:41 2006
@@ -36,17 +36,14 @@
 
 	private OMNamespace rmNamespace = null;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	public AckNone(OMFactory factory,String namespaceValue) throws SandeshaException {
+	public AckNone(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -69,8 +66,6 @@
 	public OMElement toOMElement(OMElement sequenceAckElement) throws OMException {
 		
 		OMFactory factory = sequenceAckElement.getOMFactory();
-	    if (factory==null)
-	    	factory = defaultFactory;
 	    
 	    OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 	    OMElement noneElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.NONE, rmNamespace);
@@ -84,7 +79,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return false;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java Tue Sep  5 20:31:41 2006
@@ -41,21 +41,16 @@
 	
 	private MessageNumber messageNumber;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
 	private boolean mustUnderstand = false;
 	
-	private OMElement ackElement = null;
-
-	public AckRequested(OMFactory factory,String namespaceValue) throws SandeshaException {
+	public AckRequested(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -76,15 +71,15 @@
 					SandeshaMessageKeys.noAckRequestedElement,
 					header.toString()));
 
-		ackElement = ackReqPart;
-		identifier = new Identifier(defaultFactory,namespaceValue);
+//		ackElement = ackReqPart;
+		identifier = new Identifier(namespaceValue);
 		identifier.fromOMElement(ackReqPart);
 
 		OMElement msgNoPart = ackReqPart.getFirstChildWithName(new QName(
 				namespaceValue, Sandesha2Constants.WSRM_COMMON.MSG_NUMBER));
 
 		if (msgNoPart != null) {
-			messageNumber = new MessageNumber(defaultFactory,namespaceValue);
+			messageNumber = new MessageNumber(namespaceValue);
 			messageNumber.fromOMElement(ackReqPart);
 		}
 
@@ -158,13 +153,10 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;
 	}
 	
-	public OMElement getOMElement() {
-		return ackElement;
-	}
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Tue Sep  5 20:31:41 2006
@@ -39,8 +39,6 @@
 	
 	private long lowerValue;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
 	public AcknowledgementRange(OMFactory factory, String namespaceValue) throws SandeshaException {
@@ -49,7 +47,6 @@
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -103,8 +100,6 @@
 							upperValue + ":" + lowerValue));
 
 		OMFactory factory = sequenceAckElement.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMAttribute lowerAttrib = factory.createOMAttribute(
 				Sandesha2Constants.WSRM_COMMON.LOWER, null, Long.toString(lowerValue));
@@ -141,7 +136,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AcksTo.java Tue Sep  5 20:31:41 2006
@@ -38,25 +38,22 @@
 
 	private Address address;
 	
-	private OMFactory defaultFactory;
-	
 	private String rmNamespaceValue = null;
 	
 	private String addressingNamespaceValue = null;
 
-	public AcksTo(OMFactory factory,String rmNamespaceValue,String addressingNamespaceValue) throws SandeshaException {
+	public AcksTo(String rmNamespaceValue,String addressingNamespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(rmNamespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					rmNamespaceValue));
 		
-		this.defaultFactory = factory;
 		this.rmNamespaceValue = rmNamespaceValue;
 		this.addressingNamespaceValue = addressingNamespaceValue;
 	}
 	
 	public AcksTo (Address address,SOAPFactory factory,String rmNamespaceValue, String addressingNamespaceValue) throws SandeshaException {
-		this (factory,rmNamespaceValue,addressingNamespaceValue);
+		this (rmNamespaceValue,addressingNamespaceValue);
 		this.address = address;
 	}
 
@@ -73,7 +70,7 @@
 					SandeshaMessageKeys.noAcksToPart,
 					element.toString()));
 
-		address = new Address(defaultFactory,addressingNamespaceValue);
+		address = new Address(addressingNamespaceValue);
 		address.fromOMElement(acksToPart);
 
 		return this;
@@ -87,8 +84,6 @@
 					null));
 
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement acksToElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.ACKS_TO, rmNamespace);
@@ -111,7 +106,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Address.java Tue Sep  5 20:31:41 2006
@@ -26,24 +26,21 @@
 
 	private EndpointReference epr = null;
 	
-	private OMFactory defaultFactory;
+	private String namespaceValue = null;
 	
-	private String addressingNamespaceValue = null;
-	
-	public Address(OMFactory factory, String addressingNamespaceValue) {
-		this.defaultFactory = factory;
-		this.addressingNamespaceValue = addressingNamespaceValue;
+	public Address(String namespaceValue) {
+		this.namespaceValue = namespaceValue;
 	}
 	
 	public Address (EndpointReference epr,OMFactory factory,String addressingNamespaceValue) {
-		this(factory,addressingNamespaceValue);
+		this(addressingNamespaceValue);
 		this.epr = epr;
 	}
 
 	public Object fromOMElement(OMElement element) throws OMException {
 
 		OMElement addressPart = element.getFirstChildWithName(new QName(
-				addressingNamespaceValue, Sandesha2Constants.WSA.ADDRESS));
+				namespaceValue, Sandesha2Constants.WSA.ADDRESS));
 		if (addressPart == null)
 			throw new OMException(SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.cannotFindAddressElement,
@@ -60,7 +57,7 @@
 	}
 
 	public String getNamespaceValue(){
-		return addressingNamespaceValue;
+		return namespaceValue;
 	}
 
 	public OMElement toOMElement(OMElement element) throws OMException {
@@ -70,10 +67,8 @@
 					SandeshaMessageKeys.addressNotValid));
 
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
-		OMNamespace addressingNamespace = factory.createOMNamespace(addressingNamespaceValue,Sandesha2Constants.WSA.NS_PREFIX_ADDRESSING);
+		OMNamespace addressingNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSA.NS_PREFIX_ADDRESSING);
 		OMElement addressElement = factory.createOMElement(Sandesha2Constants.WSA.ADDRESS, addressingNamespace);
 		
 		addressElement.setText(epr.getAddress());
@@ -94,7 +89,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequence.java Tue Sep  5 20:31:41 2006
@@ -38,19 +38,14 @@
 
 	private Identifier identifier;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	private OMElement element = null;
-	
 	public CloseSequence(OMFactory factory, String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -64,8 +59,6 @@
 			throw new OMException(SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.closeSeqCannotBeAddedToNonBody));
 
-		element = body;
-		
 		OMElement closeSeqPart = body.getFirstChildWithName(new QName(
 				namespaceValue, Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE));
 
@@ -74,7 +67,7 @@
 					SandeshaMessageKeys.noCloseSequencePartInElement,
 					body.toString()));
 
-		identifier = new Identifier(defaultFactory,namespaceValue);
+		identifier = new Identifier(namespaceValue);
 		identifier.fromOMElement(closeSeqPart);
 
 		return this;
@@ -92,8 +85,6 @@
 					SandeshaMessageKeys.closeSeqPartNullID));
 
 		OMFactory factory = body.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement closeSequenceElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE, rmNamespace);
@@ -128,13 +119,10 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;
 	}
-	
-	public OMElement getOMElement() {
-		return element;
-	}
+
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CloseSequenceResponse.java Tue Sep  5 20:31:41 2006
@@ -37,19 +37,14 @@
 
 	private Identifier identifier;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	private OMElement element;
-	
 	public CloseSequenceResponse(OMFactory factory, String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -64,8 +59,6 @@
 					SandeshaMessageHelper.getMessage(
 							SandeshaMessageKeys.closeSeqResponseCannotBeAddedToNonBody));
 
-		element = body;
-		
 		OMElement closeSeqResponsePart = body.getFirstChildWithName(new QName(
 				namespaceValue, Sandesha2Constants.WSRM_COMMON.CLOSE_SEQUENCE_RESPONSE));
 
@@ -74,7 +67,7 @@
 					SandeshaMessageKeys.noCloseSeqResponsePartInElement,
 					body.toString()));
 
-		identifier = new Identifier(defaultFactory,namespaceValue);
+		identifier = new Identifier(namespaceValue);
 		identifier.fromOMElement(closeSeqResponsePart);
 
 		return this;
@@ -93,8 +86,6 @@
 							SandeshaMessageKeys.closeSeqResponsePartNullID));
 
 		OMFactory factory = body.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement closeSequenceResponseElement = factory.createOMElement(
@@ -129,14 +120,10 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;
-	}
-
-	public OMElement getOMElement() {
-		return element;
 	}
 
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequence.java Tue Sep  5 20:31:41 2006
@@ -19,7 +19,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
@@ -45,8 +44,6 @@
 	
 	private SequenceOffer sequenceOffer = null;
 	
-	private OMFactory defaultFactory;
-	
 	private String rmNamespaceValue = null;
 	
 	private String addressingNamespaceValue = null;
@@ -55,15 +52,12 @@
 	
 	private OMElement securityTokenReference = null;
 	
-	private OMElement element;
-	
 	public CreateSequence(OMFactory factory,String rmNamespaceValue,String addressingNamespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(rmNamespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					rmNamespaceValue));
 		
-		this.defaultFactory = factory;
 		this.rmNamespaceValue = rmNamespaceValue;
 		this.addressingNamespaceValue = addressingNamespaceValue;
 		this.secNamespaceValue = SpecSpecificConstants.getSecurityNamespace(rmNamespaceValue);
@@ -88,15 +82,13 @@
 					SandeshaMessageKeys.noCreateSeqPartInElement,
 					bodyElement.toString()));
 		
-		element = bodyElement;
-		
-		acksTo = new AcksTo(defaultFactory,rmNamespaceValue,addressingNamespaceValue);
+		acksTo = new AcksTo(rmNamespaceValue,addressingNamespaceValue);
 		acksTo.fromOMElement(createSequencePart);
 
 		OMElement offerPart = createSequencePart.getFirstChildWithName(new QName(rmNamespaceValue,
 																	   Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER));
 		if (offerPart != null) {
-			sequenceOffer = new SequenceOffer(defaultFactory,rmNamespaceValue);
+			sequenceOffer = new SequenceOffer(rmNamespaceValue);
 			sequenceOffer.fromOMElement(createSequencePart);
 		}
 
@@ -104,7 +96,7 @@
 						new QName(rmNamespaceValue,
 						Sandesha2Constants.WSRM_COMMON.EXPIRES));
 		if (expiresPart != null) {
-			expires = new Expires(defaultFactory,rmNamespaceValue);
+			expires = new Expires(rmNamespaceValue);
 			expires.fromOMElement(createSequencePart);
 		}
 		
@@ -128,8 +120,7 @@
 		SOAPBody soapBody = (SOAPBody) bodyElement;
 		
 		OMFactory factory = bodyElement.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
+
 		OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement createSequenceElement = factory.createOMElement(
 				Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE, rmNamespace);
@@ -184,7 +175,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;
@@ -196,10 +187,6 @@
 
 	public void setSecurityTokenReference(OMElement theSTR) {
 		this.securityTokenReference = theSTR;
-	}
-
-	public OMElement getOMElement() {
-		return element;
 	}
 
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Tue Sep  5 20:31:41 2006
@@ -42,21 +42,16 @@
 	
 	private Expires expires;
 	
-	private OMFactory defaultFactory;
-	
 	private String rmNamespaceValue = null;
 	
 	private String addressingNamespaceValue = null;
 	
-	private OMElement element;
-
 	public CreateSequenceResponse(OMFactory factory, String rmNamespaceValue, String addressingNamespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(rmNamespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					rmNamespaceValue));
 		
-		this.defaultFactory = factory;
 		this.rmNamespaceValue = rmNamespaceValue;
 		this.addressingNamespaceValue = addressingNamespaceValue;
 	}
@@ -72,7 +67,6 @@
 					SandeshaMessageKeys.createSeqResponseCannotBeAddedToNonBody));
 
 		SOAPBody SOAPBody = (SOAPBody) bodyElement;
-		element = bodyElement;
 
 		OMElement createSeqResponsePart = SOAPBody
 				.getFirstChildWithName(new QName(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE_RESPONSE));
@@ -81,14 +75,14 @@
 					SandeshaMessageKeys.noCreateSeqResponsePartInElement,
 					bodyElement.toString()));
 
-		identifier = new Identifier(defaultFactory,rmNamespaceValue);
+		identifier = new Identifier(rmNamespaceValue);
 		identifier.fromOMElement(createSeqResponsePart);
 
 		OMElement expiresPart = createSeqResponsePart.getFirstChildWithName(
 					new QName(rmNamespaceValue,
 					Sandesha2Constants.WSRM_COMMON.EXPIRES));
 		if (expiresPart != null) {
-			expires = new Expires(defaultFactory,rmNamespaceValue);
+			expires = new Expires(rmNamespaceValue);
 			expires.fromOMElement(createSeqResponsePart);
 		}
 
@@ -96,7 +90,7 @@
 						new QName(rmNamespaceValue,
 						Sandesha2Constants.WSRM_COMMON.ACCEPT));
 		if (acceptPart != null) {
-			accept = new Accept(defaultFactory,rmNamespaceValue,addressingNamespaceValue);
+			accept = new Accept(rmNamespaceValue,addressingNamespaceValue);
 			accept.fromOMElement(createSeqResponsePart);
 		}
 
@@ -118,8 +112,6 @@
 					bodyElement.toString()));
 
 		OMFactory factory = bodyElement.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(rmNamespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMNamespace addressingNamespace = factory.createOMNamespace(addressingNamespaceValue,Sandesha2Constants.WSA.NS_PREFIX_ADDRESSING);
@@ -185,13 +177,10 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;
 	}
 	
-	public OMElement getOMElement() {
-		return element;
-	}
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Expires.java Tue Sep  5 20:31:41 2006
@@ -34,19 +34,16 @@
 
 public class Expires implements IOMRMElement {
 
-	private OMFactory defaultFactory;
-	
 	private String duration = null;
 	
 	private String namespaceValue = null;
 
-	public Expires(OMFactory factory,String namespaceValue) throws SandeshaException {
+	public Expires(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -67,7 +64,6 @@
 	}
 
 	public String getNamespaceValue() throws OMException {
-		// TODO Auto-generated method stub
 		return namespaceValue;
 	}
 
@@ -78,8 +74,6 @@
 					SandeshaMessageKeys.cannotProcessExpires));
 
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement expiresElement = factory.createOMElement(
@@ -103,7 +97,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/FaultCode.java Tue Sep  5 20:31:41 2006
@@ -37,17 +37,14 @@
 
 	private String faultCode = null;
 	
-	private SOAPFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	public FaultCode(SOAPFactory factory, String namespaceValue) throws SandeshaException {
+	public FaultCode(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -90,8 +87,6 @@
 							SandeshaMessageKeys.noFaultCode));
 
 		OMFactory factory = sequenceFault.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement faultCodeElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.FAULT_CODE,rmNamespace);
@@ -114,7 +109,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMElement.java Tue Sep  5 20:31:41 2006
@@ -23,11 +23,10 @@
 
 import org.apache.sandesha2.SandeshaException;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
 
 public interface IOMRMElement {
 	public String getNamespaceValue();
-	public Object fromOMElement(OMElement element) throws OMException,SandeshaException ;
-	public OMElement toOMElement(OMElement element) throws OMException, SandeshaException ;
+	public Object fromOMElement(OMElement element) throws SandeshaException ;
+	public OMElement toOMElement(OMElement element) throws SandeshaException ;
 	public boolean isNamespaceSupported (String namespaceName);
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/IOMRMPart.java Tue Sep  5 20:31:41 2006
@@ -18,7 +18,6 @@
 package org.apache.sandesha2.wsrm;
 
 import org.apache.sandesha2.SandeshaException;
-import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.SOAPEnvelope;
 
 /**
@@ -28,5 +27,4 @@
 
 public interface IOMRMPart extends IOMRMElement {
 	public void toSOAPEnvelope (SOAPEnvelope envelope) throws SandeshaException;
-	public OMElement getOMElement();
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Identifier.java Tue Sep  5 20:31:41 2006
@@ -36,17 +36,14 @@
 
 	private String identifier = null;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	public Identifier(OMFactory defaultFactory, String namespaceValue) throws SandeshaException {
+	public Identifier(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = defaultFactory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -65,8 +62,6 @@
 	public Object fromOMElement(OMElement element) throws OMException {
 		
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMElement identifierPart = element.getFirstChildWithName(new QName(
 				namespaceValue, Sandesha2Constants.WSRM_COMMON.IDENTIFIER));
@@ -94,8 +89,6 @@
 		}
 		
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 			
 		OMNamespace wsrmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement identifierElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.IDENTIFIER, wsrmNamespace);
@@ -118,7 +111,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/LastMessage.java Tue Sep  5 20:31:41 2006
@@ -35,17 +35,14 @@
 
 public class LastMessage implements IOMRMElement {
 
-	private SOAPFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	public LastMessage(SOAPFactory factory,String namespaceValue) throws SandeshaException {
+	public LastMessage(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 
@@ -67,8 +64,6 @@
 	public OMElement toOMElement(OMElement sequenceElement) throws OMException {
 
 		OMFactory factory = sequenceElement.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement lastMessageElement = factory.createOMElement(
@@ -83,7 +78,7 @@
 			return true;
 		
 		//TODO is this optional or not required.
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessageNumber.java Tue Sep  5 20:31:41 2006
@@ -36,17 +36,14 @@
 	
 	private long messageNumber;
 	
-	private OMFactory defaultFactory;
-	
 	private String namespaceValue = null;
 	
-	public MessageNumber(OMFactory factory,String namespaceValue) throws SandeshaException {
+	public MessageNumber(String namespaceValue) throws SandeshaException {
 		if (!isNamespaceSupported(namespaceValue))
 			throw new SandeshaException (SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 	
@@ -78,8 +75,6 @@
 		}
 		
 		OMFactory factory = element.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement messageNoElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.MSG_NUMBER,rmNamespace);
@@ -97,7 +92,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Nack.java Tue Sep  5 20:31:41 2006
@@ -35,8 +35,6 @@
 	
 	private long nackNumber;
 	
-	private SOAPFactory defaultFactory;
-	
 	private String namespaceValue = null;
 		
 	public Nack(SOAPFactory factory,String namespaceValue) throws SandeshaException {
@@ -45,7 +43,6 @@
 					SandeshaMessageKeys.unknownSpec,
 					namespaceValue));
 		
-		this.defaultFactory = factory;
 		this.namespaceValue = namespaceValue;
 	}
 	
@@ -80,8 +77,6 @@
 					SandeshaMessageKeys.nackDoesNotContainValidLongValue));
 		
 		OMFactory factory = sequenceAckElement.getOMFactory();
-		if (factory==null)
-			factory = defaultFactory;
 		
 		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
 		OMElement nackElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.NACK,rmNamespace);
@@ -103,7 +98,7 @@
 		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
 			return true;
 		
-		if (Sandesha2Constants.SPEC_2005_10.NS_URI.equals(namespaceName))
+		if (Sandesha2Constants.SPEC_2006_08.NS_URI.equals(namespaceName))
 			return true;
 		
 		return false;

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java?view=diff&rev=440594&r1=440593&r2=440594
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java Tue Sep  5 20:31:41 2006
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import javax.swing.text.StyledEditorKit.ItalicAction;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
@@ -56,7 +55,6 @@
 	private CloseSequence closeSequence = null;
 	private CloseSequenceResponse closeSequenceResponse = null;
 	private AckRequested ackRequested = null;
-	private SOAPFactory factory = null;
 	private String rmNamespaceValue = null;
 	private String addressingNamespaceValue = null;
 	
@@ -108,7 +106,7 @@
 		OMElement sequenceElement = envelope.getHeader().getFirstChildWithName(
 				new QName(rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE));
 		if (sequenceElement != null) {
-			sequence = new Sequence(factory,rmNamespaceValue);
+			sequence = new Sequence(rmNamespaceValue);
 			sequence.fromOMElement(envelope.getHeader());
 		}
 
@@ -135,7 +133,7 @@
 						new QName(rmNamespaceValue,
 								Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
 		if (terminateSeqElement != null) {
-			terminateSequence = new TerminateSequence(factory,rmNamespaceValue);
+			terminateSequence = new TerminateSequence(rmNamespaceValue);
 			terminateSequence.fromOMElement(envelope.getBody());
 		}
 		
@@ -144,7 +142,7 @@
 						new QName(rmNamespaceValue,
 								Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
 		if (terminateSeqResponseElement != null) {
-				terminateSequenceResponse = new TerminateSequenceResponse (factory,rmNamespaceValue);
+				terminateSequenceResponse = new TerminateSequenceResponse (rmNamespaceValue);
 				terminateSequenceResponse.fromOMElement(envelope.getBody());
 		}
 
@@ -153,7 +151,7 @@
 						new QName(rmNamespaceValue,
 								Sandesha2Constants.WSRM_COMMON.ACK_REQUESTED));
 		if (ackRequestedElement != null) {
-			ackRequested = new AckRequested(factory,rmNamespaceValue);
+			ackRequested = new AckRequested(rmNamespaceValue);
 			ackRequested.fromOMElement(envelope.getHeader());
 		}
 		
@@ -292,9 +290,9 @@
 			if (headers!=null && headers.size()>0)
 				return Sandesha2Constants.SPEC_2005_02.NS_URI;
 			
-			headers = header.getHeaderBlocksWithNSURI(Sandesha2Constants.SPEC_2005_10.NS_URI);
+			headers = header.getHeaderBlocksWithNSURI(Sandesha2Constants.SPEC_2006_08.NS_URI);
 			if (headers!=null && headers.size()>0)
-				return Sandesha2Constants.SPEC_2005_10.NS_URI;
+				return Sandesha2Constants.SPEC_2006_08.NS_URI;
 		}
 		
 		//rm control messages with parts in the body will be identified by the wsa:action.
@@ -310,20 +308,20 @@
 		if (action.equals(Sandesha2Constants.SPEC_2005_02.Actions.ACTION_TERMINATE_SEQUENCE))
 			return Sandesha2Constants.SPEC_2005_02.NS_URI;
 		
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE_RESPONSE))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CLOSE_SEQUENCE))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE_RESPONSE))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
-		if (action.equals(Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CLOSE_SEQUENCE_RESPONSE))
-			return Sandesha2Constants.SPEC_2005_10.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CREATE_SEQUENCE_RESPONSE))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_TERMINATE_SEQUENCE_RESPONSE))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
+		if (action.equals(Sandesha2Constants.SPEC_2006_08.Actions.ACTION_CLOSE_SEQUENCE_RESPONSE))
+			return Sandesha2Constants.SPEC_2006_08.NS_URI;
 		
 		return null;   //a version could not be found
 	}



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