You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by di...@apache.org on 2007/08/09 02:51:42 UTC

svn commit: r564061 [9/15] - in /webservices/sandesha/branches/sandesha2/java/1_3: ./ modules/client/ modules/core/ modules/core/src/main/java/org/apache/sandesha2/ modules/core/src/main/java/org/apache/sandesha2/client/ modules/core/src/main/java/org/...

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Wed Aug  8 17:51:29 2007
@@ -1,286 +1,286 @@
-/*
- * Copyright  1999-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.sandesha2.wsrm;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.i18n.SandeshaMessageHelper;
-import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.util.SpecSpecificConstants;
-
-/**
- * Adds the SequenceAcknowledgement header block.
- */
-
-public class SequenceAcknowledgement implements IOMRMPart {
-	
-	private Identifier identifier;
-	private ArrayList acknowledgementRangeList;
-	private ArrayList nackList;
-	private String namespaceValue = null;
-	private AckNone ackNone = null;
-	private AckFinal ackFinal = null;
-	
-	public SequenceAcknowledgement(String namespaceValue) throws SandeshaException {
-		if (!isNamespaceSupported(namespaceValue))
-			throw new SandeshaException (SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.unknownSpec,
-					namespaceValue));
-		
-		this.namespaceValue = namespaceValue;
-		acknowledgementRangeList = new ArrayList();
-		nackList = new ArrayList();
-	}
-
-	public String getNamespaceValue() {
-		return namespaceValue;
-	}
-
-	public Object fromOMElement(OMElement sequenceAckElement) throws OMException,SandeshaException {
-
-		identifier = new Identifier(namespaceValue);
-		identifier.fromOMElement(sequenceAckElement);
-
-		Iterator ackRangeParts = sequenceAckElement.getChildrenWithName(new QName(
-				namespaceValue, Sandesha2Constants.WSRM_COMMON.ACK_RANGE));
-
-		while (ackRangeParts.hasNext()) {
-			OMElement ackRangePart = (OMElement) ackRangeParts.next();
-
-			AcknowledgementRange ackRange = new AcknowledgementRange(namespaceValue);
-			ackRange.fromOMElement(ackRangePart);
-			acknowledgementRangeList.add(ackRange);
-		}
-
-		Iterator nackParts = sequenceAckElement.getChildrenWithName(new QName(
-				namespaceValue, Sandesha2Constants.WSRM_COMMON.NACK));
-
-		while (nackParts.hasNext()) {
-			OMElement nackPart = (OMElement) nackParts.next();
-			Nack nack = new Nack(namespaceValue);
-			nack.fromOMElement(nackPart);
-			nackList.add(nack);
-		}
-
-		String rmSpecVersion = SpecSpecificConstants.getSpecVersionString (namespaceValue);
-		
-		if (SpecSpecificConstants.isAckFinalAllowed(rmSpecVersion)) {
-			OMElement ackFinalPart = sequenceAckElement.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.FINAL));
-			if (ackFinalPart!=null) {
-				ackFinal = new AckFinal (namespaceValue);
-				ackFinal.fromOMElement(sequenceAckElement);
-			}
-		}
-		
-		if (SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
-			OMElement ackNonePart = sequenceAckElement.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.NONE));
-			if (ackNonePart!=null) {
-				ackNone = new AckNone (namespaceValue);
-				ackNone.fromOMElement(sequenceAckElement);
-			}
-		}
-		
-    // Indicate that we have processed this part of the message.
-    ((SOAPHeaderBlock)sequenceAckElement).setProcessed();
-
-    
-		return this;
-	}
-
-	public OMElement toOMElement(OMElement header) throws OMException,SandeshaException {
-
-		if (header == null || !(header instanceof SOAPHeader))
-			throw new OMException();
-
-		OMFactory factory = header.getOMFactory();
-		
-		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
-		
-		//If there already is an ack for this sequence it will be removed. 
-		//We do not allow to send two sequenceAcknowledgements for the same sequence in the same message.
-		Iterator oldAckIter = header.getChildrenWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
-		while (oldAckIter.hasNext()) {
-			
-			OMElement oldAckElement = (OMElement) oldAckIter.next();
-			
-			SequenceAcknowledgement oldSequenceAcknowledgement = new SequenceAcknowledgement (namespaceValue);
-			oldSequenceAcknowledgement.fromOMElement(oldAckElement);
-			
-			String oldAckIdentifier = oldSequenceAcknowledgement.getIdentifier().getIdentifier();
-			if (oldAckIdentifier!=null && oldAckIdentifier.equals(this.identifier.getIdentifier())) {
-				oldAckElement.detach();
-			}
-		}
-		
-		SOAPHeader SOAPHeader = (SOAPHeader) header;
-		SOAPHeaderBlock sequenceAcknowledgementHeaderBlock = SOAPHeader.addHeaderBlock(
-				Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK,rmNamespace);
-		
-		if (sequenceAcknowledgementHeaderBlock == null)
-			throw new OMException("Cant set sequence acknowledgement since the element is null");
-
-		if (identifier == null)
-			throw new OMException(
-					SandeshaMessageHelper.getMessage(
-							SandeshaMessageKeys.invalidIdentifier,
-							header.toString()));
-
-    // SequenceACK messages should always have the MustUnderstand flag set to true
-		sequenceAcknowledgementHeaderBlock.setMustUnderstand(true);
-		identifier.toOMElement(sequenceAcknowledgementHeaderBlock);
-
-		Iterator ackRangeIt = acknowledgementRangeList.iterator();
-		while (ackRangeIt.hasNext()) {
-			AcknowledgementRange ackRange = (AcknowledgementRange) ackRangeIt
-					.next();
-			ackRange.toOMElement(sequenceAcknowledgementHeaderBlock);
-		}
-
-		Iterator nackIt = nackList.iterator();
-		while (nackIt.hasNext()) {
-			Nack nack = (Nack) nackIt.next();
-			nack.toOMElement(sequenceAcknowledgementHeaderBlock);
-		}
-		
-		String rmSpecVersion = SpecSpecificConstants.getSpecVersionString(namespaceValue);
-
-		//setting a 'None' when nothing is there (for the correct RM version)
-		if (ackNone==null && acknowledgementRangeList.size()==0 && nackList.size()==0 && SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
-			ackNone = new AckNone (namespaceValue);
-		}
-		
-		if (ackNone!=null) {
-			if (!SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
-				throw new SandeshaException (SandeshaMessageHelper.getMessage(
-						SandeshaMessageKeys.noneNotAllowedNamespace,
-						rmSpecVersion));
-			}
-			
-			if (acknowledgementRangeList.size()>0) {
-				throw new SandeshaException (SandeshaMessageHelper.getMessage(
-						SandeshaMessageKeys.noneNotAllowedAckRangesPresent));
-			}
-			
-			if (nackList.size()>0) {
-				throw new SandeshaException (SandeshaMessageHelper.getMessage(
-						SandeshaMessageKeys.noneNotAllowedNackPresent));
-			}
-			
-			ackNone.toOMElement(sequenceAcknowledgementHeaderBlock);
-		}
-		
-		if (ackFinal!=null) {
-			if (!SpecSpecificConstants.isAckFinalAllowed(rmSpecVersion)) {
-				throw new SandeshaException (SandeshaMessageHelper.getMessage(
-						SandeshaMessageKeys.finalNotAllowedNamespace));
-			}
-			
-			if (nackList.size()>0) {
-				throw new SandeshaException (SandeshaMessageHelper.getMessage(
-						SandeshaMessageKeys.cannotHaveFinalWithNack));
-			}
-			
-			ackFinal.toOMElement(sequenceAcknowledgementHeaderBlock);
-		}
-		
-		return header;
-	}
-
-	public void setIdentifier(Identifier identifier) {
-		this.identifier = identifier;
-	}
-
-	public void setAckRanges(ArrayList acknowledgementRagngesList) {
-		acknowledgementRangeList = acknowledgementRagngesList;
-	}
-
-	public Nack addNackRanges(Nack nack) {
-		nackList.add(nack);
-		return nack;
-	}
-
-	public AcknowledgementRange addAcknowledgementRanges(
-			AcknowledgementRange ackRange) {
-		acknowledgementRangeList.add(ackRange);
-		return ackRange;
-	}
-
-	public Identifier getIdentifier() {
-		return identifier;
-	}
-
-	public List getAcknowledgementRanges() {
-		return acknowledgementRangeList;
-	}
-
-	public List getNackList() {
-		return nackList;
-	}
-
-	public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
-		SOAPHeader header = envelope.getHeader();
-		
-		if (header==null) {
-			SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
-			header = factory.createSOAPHeader(envelope);
-		}
-		
-		toOMElement(header);
-	}
-
-	public boolean isNamespaceSupported (String namespaceName) {
-		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		return false;
-	}
-
-	public AckFinal getAckFinal() {
-		return ackFinal;
-	}
-
-	public void setAckFinal(AckFinal ackFinal) {
-		this.ackFinal = ackFinal;
-	}
-
-	public AckNone getAckNone() {
-		return ackNone;
-	}
-
-	public void setAckNone(AckNone ackNone) {
-		this.ackNone = ackNone;
-	}
-	
-}
+/*
+ * Copyright  1999-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.wsrm;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+import org.apache.sandesha2.util.SpecSpecificConstants;
+
+/**
+ * Adds the SequenceAcknowledgement header block.
+ */
+
+public class SequenceAcknowledgement implements IOMRMPart {
+	
+	private Identifier identifier;
+	private ArrayList acknowledgementRangeList;
+	private ArrayList nackList;
+	private String namespaceValue = null;
+	private AckNone ackNone = null;
+	private AckFinal ackFinal = null;
+	
+	public SequenceAcknowledgement(String namespaceValue) throws SandeshaException {
+		if (!isNamespaceSupported(namespaceValue))
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.unknownSpec,
+					namespaceValue));
+		
+		this.namespaceValue = namespaceValue;
+		acknowledgementRangeList = new ArrayList();
+		nackList = new ArrayList();
+	}
+
+	public String getNamespaceValue() {
+		return namespaceValue;
+	}
+
+	public Object fromOMElement(OMElement sequenceAckElement) throws OMException,SandeshaException {
+
+		identifier = new Identifier(namespaceValue);
+		identifier.fromOMElement(sequenceAckElement);
+
+		Iterator ackRangeParts = sequenceAckElement.getChildrenWithName(new QName(
+				namespaceValue, Sandesha2Constants.WSRM_COMMON.ACK_RANGE));
+
+		while (ackRangeParts.hasNext()) {
+			OMElement ackRangePart = (OMElement) ackRangeParts.next();
+
+			AcknowledgementRange ackRange = new AcknowledgementRange(namespaceValue);
+			ackRange.fromOMElement(ackRangePart);
+			acknowledgementRangeList.add(ackRange);
+		}
+
+		Iterator nackParts = sequenceAckElement.getChildrenWithName(new QName(
+				namespaceValue, Sandesha2Constants.WSRM_COMMON.NACK));
+
+		while (nackParts.hasNext()) {
+			OMElement nackPart = (OMElement) nackParts.next();
+			Nack nack = new Nack(namespaceValue);
+			nack.fromOMElement(nackPart);
+			nackList.add(nack);
+		}
+
+		String rmSpecVersion = SpecSpecificConstants.getSpecVersionString (namespaceValue);
+		
+		if (SpecSpecificConstants.isAckFinalAllowed(rmSpecVersion)) {
+			OMElement ackFinalPart = sequenceAckElement.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.FINAL));
+			if (ackFinalPart!=null) {
+				ackFinal = new AckFinal (namespaceValue);
+				ackFinal.fromOMElement(sequenceAckElement);
+			}
+		}
+		
+		if (SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
+			OMElement ackNonePart = sequenceAckElement.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.NONE));
+			if (ackNonePart!=null) {
+				ackNone = new AckNone (namespaceValue);
+				ackNone.fromOMElement(sequenceAckElement);
+			}
+		}
+		
+    // Indicate that we have processed this part of the message.
+    ((SOAPHeaderBlock)sequenceAckElement).setProcessed();
+
+    
+		return this;
+	}
+
+	public OMElement toOMElement(OMElement header) throws OMException,SandeshaException {
+
+		if (header == null || !(header instanceof SOAPHeader))
+			throw new OMException();
+
+		OMFactory factory = header.getOMFactory();
+		
+		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+		
+		//If there already is an ack for this sequence it will be removed. 
+		//We do not allow to send two sequenceAcknowledgements for the same sequence in the same message.
+		Iterator oldAckIter = header.getChildrenWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK));
+		while (oldAckIter.hasNext()) {
+			
+			OMElement oldAckElement = (OMElement) oldAckIter.next();
+			
+			SequenceAcknowledgement oldSequenceAcknowledgement = new SequenceAcknowledgement (namespaceValue);
+			oldSequenceAcknowledgement.fromOMElement(oldAckElement);
+			
+			String oldAckIdentifier = oldSequenceAcknowledgement.getIdentifier().getIdentifier();
+			if (oldAckIdentifier!=null && oldAckIdentifier.equals(this.identifier.getIdentifier())) {
+				oldAckElement.detach();
+			}
+		}
+		
+		SOAPHeader SOAPHeader = (SOAPHeader) header;
+		SOAPHeaderBlock sequenceAcknowledgementHeaderBlock = SOAPHeader.addHeaderBlock(
+				Sandesha2Constants.WSRM_COMMON.SEQUENCE_ACK,rmNamespace);
+		
+		if (sequenceAcknowledgementHeaderBlock == null)
+			throw new OMException("Cant set sequence acknowledgement since the element is null");
+
+		if (identifier == null)
+			throw new OMException(
+					SandeshaMessageHelper.getMessage(
+							SandeshaMessageKeys.invalidIdentifier,
+							header.toString()));
+
+    // SequenceACK messages should always have the MustUnderstand flag set to true
+		sequenceAcknowledgementHeaderBlock.setMustUnderstand(true);
+		identifier.toOMElement(sequenceAcknowledgementHeaderBlock);
+
+		Iterator ackRangeIt = acknowledgementRangeList.iterator();
+		while (ackRangeIt.hasNext()) {
+			AcknowledgementRange ackRange = (AcknowledgementRange) ackRangeIt
+					.next();
+			ackRange.toOMElement(sequenceAcknowledgementHeaderBlock);
+		}
+
+		Iterator nackIt = nackList.iterator();
+		while (nackIt.hasNext()) {
+			Nack nack = (Nack) nackIt.next();
+			nack.toOMElement(sequenceAcknowledgementHeaderBlock);
+		}
+		
+		String rmSpecVersion = SpecSpecificConstants.getSpecVersionString(namespaceValue);
+
+		//setting a 'None' when nothing is there (for the correct RM version)
+		if (ackNone==null && acknowledgementRangeList.size()==0 && nackList.size()==0 && SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
+			ackNone = new AckNone (namespaceValue);
+		}
+		
+		if (ackNone!=null) {
+			if (!SpecSpecificConstants.isAckNoneAllowed(rmSpecVersion)) {
+				throw new SandeshaException (SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.noneNotAllowedNamespace,
+						rmSpecVersion));
+			}
+			
+			if (acknowledgementRangeList.size()>0) {
+				throw new SandeshaException (SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.noneNotAllowedAckRangesPresent));
+			}
+			
+			if (nackList.size()>0) {
+				throw new SandeshaException (SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.noneNotAllowedNackPresent));
+			}
+			
+			ackNone.toOMElement(sequenceAcknowledgementHeaderBlock);
+		}
+		
+		if (ackFinal!=null) {
+			if (!SpecSpecificConstants.isAckFinalAllowed(rmSpecVersion)) {
+				throw new SandeshaException (SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.finalNotAllowedNamespace));
+			}
+			
+			if (nackList.size()>0) {
+				throw new SandeshaException (SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.cannotHaveFinalWithNack));
+			}
+			
+			ackFinal.toOMElement(sequenceAcknowledgementHeaderBlock);
+		}
+		
+		return header;
+	}
+
+	public void setIdentifier(Identifier identifier) {
+		this.identifier = identifier;
+	}
+
+	public void setAckRanges(ArrayList acknowledgementRagngesList) {
+		acknowledgementRangeList = acknowledgementRagngesList;
+	}
+
+	public Nack addNackRanges(Nack nack) {
+		nackList.add(nack);
+		return nack;
+	}
+
+	public AcknowledgementRange addAcknowledgementRanges(
+			AcknowledgementRange ackRange) {
+		acknowledgementRangeList.add(ackRange);
+		return ackRange;
+	}
+
+	public Identifier getIdentifier() {
+		return identifier;
+	}
+
+	public List getAcknowledgementRanges() {
+		return acknowledgementRangeList;
+	}
+
+	public List getNackList() {
+		return nackList;
+	}
+
+	public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
+		SOAPHeader header = envelope.getHeader();
+		
+		if (header==null) {
+			SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
+			header = factory.createSOAPHeader(envelope);
+		}
+		
+		toOMElement(header);
+	}
+
+	public boolean isNamespaceSupported (String namespaceName) {
+		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		return false;
+	}
+
+	public AckFinal getAckFinal() {
+		return ackFinal;
+	}
+
+	public void setAckFinal(AckFinal ackFinal) {
+		this.ackFinal = ackFinal;
+	}
+
+	public AckNone getAckNone() {
+		return ackNone;
+	}
+
+	public void setAckNone(AckNone ackNone) {
+		this.ackNone = ackNone;
+	}
+	
+}

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java Wed Aug  8 17:51:29 2007
@@ -1,127 +1,127 @@
-/*
- * Copyright  1999-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.sandesha2.wsrm;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.i18n.SandeshaMessageHelper;
-import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-
-/**
- * Adds the SequenceFault header block.
- */
-
-public class SequenceFault implements IOMRMPart {
-	
-	private FaultCode faultCode;
-	
-	private String namespaceValue = null;
-
-	public SequenceFault(String namespaceValue) throws SandeshaException {
-		if (!isNamespaceSupported(namespaceValue))
-			throw new SandeshaException (SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.unknownSpec,
-					namespaceValue));
-		
-		this.namespaceValue = namespaceValue;
-	}
-
-	public String getNamespaceValue() {
-		return namespaceValue;
-	}
-
-	public Object fromOMElement(OMElement sequenceFaultPart) throws OMException,SandeshaException {
-
-
-		if (sequenceFaultPart == null)
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.noSeqFaultInElement,
-					null));
-
-		OMElement faultCodePart = sequenceFaultPart
-				.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
-
-		if (faultCodePart != null) {
-			faultCode = new FaultCode(namespaceValue);
-			faultCode.fromOMElement(sequenceFaultPart);
-		}
-
-		((SOAPHeaderBlock)sequenceFaultPart).setProcessed();
-
-		return this;
-	}
-
-	public OMElement toOMElement(OMElement header) throws OMException {
-
-		if (header == null || !(header instanceof SOAPHeader))
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.seqFaultCannotBeExtractedToNonHeader));
-
-		OMFactory factory = header.getOMFactory();
-
-		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
-		OMElement sequenceFaultElement =factory.createOMElement(
-				Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT, rmNamespace);
-		if (faultCode != null)
-			faultCode.toOMElement(sequenceFaultElement);
-
-		header.addChild(sequenceFaultElement);
-
-		return header;
-	}
-
-	public void setFaultCode(FaultCode faultCode) {
-		this.faultCode = faultCode;
-	}
-
-	public FaultCode getFaultCode() {
-		return faultCode;
-	}
-	
-	public boolean isNamespaceSupported (String namespaceName) {
-		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		return false;
-	}
-
-	public void toSOAPEnvelope(SOAPEnvelope envelope) {
-		SOAPHeader header = envelope.getHeader();
-		
-		//detach if already exist.
-		OMElement elem = header.getFirstChildWithName(new QName(namespaceValue,
-				Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT));
-		if (elem!=null)
-			elem.detach();
-		
-		toOMElement(header);
-  }
-
-}
+/*
+ * Copyright  1999-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.wsrm;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+
+/**
+ * Adds the SequenceFault header block.
+ */
+
+public class SequenceFault implements IOMRMPart {
+	
+	private FaultCode faultCode;
+	
+	private String namespaceValue = null;
+
+	public SequenceFault(String namespaceValue) throws SandeshaException {
+		if (!isNamespaceSupported(namespaceValue))
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.unknownSpec,
+					namespaceValue));
+		
+		this.namespaceValue = namespaceValue;
+	}
+
+	public String getNamespaceValue() {
+		return namespaceValue;
+	}
+
+	public Object fromOMElement(OMElement sequenceFaultPart) throws OMException,SandeshaException {
+
+
+		if (sequenceFaultPart == null)
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.noSeqFaultInElement,
+					null));
+
+		OMElement faultCodePart = sequenceFaultPart
+				.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.FAULT_CODE));
+
+		if (faultCodePart != null) {
+			faultCode = new FaultCode(namespaceValue);
+			faultCode.fromOMElement(sequenceFaultPart);
+		}
+
+		((SOAPHeaderBlock)sequenceFaultPart).setProcessed();
+
+		return this;
+	}
+
+	public OMElement toOMElement(OMElement header) throws OMException {
+
+		if (header == null || !(header instanceof SOAPHeader))
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.seqFaultCannotBeExtractedToNonHeader));
+
+		OMFactory factory = header.getOMFactory();
+
+		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+		OMElement sequenceFaultElement =factory.createOMElement(
+				Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT, rmNamespace);
+		if (faultCode != null)
+			faultCode.toOMElement(sequenceFaultElement);
+
+		header.addChild(sequenceFaultElement);
+
+		return header;
+	}
+
+	public void setFaultCode(FaultCode faultCode) {
+		this.faultCode = faultCode;
+	}
+
+	public FaultCode getFaultCode() {
+		return faultCode;
+	}
+	
+	public boolean isNamespaceSupported (String namespaceName) {
+		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		return false;
+	}
+
+	public void toSOAPEnvelope(SOAPEnvelope envelope) {
+		SOAPHeader header = envelope.getHeader();
+		
+		//detach if already exist.
+		OMElement elem = header.getFirstChildWithName(new QName(namespaceValue,
+				Sandesha2Constants.WSRM_COMMON.SEQUENCE_FAULT));
+		if (elem!=null)
+			elem.detach();
+		
+		toOMElement(header);
+  }
+
+}

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceFault.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceOffer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceOffer.java?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceOffer.java Wed Aug  8 17:51:29 2007
@@ -1,150 +1,150 @@
-/*
- * Copyright  1999-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.sandesha2.wsrm;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axis2.AxisFault;
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.i18n.SandeshaMessageHelper;
-import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-
-/**
- * Represents an SequenceOffer element which may be present within a 
- * Create Sequence message.
- */
-
-public class SequenceOffer implements IOMRMElement {
-	
-	private Identifier identifier = null;
-	
-	private Expires expires = null;
-	
-	private Endpoint endpoint = null;
-	
-	private String namespaceValue = null;
-	
-	public SequenceOffer(String namespaceValue) throws SandeshaException {
-		if (!isNamespaceSupported(namespaceValue))
-			throw new SandeshaException (SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.unknownSpec,
-					namespaceValue));
-		
-		this.namespaceValue = namespaceValue;
-	}
-
-	public String getNamespaceValue() {
-		return namespaceValue;
-	}
-
-	public Object fromOMElement(OMElement createSequenceElement)
-			throws OMException,AxisFault {
-		
-		OMElement sequenceOfferPart = createSequenceElement
-				.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER));
-		if (sequenceOfferPart == null)
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.noSeqOfferInElement,
-					createSequenceElement.toString()));
-
-		identifier = new Identifier(namespaceValue);
-		identifier.fromOMElement(sequenceOfferPart);
-
-		OMElement expiresPart = sequenceOfferPart
-				.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.EXPIRES));
-		if (expiresPart != null) {
-			expires = new Expires(namespaceValue);
-			expires.fromOMElement(sequenceOfferPart);
-		}
-		
-		OMElement endpointPart = sequenceOfferPart
-				.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.ENDPOINT));
-		if (endpointPart != null) {
-			endpoint = new Endpoint (namespaceValue);
-			endpoint.fromOMElement (endpointPart);
-		}
-
-		return this;
-	}
-
-	public OMElement toOMElement(OMElement createSequenceElement)
-			throws OMException,AxisFault {
-
-		if (identifier == null)
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.nullMsgId));
-
-		OMFactory factory = createSequenceElement.getOMFactory();
-		
-		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
-		OMElement sequenceOfferElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER, rmNamespace);
-		
-		identifier.toOMElement(sequenceOfferElement);
-
-		if (endpoint!=null) {
-			endpoint.toOMElement(sequenceOfferElement);
-		} else {
-			if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceValue)) {
-				String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.elementMustForSpec,
-						Sandesha2Constants.WSRM_COMMON.ENDPOINT,
-						Sandesha2Constants.SPEC_2007_02.NS_URI);
-				throw new SandeshaException (message);
-			}
-		}
-		
-		if (expires != null) {
-			expires.toOMElement(sequenceOfferElement);
-		}
-
-		createSequenceElement.addChild(sequenceOfferElement);
-
-		return createSequenceElement;
-	}
-
-	public Identifier getIdentifer() {
-		return identifier;
-	}
-
-	public void setIdentifier(Identifier identifier) {
-		this.identifier = identifier;
-	}
-	
-	public Endpoint getEndpoint() {
-		return endpoint;
-	}
-
-	public void setEndpoint(Endpoint endpoint) {
-		this.endpoint = endpoint;
-	}
-
-	public boolean isNamespaceSupported (String namespaceName) {
-		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		return false;
-	}
-
-}
+/*
+ * Copyright  1999-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.wsrm;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axis2.AxisFault;
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+
+/**
+ * Represents an SequenceOffer element which may be present within a 
+ * Create Sequence message.
+ */
+
+public class SequenceOffer implements IOMRMElement {
+	
+	private Identifier identifier = null;
+	
+	private Expires expires = null;
+	
+	private Endpoint endpoint = null;
+	
+	private String namespaceValue = null;
+	
+	public SequenceOffer(String namespaceValue) throws SandeshaException {
+		if (!isNamespaceSupported(namespaceValue))
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.unknownSpec,
+					namespaceValue));
+		
+		this.namespaceValue = namespaceValue;
+	}
+
+	public String getNamespaceValue() {
+		return namespaceValue;
+	}
+
+	public Object fromOMElement(OMElement createSequenceElement)
+			throws OMException,AxisFault {
+		
+		OMElement sequenceOfferPart = createSequenceElement
+				.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER));
+		if (sequenceOfferPart == null)
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.noSeqOfferInElement,
+					createSequenceElement.toString()));
+
+		identifier = new Identifier(namespaceValue);
+		identifier.fromOMElement(sequenceOfferPart);
+
+		OMElement expiresPart = sequenceOfferPart
+				.getFirstChildWithName(new QName(namespaceValue,Sandesha2Constants.WSRM_COMMON.EXPIRES));
+		if (expiresPart != null) {
+			expires = new Expires(namespaceValue);
+			expires.fromOMElement(sequenceOfferPart);
+		}
+		
+		OMElement endpointPart = sequenceOfferPart
+				.getFirstChildWithName(new QName (namespaceValue,Sandesha2Constants.WSRM_COMMON.ENDPOINT));
+		if (endpointPart != null) {
+			endpoint = new Endpoint (namespaceValue);
+			endpoint.fromOMElement (endpointPart);
+		}
+
+		return this;
+	}
+
+	public OMElement toOMElement(OMElement createSequenceElement)
+			throws OMException,AxisFault {
+
+		if (identifier == null)
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.nullMsgId));
+
+		OMFactory factory = createSequenceElement.getOMFactory();
+		
+		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+		OMElement sequenceOfferElement = factory.createOMElement(Sandesha2Constants.WSRM_COMMON.SEQUENCE_OFFER, rmNamespace);
+		
+		identifier.toOMElement(sequenceOfferElement);
+
+		if (endpoint!=null) {
+			endpoint.toOMElement(sequenceOfferElement);
+		} else {
+			if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceValue)) {
+				String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.elementMustForSpec,
+						Sandesha2Constants.WSRM_COMMON.ENDPOINT,
+						Sandesha2Constants.SPEC_2007_02.NS_URI);
+				throw new SandeshaException (message);
+			}
+		}
+		
+		if (expires != null) {
+			expires.toOMElement(sequenceOfferElement);
+		}
+
+		createSequenceElement.addChild(sequenceOfferElement);
+
+		return createSequenceElement;
+	}
+
+	public Identifier getIdentifer() {
+		return identifier;
+	}
+
+	public void setIdentifier(Identifier identifier) {
+		this.identifier = identifier;
+	}
+	
+	public Endpoint getEndpoint() {
+		return endpoint;
+	}
+
+	public void setEndpoint(Endpoint endpoint) {
+		this.endpoint = endpoint;
+	}
+
+	public boolean isNamespaceSupported (String namespaceName) {
+		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		return false;
+	}
+
+}

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceOffer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequence.java?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequence.java Wed Aug  8 17:51:29 2007
@@ -1,128 +1,128 @@
-/*
- * Copyright  1999-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.sandesha2.wsrm;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.i18n.SandeshaMessageHelper;
-import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-
-/**
- * Adds the Terminate Sequence body part.
- */
-
-public class TerminateSequence implements IOMRMPart {
-
-	private Identifier identifier;
-	
-	private String namespaceValue = null;
-	
-	public TerminateSequence(String namespaceValue) throws SandeshaException {
-		if (!isNamespaceSupported(namespaceValue))
-			throw new SandeshaException (SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.unknownSpec,
-					namespaceValue));
-		
-		this.namespaceValue = namespaceValue;
-	}
-
-	public String getNamespaceValue() {
-		return namespaceValue;
-	}
-
-	public Object fromOMElement(OMElement body) throws OMException,SandeshaException {
-
-		if (!(body instanceof SOAPBody))
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
-
-		OMElement terminateSeqPart = body.getFirstChildWithName(new QName(
-				namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
-
-		if (terminateSeqPart == null)
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.noTerminateSeqInElement,
-					body.toString()));
-
-		identifier = new Identifier(namespaceValue);
-		identifier.fromOMElement(terminateSeqPart);
-
-		return this;
-	}
-
-	public OMElement toOMElement(OMElement body) throws OMException {
-
-		if (body == null || !(body instanceof SOAPBody))
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
-
-		if (identifier == null)
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.nullMsgId));
-
-		OMFactory factory= body.getOMFactory();
-		
-		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
-		OMElement terminateSequenceElement = factory.createOMElement(
-				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE, rmNamespace);
-		
-		identifier.toOMElement(terminateSequenceElement);
-		body.addChild(terminateSequenceElement);
-
-		return body;
-	}
-
-	public Identifier getIdentifier() {
-		return identifier;
-	}
-
-	public void setIdentifier(Identifier identifier) {
-		this.identifier = identifier;
-	}
-
-	public void toSOAPEnvelope(SOAPEnvelope envelope) {
-		SOAPBody body = envelope.getBody();
-		
-		//detach if already exist.
-		OMElement elem = body.getFirstChildWithName(new QName(namespaceValue,
-				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
-		if (elem!=null)
-			elem.detach();
-		
-		toOMElement(body);
-	}
-	
-	public boolean isNamespaceSupported (String namespaceName) {
-		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		return false;
-	}
-	
-}
+/*
+ * Copyright  1999-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.wsrm;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPBody;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+
+/**
+ * Adds the Terminate Sequence body part.
+ */
+
+public class TerminateSequence implements IOMRMPart {
+
+	private Identifier identifier;
+	
+	private String namespaceValue = null;
+	
+	public TerminateSequence(String namespaceValue) throws SandeshaException {
+		if (!isNamespaceSupported(namespaceValue))
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.unknownSpec,
+					namespaceValue));
+		
+		this.namespaceValue = namespaceValue;
+	}
+
+	public String getNamespaceValue() {
+		return namespaceValue;
+	}
+
+	public Object fromOMElement(OMElement body) throws OMException,SandeshaException {
+
+		if (!(body instanceof SOAPBody))
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
+
+		OMElement terminateSeqPart = body.getFirstChildWithName(new QName(
+				namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
+
+		if (terminateSeqPart == null)
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.noTerminateSeqInElement,
+					body.toString()));
+
+		identifier = new Identifier(namespaceValue);
+		identifier.fromOMElement(terminateSeqPart);
+
+		return this;
+	}
+
+	public OMElement toOMElement(OMElement body) throws OMException {
+
+		if (body == null || !(body instanceof SOAPBody))
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.terminateSeqCannotBeAddedToNonBody));
+
+		if (identifier == null)
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.nullMsgId));
+
+		OMFactory factory= body.getOMFactory();
+		
+		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+		OMElement terminateSequenceElement = factory.createOMElement(
+				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE, rmNamespace);
+		
+		identifier.toOMElement(terminateSequenceElement);
+		body.addChild(terminateSequenceElement);
+
+		return body;
+	}
+
+	public Identifier getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(Identifier identifier) {
+		this.identifier = identifier;
+	}
+
+	public void toSOAPEnvelope(SOAPEnvelope envelope) {
+		SOAPBody body = envelope.getBody();
+		
+		//detach if already exist.
+		OMElement elem = body.getFirstChildWithName(new QName(namespaceValue,
+				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE));
+		if (elem!=null)
+			elem.detach();
+		
+		toOMElement(body);
+	}
+	
+	public boolean isNamespaceSupported (String namespaceName) {
+		if (Sandesha2Constants.SPEC_2005_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		return false;
+	}
+	
+}

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequence.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java Wed Aug  8 17:51:29 2007
@@ -1,127 +1,127 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- *  
- */
-
-package org.apache.sandesha2.wsrm;
-
-import javax.xml.namespace.QName;
-
-import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.i18n.SandeshaMessageHelper;
-import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPEnvelope;
-
-/**
- * Adds the Terminate Sequence Response body part.
- */
-
-public class TerminateSequenceResponse implements IOMRMPart {
-
-	private Identifier identifier;
-	
-	private String namespaceValue = null;
-	
-	public TerminateSequenceResponse(String namespaceValue) throws SandeshaException {
-		if (!isNamespaceSupported(namespaceValue))
-			throw new SandeshaException (SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.unknownSpec,
-					namespaceValue));
-		
-		this.namespaceValue = namespaceValue;
-	}
-	
-	public String getNamespaceValue() {
-		return namespaceValue;
-	}
-
-	public Object fromOMElement(OMElement body) throws OMException,SandeshaException {
-
-		if (!(body instanceof SOAPBody))
-			throw new OMException(
-					SandeshaMessageHelper.getMessage(
-							SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
-
-		OMElement terminateSeqResponsePart = body.getFirstChildWithName(new QName(
-				namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
-
-		if (terminateSeqResponsePart == null)
-			throw new OMException(
-					SandeshaMessageHelper.getMessage(
-							SandeshaMessageKeys.noTerminateSeqResponseInElement,
-							body.toString()));
-
-		identifier = new Identifier(namespaceValue);
-		identifier.fromOMElement(terminateSeqResponsePart);
-
-		return this;
-	}
-
-	public OMElement toOMElement(OMElement body) throws OMException {
-
-		if (body == null || !(body instanceof SOAPBody))
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
-
-		if (identifier == null)
-			throw new OMException(SandeshaMessageHelper.getMessage(
-					SandeshaMessageKeys.nullMsgId));
-
-		OMFactory factory = body.getOMFactory();
-		
-		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
-		OMElement terminateSequenceResponseElement = factory.createOMElement(
-				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE, rmNamespace);
-		
-		identifier.toOMElement(terminateSequenceResponseElement);
-		body.addChild(terminateSequenceResponseElement);
-
-		return body;
-	}
-
-	public Identifier getIdentifier() {
-		return identifier;
-	}
-
-	public void setIdentifier(Identifier identifier) {
-		this.identifier = identifier;
-	}
-
-	public void toSOAPEnvelope(SOAPEnvelope envelope) {
-		SOAPBody body = envelope.getBody();
-		
-		//detach if already exist.
-		OMElement elem = body.getFirstChildWithName(new QName(namespaceValue,
-				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
-		if (elem!=null)
-			elem.detach();
-		
-		toOMElement(body);
-	}
-	
-	public boolean isNamespaceSupported (String namespaceName) {
-		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
-			return true;
-		
-		return false;
-	}
-	
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *  
+ */
+
+package org.apache.sandesha2.wsrm;
+
+import javax.xml.namespace.QName;
+
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPBody;
+import org.apache.axiom.soap.SOAPEnvelope;
+
+/**
+ * Adds the Terminate Sequence Response body part.
+ */
+
+public class TerminateSequenceResponse implements IOMRMPart {
+
+	private Identifier identifier;
+	
+	private String namespaceValue = null;
+	
+	public TerminateSequenceResponse(String namespaceValue) throws SandeshaException {
+		if (!isNamespaceSupported(namespaceValue))
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.unknownSpec,
+					namespaceValue));
+		
+		this.namespaceValue = namespaceValue;
+	}
+	
+	public String getNamespaceValue() {
+		return namespaceValue;
+	}
+
+	public Object fromOMElement(OMElement body) throws OMException,SandeshaException {
+
+		if (!(body instanceof SOAPBody))
+			throw new OMException(
+					SandeshaMessageHelper.getMessage(
+							SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
+
+		OMElement terminateSeqResponsePart = body.getFirstChildWithName(new QName(
+				namespaceValue, Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
+
+		if (terminateSeqResponsePart == null)
+			throw new OMException(
+					SandeshaMessageHelper.getMessage(
+							SandeshaMessageKeys.noTerminateSeqResponseInElement,
+							body.toString()));
+
+		identifier = new Identifier(namespaceValue);
+		identifier.fromOMElement(terminateSeqResponsePart);
+
+		return this;
+	}
+
+	public OMElement toOMElement(OMElement body) throws OMException {
+
+		if (body == null || !(body instanceof SOAPBody))
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.terminateSeqResponseCannotBeAddedToNonBody));
+
+		if (identifier == null)
+			throw new OMException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.nullMsgId));
+
+		OMFactory factory = body.getOMFactory();
+		
+		OMNamespace rmNamespace = factory.createOMNamespace(namespaceValue,Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+		OMElement terminateSequenceResponseElement = factory.createOMElement(
+				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE, rmNamespace);
+		
+		identifier.toOMElement(terminateSequenceResponseElement);
+		body.addChild(terminateSequenceResponseElement);
+
+		return body;
+	}
+
+	public Identifier getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(Identifier identifier) {
+		this.identifier = identifier;
+	}
+
+	public void toSOAPEnvelope(SOAPEnvelope envelope) {
+		SOAPBody body = envelope.getBody();
+		
+		//detach if already exist.
+		OMElement elem = body.getFirstChildWithName(new QName(namespaceValue,
+				Sandesha2Constants.WSRM_COMMON.TERMINATE_SEQUENCE_RESPONSE));
+		if (elem!=null)
+			elem.detach();
+		
+		toOMElement(body);
+	}
+	
+	public boolean isNamespaceSupported (String namespaceName) {
+		if (Sandesha2Constants.SPEC_2007_02.NS_URI.equals(namespaceName))
+			return true;
+		
+		return false;
+	}
+	
+}

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/TerminateSequenceResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/pom.xml?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/pom.xml Wed Aug  8 17:51:29 2007
@@ -1,84 +1,84 @@
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-	<groupId>org.apache.sandesha2</groupId>
-	<artifactId>sandesha2-parent</artifactId>
-        <version>1.3-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.sandesha2</groupId>
-    <artifactId>distribution</artifactId>
-    <name>Sandesha2 - Distribution</name>
-    <description>Sandesha2 - Distribution</description>
-    <packaging>pom</packaging>
-
-    <build>
-    <plugins>
-	<plugin>
-	    <groupId>org.apache.maven.plugins</groupId>
-	    <artifactId>maven-antrun-plugin</artifactId>
-	    <version>1.1</version>
-	    <inherited>false</inherited>
-	    <executions>
-		    <execution>
-			    <id>javadoc-generation</id>
-			    <phase>package</phase>
-			    <configuration>
-				    <tasks>
-					    <mkdir dir="${basedir}/target/docs/apidocs"/>
-					    <javadoc packagenames="org.apache.sandesha2.*"
-							     destdir="${basedir}/target/docs/apidocs"
-							     classpathref="maven.runtime.classpath"
-							     author="true"
-							     version="true"
-							     use="true"
-							     windowtitle="Sandesha2 API"
-							     doctitle="Sandesha2"
-							     bottom="Copyright &#169; 2007 Apache Web Services Project. All Rights Reserved."
-							     >
-							    <packageset dir="../../modules/core/src/main/java" defaultexcludes="yes">
-								    <include name="org/apache/sandesha2/**"/>
-							    </packageset>
-							    <packageset dir="../../modules/interop/src/main/java" defaultexcludes="yes">
-								    <include name="org/apache/sandesha2/**"/>
-							    </packageset>    
-							    <packageset dir="../../modules/rampart-integration/src/main/java" defaultexcludes="yes">
-								    <include name="org/apache/sandesha2/**"/>
-							    </packageset>							
-					      </javadoc>
-				        </tasks>
-				    </configuration>
-				    <goals>
-					    <goal>run</goal>
-				    </goals>
-			    </execution>
-		    </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.1</version>
-            <executions>
-                <execution>
-                    <id>distribution-package</id>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>single</goal>
-                    </goals>
-                    <configuration>
-                        <descriptors>
-                            <descriptor>src/main/assembly/bin.xml</descriptor>
-                            <descriptor>src/main/assembly/src.xml</descriptor>
-			    <descriptor>src/main/assembly/doc.xml</descriptor>
-                        </descriptors>
-                        <finalName>sandesha2-${version}</finalName>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-</build>
-</project>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+	<groupId>org.apache.sandesha2</groupId>
+	<artifactId>sandesha2-parent</artifactId>
+        <version>1.3-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.sandesha2</groupId>
+    <artifactId>distribution</artifactId>
+    <name>Sandesha2 - Distribution</name>
+    <description>Sandesha2 - Distribution</description>
+    <packaging>pom</packaging>
+
+    <build>
+    <plugins>
+	<plugin>
+	    <groupId>org.apache.maven.plugins</groupId>
+	    <artifactId>maven-antrun-plugin</artifactId>
+	    <version>1.1</version>
+	    <inherited>false</inherited>
+	    <executions>
+		    <execution>
+			    <id>javadoc-generation</id>
+			    <phase>package</phase>
+			    <configuration>
+				    <tasks>
+					    <mkdir dir="${basedir}/target/docs/apidocs"/>
+					    <javadoc packagenames="org.apache.sandesha2.*"
+							     destdir="${basedir}/target/docs/apidocs"
+							     classpathref="maven.runtime.classpath"
+							     author="true"
+							     version="true"
+							     use="true"
+							     windowtitle="Sandesha2 API"
+							     doctitle="Sandesha2"
+							     bottom="Copyright &#169; 2007 Apache Web Services Project. All Rights Reserved."
+							     >
+							    <packageset dir="../../modules/core/src/main/java" defaultexcludes="yes">
+								    <include name="org/apache/sandesha2/**"/>
+							    </packageset>
+							    <packageset dir="../../modules/interop/src/main/java" defaultexcludes="yes">
+								    <include name="org/apache/sandesha2/**"/>
+							    </packageset>    
+							    <packageset dir="../../modules/rampart-integration/src/main/java" defaultexcludes="yes">
+								    <include name="org/apache/sandesha2/**"/>
+							    </packageset>							
+					      </javadoc>
+				        </tasks>
+				    </configuration>
+				    <goals>
+					    <goal>run</goal>
+				    </goals>
+			    </execution>
+		    </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.1</version>
+            <executions>
+                <execution>
+                    <id>distribution-package</id>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>single</goal>
+                    </goals>
+                    <configuration>
+                        <descriptors>
+                            <descriptor>src/main/assembly/bin.xml</descriptor>
+                            <descriptor>src/main/assembly/src.xml</descriptor>
+			    <descriptor>src/main/assembly/doc.xml</descriptor>
+                        </descriptors>
+                        <finalName>sandesha2-${version}</finalName>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
+</project>

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/bin.xml?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/bin.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/bin.xml Wed Aug  8 17:51:29 2007
@@ -8,8 +8,8 @@
 
     <fileSets>
         <fileSet>
-            <directory>../..</directory>
-            <outputDirectory>sandesha2-${version}-bin</outputDirectory>
+            <directory>../..</directory>
+            <outputDirectory>sandesha2-${version}-bin</outputDirectory>
             <includes>
                 <include>LICENSE.txt</include>
                 <include>release-notes.html</include>

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/doc.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/src.xml?view=diff&rev=564061&r1=564060&r2=564061
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/src.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/src.xml Wed Aug  8 17:51:29 2007
@@ -1,19 +1,19 @@
-<assembly>
-    <id>src</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>../..</directory>
-            <outputDirectory>sandesha2-${version}-src</outputDirectory>
-            <includes>
+<assembly>
+    <id>src</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>../..</directory>
+            <outputDirectory>sandesha2-${version}-src</outputDirectory>
+            <includes>
                 <include>config/**/*</include>
                 <include>modules/**/*</include>
-                <include>xdocs/**/*</include>
+                <include>xdocs/**/*</include>
                 <include>**/pom.xml</include>
 
 		<!--root level files-->
@@ -22,20 +22,20 @@
                 <include>LICENSE.txt</include>
                 <include>project.properties</include>
                 <include>README.txt</include>
-                <include>release-notes.html</include>
-            </includes>
-            <excludes>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-                <exclude>**/build</exclude>
-                <exclude>**/build/**/*</exclude>
-                <exclude>**/.settings</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/*.iml</exclude>
-                <exclude>**/.settings</exclude>
-                <exclude>**/.settings/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
+                <include>release-notes.html</include>
+            </includes>
+            <excludes>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+                <exclude>**/build</exclude>
+                <exclude>**/build/**/*</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>**/.settings/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
 </assembly>

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/distribution/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/PWCallback.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceCallbackHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceCallbackHandlerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceMessageReceiverInOnly.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceMessageReceiverInOut.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeleton.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeletonImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceStub.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/apache/sandesha2/interop/securerm/SecRMServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/tempuri/EchoString.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/tempuri/EchoStringRequestBodyType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/tempuri/EchoStringResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/tempuri/EchoStringResponseBodyType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/tempuri/ExtensionMapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/main/java/org/tempuri/Ping.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/resources/conf/RMInteropService.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/resources/conf/SecRMInteropService.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/resources/conf/sec-client-axis2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/resources/conf/sec-client-policy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/resources/conf/sec-services.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/sandesha/branches/sandesha2/java/1_3/modules/interop/src/resources/conf/services.xml
------------------------------------------------------------------------------
    svn:eol-style = native



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