You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2005/05/02 06:17:09 UTC

cvs commit: ws-fx/sandesha/src/org/apache/sandesha/ws/utility Identifier.java

jaliya      2005/05/01 21:17:09

  Modified:    sandesha/interop/org/apache/sandesha/samples/interop
                        SyncPingClient.java
               sandesha/src/org/apache/sandesha Constants.java
                        EnvelopeCreator.java RMMessageContext.java
               sandesha/src/org/apache/sandesha/client
                        ClientPropertyValidator.java RMSender.java
               sandesha/src/org/apache/sandesha/server
                        MessageValidator.java RMInvoker.java Sender.java
               sandesha/src/org/apache/sandesha/server/msgprocessors
                        AcknowledgementProcessor.java
                        CreateSequenceProcessor.java FaultProcessor.java
               sandesha/src/org/apache/sandesha/storage/queue
                        SandeshaQueue.java
               sandesha/src/org/apache/sandesha/util RMMessageCreator.java
               sandesha/src/org/apache/sandesha/ws/rm AckRequested.java
                        Sequence.java
               sandesha/src/org/apache/sandesha/ws/rm/providers
                        RMProvider.java
               sandesha/src/org/apache/sandesha/ws/utility Identifier.java
  Log:
  Changes after interops with IBM and Systinet
  
  Revision  Changes    Path
  1.7       +2 -4      ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/SyncPingClient.java
  
  Index: SyncPingClient.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/SyncPingClient.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SyncPingClient.java	26 Apr 2005 03:24:50 -0000	1.6
  +++ SyncPingClient.java	2 May 2005 04:17:09 -0000	1.7
  @@ -44,11 +44,9 @@
   
               call.setProperty(Constants.ClientProperties.SYNC, new Boolean(true));
               call.setProperty(Constants.ClientProperties.ACTION, "urn:wsrm:Ping");
  +            
  +            call.setProperty(Constants.ClientProperties.FAULT_TO,Constants.WSA.NS_ADDRESSING_ANONYMOUS);
   
  -            //These two are additional
  -            //call.setProperty("from","http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous");
  -            //call.setProperty("replyTo","http://10.10.0.4:8080/axis/services/MyService");
  -            //http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous
   
               call.setTargetEndpointAddress(targetURL);
               call.setOperationName(new QName("urn:wsrm:Ping", "Ping"));
  
  
  
  1.42      +8 -5      ws-fx/sandesha/src/org/apache/sandesha/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/Constants.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Constants.java	26 Apr 2005 03:24:50 -0000	1.41
  +++ Constants.java	2 May 2005 04:17:09 -0000	1.42
  @@ -61,8 +61,8 @@
   
   
       //To identify the end point
  -    public static final int SERVER = 1;
  -    public static final int CLIENT = 0;
  +    public static final byte SERVER = 1;
  +    public static final byte CLIENT = 0;
   
       public interface WSA{
           public static final String NS_ADDRESSING_ANONYMOUS = AddressingUtils.getAnonymousRoleURI();
  @@ -82,7 +82,7 @@
           public static final String UPPER = "Upper";
           public static final String LOWER = "Lower";
           public static final String ACK_REQUESTED = "AckRequested";
  -        public static final String MSG_NUMBER = "MessageaNumber";
  +        public static final String MSG_NUMBER = "MessageNumber";
           public static final String CREATE_SEQUENCE = "CreateSequence";
           public static final String CREATE_SEQUENCE_RESPONSE = "CreateSequenceResponse";
           public static final String FAULT_CODE = "FaultCode";
  @@ -101,8 +101,8 @@
       }
   
       public interface WSU {
  -        public static final String WSU_PREFIX = "wsu";
  -        public static final String WSU_NS = "http://schemas.xmlsoap.org/ws/2002/07/utility";
  +        public static final String WSU_PREFIX = "wsrm";
  +        public static final String WSU_NS = "http://schemas.xmlsoap.org/ws/2005/02/rm";
           public static final String IDENTIFIER = "Identifier";
       }
   
  @@ -139,6 +139,8 @@
           public static final String SET_APPROVED_OUT_SEQ = "ERROR: setApprovedOutSequence()";
   
           public static final String CANNOT_SEND_THE_CREATE_SEQ = "SERVER ERROR: Cannot send the CreateSequenceRequest from Server";
  +        public static final String CANNOT_SEND_THE_TERMINATE_SEQ = "SERVER ERROR: Cannot send the TerminateSequence from Server";
  +
           public static final String NULL_REQUEST_MSG = "ERROR: NULL REQUEST MESSAGE";
   
           public static final String SEQ_IS_NOT_CREATED = "ERROR: Sequence was not created correcly in the in queue";
  @@ -189,6 +191,7 @@
           public static final String ACTION = "action";
           public static final String ACKS_TO="acksTo";
           public static final String TO="To";
  +        public static final String FAULT_TO="faultTo";
   
           public static final String REQUEST_HANDLER = "requestHandler";
           public static final String RESPONSE_HANDLER = "responseHandler";
  
  
  
  1.31      +40 -99    ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java
  
  Index: EnvelopeCreator.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- EnvelopeCreator.java	27 Apr 2005 10:30:45 -0000	1.30
  +++ EnvelopeCreator.java	2 May 2005 04:17:09 -0000	1.31
  @@ -16,31 +16,16 @@
   */
   package org.apache.sandesha;
   
  +import org.apache.axis.Message;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.components.uuid.UUIDGen;
   import org.apache.axis.components.uuid.UUIDGenFactory;
   import org.apache.axis.message.SOAPBody;
   import org.apache.axis.message.SOAPEnvelope;
  -import org.apache.axis.message.addressing.Action;
  -import org.apache.axis.message.addressing.Address;
  -import org.apache.axis.message.addressing.AddressingHeaders;
  -import org.apache.axis.message.addressing.AttributedURI;
  -import org.apache.axis.message.addressing.From;
  -import org.apache.axis.message.addressing.MessageID;
  -import org.apache.axis.message.addressing.ReplyTo;
  -import org.apache.axis.message.addressing.To;
  +import org.apache.axis.message.addressing.*;
   import org.apache.axis.types.URI;
  -import org.apache.axis.Message;
   import org.apache.commons.logging.Log;
  -import org.apache.sandesha.ws.rm.AcksTo;
  -import org.apache.sandesha.ws.rm.CreateSequence;
  -import org.apache.sandesha.ws.rm.CreateSequenceResponse;
  -import org.apache.sandesha.ws.rm.LastMessage;
  -import org.apache.sandesha.ws.rm.MessageNumber;
  -import org.apache.sandesha.ws.rm.RMHeaders;
  -import org.apache.sandesha.ws.rm.Sequence;
  -import org.apache.sandesha.ws.rm.SequenceAcknowledgement;
  -import org.apache.sandesha.ws.rm.TerminateSequence;
  +import org.apache.sandesha.ws.rm.*;
   import org.apache.sandesha.ws.utility.Identifier;
   
   import javax.xml.namespace.QName;
  @@ -52,11 +37,13 @@
    */
   public class EnvelopeCreator {
       private static final Log log = LogFactory.getLog(EnvelopeCreator.class.getName());
  +    private static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
   
       public static SOAPEnvelope createCreateSequenceResponseEnvelope(String uuid, RMMessageContext rmMessageContext) throws Exception {
   
           //Set the SOAPEnvelope to the resEnv of the rmMessageContext.
           AddressingHeaders addressingHeaders = rmMessageContext.getAddressingHeaders();
  +        RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
           SOAPEnvelope envelope = createBasicEnvelop();
   
           AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(envelope);
  @@ -67,7 +54,6 @@
           outGoingAddressingHaders.setAction(action);
   
           //Set the messageID
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
           MessageID messageId = new MessageID(new URI(Constants.UUID + uuidGen.nextUUID()));
           outGoingAddressingHaders.setMessageID(messageId);
   
  @@ -86,11 +72,19 @@
                           org.apache.axis.message.addressing.Constants.NS_URI_ADDRESSING_DEFAULT));
   
           //SettingTo
  +        AttributedURI incommingAddress = null;
           if (!rmMessageContext.getSync()) {
  -            ReplyTo incommingReplyTo = (ReplyTo) addressingHeaders.getReplyTo();
  -            AttributedURI incommingAddress = incommingReplyTo.getAddress();
  +            if (addressingHeaders.getReplyTo() != null) {
  +                ReplyTo incommingReplyTo = (ReplyTo) addressingHeaders.getReplyTo();
  +                incommingAddress = incommingReplyTo.getAddress();
  +            } else if (rmHeaders.getCreateSequence().getAcksTo() != null) {
  +                AcksTo incommingAcksTo = (AcksTo) rmHeaders.getCreateSequence().getAcksTo();
  +                incommingAddress = incommingAcksTo.getAddress();
  +            }
  +
               To to = new To(new URI(incommingAddress.toString()));
               outGoingAddressingHaders.setTo(to);
  +
           }
           outGoingAddressingHaders.toEnvelope(envelope, null);
   
  @@ -100,89 +94,28 @@
           id.setIdentifier(Constants.UUID + uuid);
           response.setIdentifier(id);
           response.toSoapEnvelop(envelope);
  -
           return envelope;
  -
       }
   
  -    //TODO: Recheck this method.
  -    //the integer value endPoint is used to identify from where we call
  -    //this method. If we call this form Client then pass the parameter
  -    //Constants.CLIENT. if it is called from the server then it should be
  -    //Constants.SERVER
   
  -    public static SOAPEnvelope createCreateSequenceEnvelope(String uuid,
  -                                                            RMMessageContext message, int endPoint) throws Exception {
  +    public static SOAPEnvelope createCreateSequenceEnvelope(RMMessageContext rmMsgCtx) throws Exception {
   
  -        AddressingHeaders addressingHeaders = message.getAddressingHeaders();
  +        AddressingHeaders addressingHeaders = rmMsgCtx.getAddressingHeaders();
           SOAPEnvelope envelope = createBasicEnvelop();
  +        addressingHeaders.toEnvelope(envelope);
  +        rmMsgCtx.getRMHeaders().getCreateSequence().toSoapEnvelop(envelope);
   
  -
  -        AddressingHeaders outGoingAddressingHaders = new AddressingHeaders(envelope);
  -
  -        Action action = new Action(new URI(Constants.WSRM.ACTION_CREATE_SEQUENCE));
  -        SOAPHeaderElement acionElement = action.toSOAPHeaderElement(envelope, null);
  -        outGoingAddressingHaders.setAction(action);
  -
  -        MessageID messageId = new MessageID(new URI(Constants.UUID + uuid));
  -        outGoingAddressingHaders.setMessageID(messageId);
  -
  -        if (endPoint == Constants.CLIENT) {
  -            //Setting from the Client
  -            outGoingAddressingHaders.setFrom(addressingHeaders.getFrom());
  -            outGoingAddressingHaders.setTo(addressingHeaders.getTo());
  -            if (message.getSync()) {
  -                outGoingAddressingHaders.setReplyTo(new ReplyTo(new Address(Constants.WSA.NS_ADDRESSING_ANONYMOUS)));
  -            } else {
  -                if (addressingHeaders.getReplyTo() != null)
  -                    outGoingAddressingHaders.setReplyTo(addressingHeaders
  -                            .getReplyTo());
  -            }
  -        } else if (endPoint == Constants.SERVER) {
  -            //Setting from the Server
  -            //setting FROM and REPLY TO
  -            To incommingTo = addressingHeaders.getTo();
  -            URI fromURI = new URI(incommingTo.toString());
  -            Address addr = new Address(fromURI);
  -            From from = new From(addr);
  -            outGoingAddressingHaders.setFrom(from);
  -            //Reply to is the same.
  -            outGoingAddressingHaders.setReplyTo(from);
  -
  -            //Setting To
  -            ReplyTo incommingReplyTo = (ReplyTo) addressingHeaders
  -                    .getReplyTo();
  -            AttributedURI incommingAddress = incommingReplyTo.getAddress();
  -            To to = new To(new URI(incommingAddress.toString()));
  -            outGoingAddressingHaders.setTo(to);
  -        }
  -
  -        outGoingAddressingHaders.toEnvelope(envelope);
  -
  -        CreateSequence createSeq = new CreateSequence();
  -        
  -        //uncommenting following will send the sequence with a offer (for response seq) to the create seq msg. 
  +        //uncommenting following will send the sequence with a offer (for response seq) to the create seq msg.
           //offer
   //        SequenceOffer offer = new SequenceOffer ();
   //        Identifier id = new Identifier ();
   //        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
   //        String offerUuid = Constants.UUID + uuidGen.nextUUID();
   //        id.setIdentifier(offerUuid);
  -//        
  +//
   //        offer.setIdentifier(id);
   //        createSeq.setOffer(offer);
           //end offer
  -
  -        //AcksTo
  -        if(message.getAcksTo()!=null) {
  -        Address address= new Address(message.getAcksTo());
  -        AcksTo acksTo= new AcksTo(address);
  -        createSeq.setAcksTo(acksTo);
  -        }
  -        //End AcksTo
  -
  -        createSeq.toSoapEnvelop(envelope);
  -
           return envelope;
       }
   
  @@ -190,7 +123,6 @@
   
           SOAPEnvelope soapEnv = new SOAPEnvelope();
           addNamespaceDeclarations(soapEnv);
  -
           return soapEnv;
   
       }
  @@ -217,7 +149,6 @@
           outGoingAddressingHaders.setAction(action);
   
           //Set the messageID
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
           MessageID messageId = new MessageID(new URI(Constants.UUID + uuidGen.nextUUID()));
           outGoingAddressingHaders.setMessageID(messageId);
   
  @@ -275,7 +206,6 @@
               outGoingAddressingHaders.addRelatesTo(rmMessageContext.getMessageID(), new QName("aa", "bb"));
   
           //Set the messageID
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
           MessageID messageId = new MessageID(new URI(Constants.UUID + uuidGen.nextUUID()));
           outGoingAddressingHaders.setMessageID(messageId);
   
  @@ -293,7 +223,7 @@
           //  ReplyTo replyTo = new ReplyTo(
           //        new Address(
           //               "http://localhost:8080/axis/services/EchoStringService?wsdl"));
  -        outGoingAddressingHaders.setReplyTo(from);
  +        //outGoingAddressingHaders.setReplyTo(from);
   
           //Add to <To>
           AttributedURI inFrom = addressingHeaders.getFrom().getAddress();
  @@ -331,10 +261,18 @@
           id.setIdentifier(rmMessageContext.getSequenceID());
           seq.setIdentifier(id);
   
  +        if (rmMessageContext.getReTransmissionCount() != 0) {
  +            AckRequested ackReq = new AckRequested();
  +            ackReq.setIdentifier(id);
  +            rmHeaders.setAckRequest(ackReq);
  +        }
  +
           if (rmMessageContext.isLastMessage()) {
               seq.setLastMessage(new LastMessage());
           }
   
  +
  +
           //Message Number for the new message.
           MessageNumber msgNumber = new MessageNumber();
           msgNumber.setMessageNumber(rmMessageContext.getMsgNumber());
  @@ -344,7 +282,7 @@
           rmMessageContext.setRMHeaders(rmHeaders);
   
           //requestEnvelope = new SOAPEnvelope();
  -        String str= rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
  +        String str = rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
           requestEnvelope = new Message(str).getSOAPEnvelope();
   
           rmMessageContext.getRMHeaders().toSoapEnvelop(requestEnvelope);
  @@ -360,13 +298,17 @@
           outGoingAddressingHaders.setTo(addressingHeaders.getTo());
           if (addressingHeaders.getReplyTo() != null)
               outGoingAddressingHaders.setReplyTo(addressingHeaders.getReplyTo());
  -        try{
  -        Action action = new Action(new URI(rmMessageContext.getAction()));
  -        outGoingAddressingHaders.setAction(action);
  -        }catch(Exception e){
  -           e.printStackTrace();
  +        try {
  +            Action action = new Action(new URI(rmMessageContext.getAction()));
  +            outGoingAddressingHaders.setAction(action);
  +        } catch (Exception e) {
  +            e.printStackTrace();
           }
   
  +        if (rmMessageContext.getFaultTo() != null)
  +            outGoingAddressingHaders.setFaultTo(new FaultTo(new Address(rmMessageContext.getFaultTo())));
  +
  +
           //Set the addressing headers to the SOAPEnvelope.
           outGoingAddressingHaders.toEnvelope(requestEnvelope, null);
   
  @@ -385,7 +327,6 @@
           Action terSeqAction = new Action(new URI(Constants.WSRM.ACTION_TERMINATE_SEQUENCE));
           outGoingAddressingHaders.setAction(terSeqAction);
   
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
           MessageID messageId = new MessageID(new URI(Constants.UUID + uuidGen.nextUUID()));
           outGoingAddressingHaders.setMessageID(messageId);
   
  
  
  
  1.28      +8 -3      ws-fx/sandesha/src/org/apache/sandesha/RMMessageContext.java
  
  Index: RMMessageContext.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/RMMessageContext.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- RMMessageContext.java	27 Apr 2005 07:08:49 -0000	1.27
  +++ RMMessageContext.java	2 May 2005 04:17:09 -0000	1.28
  @@ -51,11 +51,10 @@
       private String replyTo = null;
       private boolean responseReceived = false;
       private boolean ackReceived = false;
  -    
  -
  -
  +    private String faultTo=null;
       private String acksTo = null;
       private String to = null;
  +
       private static final Log log = LogFactory.getLog(RMMessageContext.class.getName());
       private ArrayList msgIdList = new ArrayList ();
       
  @@ -475,4 +474,10 @@
           return sync;
       }
   
  +    public void setFaultTo(String faultTo) {
  +        this.faultTo=faultTo;
  +            }
  +    public String getFaultTo(){
  +        return this.faultTo;
  +    }
   }
  \ No newline at end of file
  
  
  
  1.17      +10 -0     ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java
  
  Index: ClientPropertyValidator.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientPropertyValidator.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ClientPropertyValidator.java	26 Apr 2005 03:24:50 -0000	1.16
  +++ ClientPropertyValidator.java	2 May 2005 04:17:09 -0000	1.17
  @@ -45,6 +45,7 @@
           String replyTo = getReplyTo(call);
           String acksTo = getAcksTo(call);
           String to = getTo(call);
  +        String faultTo=getFaultTo(call);
   
           try {
               if (from == null)
  @@ -71,6 +72,7 @@
               rmMessageContext.setAction(action);
               rmMessageContext.setAcksTo(acksTo);
               rmMessageContext.setTo(to);
  +            rmMessageContext.setFaultTo(faultTo);
               return rmMessageContext;
   
           } else
  @@ -78,6 +80,14 @@
   
       }
   
  +    private static String getFaultTo(Call call) {
  +          String faultTo = (String) call.getProperty(Constants.ClientProperties.FAULT_TO);
  +        if (faultTo != null)
  +            return faultTo;
  +        else
  +            return null;
  +    }
  +
       private static String getTo(Call call) {
           String to = (String) call.getProperty(Constants.ClientProperties.TO);
           if (to != null)
  
  
  
  1.36      +10 -12    ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java
  
  Index: RMSender.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/RMSender.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- RMSender.java	26 Apr 2005 03:24:50 -0000	1.35
  +++ RMSender.java	2 May 2005 04:17:09 -0000	1.36
  @@ -40,26 +40,26 @@
           storageManager = new ClientStorageManager();
   
           try {
  -            RMMessageContext requestMesssageContext = RMMessageCreator.createServiceRequestMsg(msgContext);
  -            String sequenceID = requestMesssageContext.getSequenceID();
  +            RMMessageContext reqMsgCtx = RMMessageCreator.createServiceRequestMsg(msgContext);
  +            String tempSeqID = reqMsgCtx.getSequenceID();
   
  -            long msgNo = requestMesssageContext.getMsgNumber();
  +            long msgNo = reqMsgCtx.getMsgNumber();
   
               if (msgNo == 1) {
  -                requestMesssageContext = processFirstRequestMessage(requestMesssageContext, requestMesssageContext.getSync());
  +                reqMsgCtx = processFirstRequestMessage(reqMsgCtx, reqMsgCtx.getSync());
               } else {
  -                requestMesssageContext = processRequestMessage(requestMesssageContext);
  +                reqMsgCtx = processRequestMessage(reqMsgCtx);
               }
   
  -            if (requestMesssageContext.isLastMessage()) {
  -                storageManager.insertTerminateSeqMessage(RMMessageCreator.createTerminateSeqMsg(requestMesssageContext));
  +            if (reqMsgCtx.isLastMessage()) {
  +                storageManager.insertTerminateSeqMessage(RMMessageCreator.createTerminateSeqMsg(reqMsgCtx));
               }
   
   
  -            if (requestMesssageContext.isHasResponse()) {
  +            if (reqMsgCtx.isHasResponse()) {
                   RMMessageContext responseMessageContext = null;
                   while (responseMessageContext == null) {
  -                    responseMessageContext = checkTheQueueForResponse(sequenceID, requestMesssageContext.getMessageID());
  +                    responseMessageContext = checkTheQueueForResponse(tempSeqID, reqMsgCtx.getMessageID());
                       Thread.sleep(Constants.CLIENT_RESPONSE_CHECKING_INTERVAL);
                   }
   
  @@ -73,7 +73,6 @@
                   msgContext.setResponseMessage(null);
               }
   
  -
           } catch (Exception ex) {
               log.error(ex);
           }
  @@ -81,7 +80,7 @@
   
   
       private RMMessageContext processFirstRequestMessage(RMMessageContext reqRMMsgContext, boolean sync) throws Exception {
  -        RMMessageContext createSeqRMMsgContext = RMMessageCreator.createCreateSeqMsg(reqRMMsgContext);
  +        RMMessageContext createSeqRMMsgContext = RMMessageCreator.createCreateSeqMsg(reqRMMsgContext,Constants.CLIENT);
           storageManager.addOutgoingSequence(reqRMMsgContext.getSequenceID());
           storageManager.setTemporaryOutSequence(reqRMMsgContext.getSequenceID(), createSeqRMMsgContext.getMessageID());
   
  @@ -107,7 +106,6 @@
           return storageManager.checkForResponseMessage(sequenceId, reqMessageID);
       }
   
  -
   }
   
   
  
  
  
  1.15      +2 -2      ws-fx/sandesha/src/org/apache/sandesha/server/MessageValidator.java
  
  Index: MessageValidator.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/MessageValidator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MessageValidator.java	12 Apr 2005 02:15:32 -0000	1.14
  +++ MessageValidator.java	2 May 2005 04:17:09 -0000	1.15
  @@ -106,7 +106,7 @@
           if (addrHeaders == null) {
               throw new AxisFault(new QName(Constants.FaultCodes.IN_CORRECT_MESSAGE), Constants.FaultMessages.NO_ADDRESSING_HEADERS, null, null);
           }
  -        if (addrHeaders.getMessageID() == null)
  -            throw new AxisFault(new QName(Constants.FaultCodes.IN_CORRECT_MESSAGE), Constants.FaultMessages.NO_MESSAGE_ID, null, null);
  +        //if (addrHeaders.getMessageID() == null)
  +        //    throw new AxisFault(new QName(Constants.FaultCodes.IN_CORRECT_MESSAGE), Constants.FaultMessages.NO_MESSAGE_ID, null, null);
       }
   }
  
  
  
  1.23      +13 -38    ws-fx/sandesha/src/org/apache/sandesha/server/RMInvoker.java
  
  Index: RMInvoker.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/RMInvoker.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- RMInvoker.java	27 Apr 2005 07:08:50 -0000	1.22
  +++ RMInvoker.java	2 May 2005 04:17:09 -0000	1.23
  @@ -16,23 +16,20 @@
    */
   package org.apache.sandesha.server;
   
  -import org.apache.axis.Message;
  -import org.apache.axis.MessageContext;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.components.uuid.UUIDGen;
   import org.apache.axis.components.uuid.UUIDGenFactory;
   import org.apache.axis.message.addressing.AddressingHeaders;
  +import org.apache.axis.message.addressing.MessageID;
   import org.apache.axis.providers.java.JavaProvider;
  +import org.apache.axis.types.URI;
   import org.apache.commons.logging.Log;
   import org.apache.sandesha.Constants;
  -import org.apache.sandesha.EnvelopeCreator;
   import org.apache.sandesha.IStorageManager;
   import org.apache.sandesha.RMMessageContext;
   import org.apache.sandesha.util.PropertyLoader;
   import org.apache.sandesha.util.RMMessageCreator;
   
  -import javax.xml.soap.SOAPEnvelope;
  -
   /**
    * @author JEkanayake
    *         <p/>
  @@ -43,6 +40,7 @@
   public class RMInvoker implements Runnable {
       private IStorageManager storageManager = null;
       private static final Log log = LogFactory.getLog(RMInvoker.class.getName());
  +    private static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
   
       public RMInvoker() {
           storageManager = new ServerStorageManager();
  @@ -54,16 +52,10 @@
           while (true) {
               try {
                   Thread.sleep(Constants.RMINVOKER_SLEEP_TIME);
  -
                   RMMessageContext rmMessageContext = storageManager.getNextMessageToProcess();
  -
                   if (rmMessageContext != null) {
  -                    //Currently RPCProvider is used as the default provider and this is used to actually invoke the service.
  -                    //To provide a maximum flexibility the actual provider should be a configurable entity
  -                    // where the class can be loaded at runtime.
  -
                       Class c = Class.forName(PropertyLoader.getProvider());
  -                    JavaProvider provider=(JavaProvider)c.newInstance();
  +                    JavaProvider provider = (JavaProvider) c.newInstance();
                       provider.invoke(rmMessageContext.getMsgContext());
   
                       if (rmMessageContext.getMsgContext().getOperation().getMethod().getReturnType() != Void.TYPE) {
  @@ -76,7 +68,7 @@
                                   terminateMsg.setOutGoingAddress(replyTo);
                                   storageManager.insertTerminateSeqMessage(terminateMsg);
                               } else {
  -                              log.error(Constants.ErrorMessages.CANNOT_SEND_THE_CREATE_SEQ);
  +                                log.error(Constants.ErrorMessages.CANNOT_SEND_THE_TERMINATE_SEQ);
                               }
                           }
                           //Store the message in the response queue. If there is an application response then that
  @@ -89,35 +81,18 @@
                                   .getSequenceID()));
                           storageManager.insertOutgoingMessage(rmMessageContext);
                           if (firstMsgOfResponseSeq) {
  -                            RMMessageContext rmMsgContext = new RMMessageContext();
  -                            rmMessageContext.copyContents(rmMsgContext);
  -                            MessageContext msgContext = new MessageContext(rmMessageContext.getMsgContext().getAxisEngine());
  -                            RMMessageContext.copyMessageContext(rmMessageContext.getMsgContext(), msgContext);
  -                            //Set this new msgContext to the rmMsgContext.
  -
  -                            rmMsgContext.setMsgContext(msgContext);
  -                            rmMsgContext.setMessageType(Constants.MSG_TYPE_CREATE_SEQUENCE_REQUEST);
  -
  -                            UUIDGen uuid = UUIDGenFactory.getUUIDGen();
  -                            String id = uuid.nextUUID();
   
  +                            RMMessageContext csRMMsgCtx = RMMessageCreator.createCreateSeqMsg(rmMessageContext, Constants.SERVER);
  +                            csRMMsgCtx.setOutGoingAddress(rmMessageContext.getAddressingHeaders().getReplyTo().getAddress().toString());
   
  +                            String id = uuidGen.nextUUID();
                               String msgIdStr = Constants.UUID + id;
  -                            rmMsgContext.addToMsgIdList(msgIdStr);
  -
  -
  -                            storageManager.setTemporaryOutSequence(rmMsgContext.getSequenceID(), msgIdStr);
  -                            SOAPEnvelope createSequenceEnvelope = EnvelopeCreator.createCreateSequenceEnvelope(id,
  -                                    rmMsgContext, Constants.SERVER);
  -
  -                            
  -                            rmMsgContext.getMsgContext().setRequestMessage(new Message(createSequenceEnvelope));
  +                            csRMMsgCtx.addToMsgIdList(msgIdStr);
  +                            csRMMsgCtx.setMessageID(msgIdStr);
   
  -                            //TODO Check : Are We are sending only to the ReplyTo?
  -                            rmMsgContext.setOutGoingAddress(rmMsgContext.getAddressingHeaders().getReplyTo()
  -                                    .getAddress().toString());
  -                            rmMsgContext.setMessageID(Constants.UUID + id);
  -                            storageManager.addCreateSequenceRequest(rmMsgContext);
  +                            csRMMsgCtx.getAddressingHeaders().setMessageID(new MessageID(new URI(msgIdStr)));
  +                            storageManager.setTemporaryOutSequence(csRMMsgCtx.getSequenceID(), msgIdStr);
  +                            storageManager.addCreateSequenceRequest(csRMMsgCtx);
                           }
                       }
                   }
  
  
  
  1.35      +24 -20    ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java
  
  Index: Sender.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/Sender.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Sender.java	27 Apr 2005 10:30:45 -0000	1.34
  +++ Sender.java	2 May 2005 04:17:09 -0000	1.35
  @@ -47,6 +47,8 @@
   public class Sender implements Runnable {
   
       private static final Log log = LogFactory.getLog(Sender.class.getName());
  +    public static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
  +
       public boolean running = true;
       private IStorageManager storageManager;
   
  @@ -166,25 +168,22 @@
   
       }
   
  -    private void sendCreateSequenceRequest(RMMessageContext rmMessageContext) throws Exception {
  -        if (rmMessageContext.getMsgContext().getRequestMessage() == null) {
  -            //The code should not come to this point.
  -            System.err.println(Constants.ErrorMessages.NULL_REQUEST_MSG);
  -        } else {
  +    private void sendCreateSequenceRequest(RMMessageContext rmMsgCtx) throws Exception {
  +//        if (rmMsgCtx.getMsgContext().getRequestMessage() == null) {
  +//            //The code should not come to this point.
  +//            System.err.println(Constants.ErrorMessages.NULL_REQUEST_MSG);
  +//        } else {
               Call call;
   
  -
  -
               //EDITED FOR MSG NO REPITITION
               String oldOutSeqId, newOutSeqId;
   
  -            String oldCreateSeqId = rmMessageContext.getMessageID().toString();
  -            UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
  +            String oldCreateSeqId = rmMsgCtx.getMessageID().toString();
               String uuid = uuidGen.nextUUID();
   
   
               String newCreateSeqId = Constants.UUID + uuid;
  -            rmMessageContext.setMessageID(newCreateSeqId);
  +            rmMsgCtx.setMessageID(newCreateSeqId);
   
               oldOutSeqId = oldCreateSeqId;
               newOutSeqId = newCreateSeqId;
  @@ -194,21 +193,23 @@
               //String toAddress = tempMsg.getOutGoingAddress();
   
   
  -            AddressingHeaders addrHeaders = new AddressingHeaders(rmMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope());
  -            addrHeaders.setMessageID(new MessageID(new URI(newCreateSeqId)));
  -            addrHeaders.toEnvelope(rmMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope());
  +            //AddressingHeaders addrHeaders = new AddressingHeaders(rmMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope());
  +            rmMsgCtx.getAddressingHeaders().setMessageID(new MessageID(new URI(newCreateSeqId)));
  +            //addrHeaders.toEnvelope(rmMessageContext.getMsgContext().getRequestMessage().getSOAPEnvelope());
   
  +            SOAPEnvelope reqEnvelope = EnvelopeCreator.createCreateSequenceEnvelope( rmMsgCtx);
  +            rmMsgCtx.getMsgContext().setRequestMessage(new Message(reqEnvelope));
   
  -            rmMessageContext.addToMsgIdList(rmMessageContext.getMessageID().toString());
  -            List msgIdList = rmMessageContext.getMessageIdList();
  +            rmMsgCtx.addToMsgIdList(rmMsgCtx.getMessageID().toString());
  +            List msgIdList = rmMsgCtx.getMessageIdList();
               //Iterator it = msgIdList.iterator();
  -            rmMessageContext.setLastPrecessedTime(System.currentTimeMillis());
  -            rmMessageContext.setReTransmissionCount(rmMessageContext.getReTransmissionCount() + 1);
  -            call = prepareCall(rmMessageContext);
  +            rmMsgCtx.setLastPrecessedTime(System.currentTimeMillis());
  +            rmMsgCtx.setReTransmissionCount(rmMsgCtx.getReTransmissionCount() + 1);
  +            call = prepareCall(rmMsgCtx);
               call.invoke();
   
  -            processResponseMessage(call, rmMessageContext);
  -        }
  +            processResponseMessage(call, rmMsgCtx);
  +     //   }
       }
   
       private void sendCreateSequenceResponse(RMMessageContext rmMessageContext) throws Exception {
  @@ -250,6 +251,9 @@
           if (rmMessageContext.getMsgContext().getRequestMessage() != null) {
               String soapMsg = rmMessageContext.getMsgContext().getRequestMessage().getSOAPPartAsString();
               call.setRequestMessage(new Message(soapMsg));
  +            if (rmMessageContext.getAddressingHeaders().getAction() != null) {
  +                call.setSOAPActionURI(rmMessageContext.getAddressingHeaders().getAction().toString());
  +            }
           }
           return call;
       }
  
  
  
  1.9       +1 -6      ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java
  
  Index: AcknowledgementProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/AcknowledgementProcessor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AcknowledgementProcessor.java	26 Apr 2005 04:36:25 -0000	1.8
  +++ AcknowledgementProcessor.java	2 May 2005 04:17:09 -0000	1.9
  @@ -72,6 +72,7 @@
       public boolean sendAcknowledgement(RMMessageContext rmMessageContext) throws AxisFault {
           //EnvelopCreater createAcknowledgement.  If async then add message to the queue
           //else set the response env of the messageContext.
  +
           String seqID = rmMessageContext.getSequenceID();
   
           long messageNumber = rmMessageContext.getRMHeaders().getSequence().getMessageNumber().getMessageNumber();
  @@ -91,12 +92,6 @@
   
           if (true == (rmMessageContext.getAddressingHeaders().getFrom().getAddress().toString()
                   .equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS))) {
  -//                || ("http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous".equals(rmMessageContext.getAddressingHeaders().getFrom()
  -//                .getAddress().toString()))) {
  -            //Now we have synchronized ack.
  -            //The original message context is used to send the ack
  -            // asynchronously to the client.
  -            //So the response message is replaced by the new ack message.
               try {
                   String soapMsg = rmMsgContext.getMsgContext().getResponseMessage().getSOAPPartAsString();
                   rmMessageContext.getMsgContext().setResponseMessage(new Message(soapMsg));
  
  
  
  1.14      +2 -1      ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CreateSequenceProcessor.java
  
  Index: CreateSequenceProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/CreateSequenceProcessor.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CreateSequenceProcessor.java	26 Apr 2005 10:50:02 -0000	1.13
  +++ CreateSequenceProcessor.java	2 May 2005 04:17:09 -0000	1.14
  @@ -38,6 +38,8 @@
   public class CreateSequenceProcessor implements IRMMessageProcessor {
       IStorageManager storageManager;
   
  +    public static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
  +
       public CreateSequenceProcessor(IStorageManager storageManager) {
           this.storageManager = storageManager;
       }
  @@ -56,7 +58,6 @@
           if (rmHeaders.getCreateSequence() == null)
               throw new AxisFault();
   
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
           String uuid = uuidGen.nextUUID();
   
           storageManager.addRequestedSequence(org.apache.sandesha.Constants.UUID + uuid);
  
  
  
  1.9       +1 -1      ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java
  
  Index: FaultProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/msgprocessors/FaultProcessor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FaultProcessor.java	26 Apr 2005 03:24:50 -0000	1.8
  +++ FaultProcessor.java	2 May 2005 04:17:09 -0000	1.9
  @@ -92,7 +92,7 @@
           if (rmMessageContext.getAddressingHeaders() != null) {
               addrHeaders = rmMessageContext.getAddressingHeaders();
               if (addrHeaders.getFaultTo() != null) {
  -                if (addrHeaders.getFaultTo().getAddress().toString().equals(org.apache.axis.message.addressing.Constants.NS_URI_ADDRESSING_DEFAULT)) {
  +                if (addrHeaders.getFaultTo().getAddress().toString().equals(Constants.WSA.NS_ADDRESSING_ANONYMOUS)) {
                       msgContext.setResponseMessage(new Message(soapFault));
                       return true;
                   } else {
  
  
  
  1.13      +2 -1      ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java
  
  Index: SandeshaQueue.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- SandeshaQueue.java	27 Apr 2005 10:30:45 -0000	1.12
  +++ SandeshaQueue.java	2 May 2005 04:17:09 -0000	1.13
  @@ -49,6 +49,8 @@
       private List requestedSequences;
       private static final Log log = LogFactory.getLog(SandeshaQueue.class.getName());
   
  +    public static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
  +
       private SandeshaQueue() {
           incomingMap = new HashMap();
           outgoingMap = new HashMap();
  @@ -281,7 +283,6 @@
                                       String oldOutSeqId, newOutSeqId;
   
                                       String oldCreateSeqId = tempMsg.getMessageID().toString();
  -                                    UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
                                       String uuid = uuidGen.nextUUID();
   
   
  
  
  
  1.12      +136 -61   ws-fx/sandesha/src/org/apache/sandesha/util/RMMessageCreator.java
  
  Index: RMMessageCreator.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/util/RMMessageCreator.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- RMMessageCreator.java	27 Apr 2005 10:30:45 -0000	1.11
  +++ RMMessageCreator.java	2 May 2005 04:17:09 -0000	1.12
  @@ -23,57 +23,116 @@
   import org.apache.axis.client.Call;
   import org.apache.axis.components.uuid.UUIDGen;
   import org.apache.axis.components.uuid.UUIDGenFactory;
  -import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.addressing.*;
   import org.apache.axis.types.URI;
   import org.apache.sandesha.Constants;
  -import org.apache.sandesha.EnvelopeCreator;
   import org.apache.sandesha.RMMessageContext;
   import org.apache.sandesha.client.ClientPropertyValidator;
  +import org.apache.sandesha.ws.rm.AcksTo;
  +import org.apache.sandesha.ws.rm.CreateSequence;
  +import org.apache.sandesha.ws.rm.RMHeaders;
   
   public class RMMessageCreator {
  +    private static final UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
   
  -    public static RMMessageContext createCreateSeqMsg(RMMessageContext rmMsgCtx) throws Exception {
  -        //String toAddress = (String)
  -        // msgContext.getProperty(MessageContext.TRANS_URL);
  +    /*public static RMMessageContext createCreateSeqMsg(RMMessageContext rmMsgCtx) throws Exception {
           AddressingHeaders addrHeaders = getAddressingHeaders(rmMsgCtx);
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
  -        String uuid = uuidGen.nextUUID();
  +        String uuid = uuidGen.nextUUID(); String uuid = uuidGen.nextUUID();
   
           //Create the RMMessageContext to hold the create Sequence Request.
           RMMessageContext createSeqRMMsgContext = new RMMessageContext();
  -        
  +
           String msgId = Constants.UUID + uuid;
           createSeqRMMsgContext.setMessageID(msgId);
  -
           createSeqRMMsgContext.addToMsgIdList(msgId);
  -        
           MessageContext msgContext = rmMsgCtx.getMsgContext();
  -        String toAddress = rmMsgCtx.getOutGoingAddress();
   
  +        String toAddress = rmMsgCtx.getOutGoingAddress();
           //Set the action
           Action action = new Action(new URI(Constants.WSRM.ACTION_CREATE_SEQUENCE));
           addrHeaders.setAction(action);
  -
  -
           createSeqRMMsgContext.setAddressingHeaders(addrHeaders);
           createSeqRMMsgContext.setSync(rmMsgCtx.getSync());
  -
           createSeqRMMsgContext.setAcksTo(rmMsgCtx.getAcksTo());
   
  -        //Set the outgoing address these need to be corrected.
           createSeqRMMsgContext.setOutGoingAddress(toAddress);
           SOAPEnvelope resEnvelope = EnvelopeCreator.createCreateSequenceEnvelope(uuid, createSeqRMMsgContext, Constants.CLIENT);
           MessageContext createSeqMsgContext = new MessageContext(msgContext.getAxisEngine());
  -
           //This should be a clone operation.
           RMMessageContext.copyMessageContext(msgContext, createSeqMsgContext);
           createSeqMsgContext.setRequestMessage(new Message(resEnvelope));
           createSeqRMMsgContext.setMsgContext(createSeqMsgContext);
  -
           //Set the message type
           createSeqRMMsgContext.setMessageType(Constants.MSG_TYPE_CREATE_SEQUENCE_REQUEST);
           return createSeqRMMsgContext;
  +    }*/
  +
  +
  +    public static RMMessageContext createCreateSeqMsg(RMMessageContext rmMsgCtx, byte endPoint) throws Exception {
  +        RMMessageContext createSeqRMMsgContext = new RMMessageContext();
  +        rmMsgCtx.copyContents(createSeqRMMsgContext);
  +        AddressingHeaders addrHeaders = getAddressingHeaders(rmMsgCtx);
  +
  +        RMHeaders rmHeaders = new RMHeaders();
  +
  +        CreateSequence createSeq = new CreateSequence();
  +        AcksTo acksTo = getAcksTo(rmMsgCtx, endPoint);
  +        createSeq.setAcksTo(acksTo);
  +        rmHeaders.setCreateSequence(createSeq);
  +        createSeqRMMsgContext.setRMHeaders(rmHeaders);
  +
  +        AddressingHeaders csAddrHeaders = new AddressingHeaders();
  +        if (endPoint == Constants.CLIENT) {
  +            csAddrHeaders.setTo(addrHeaders.getTo());
  +            csAddrHeaders.setFaultTo(addrHeaders.getFaultTo());
  +        } else {
  +            csAddrHeaders.setTo(new To(addrHeaders.getReplyTo().getAddress().toString()));
  +            csAddrHeaders.setFaultTo(new FaultTo(new Address(rmMsgCtx.getAddressingHeaders().getTo().toString())));
  +        }
  +        csAddrHeaders.setAction(new Action(new URI(Constants.WSRM.ACTION_CREATE_SEQUENCE)));
  +
  +        createSeqRMMsgContext.setAddressingHeaders(csAddrHeaders);
  +
  +        String uuid = uuidGen.nextUUID();
  +        String msgId = Constants.UUID + uuid;
  +        createSeqRMMsgContext.setMessageID(msgId);
  +        createSeqRMMsgContext.addToMsgIdList(msgId);
  +        createSeqRMMsgContext.setSync(rmMsgCtx.getSync());
  +        createSeqRMMsgContext.setMessageType(Constants.MSG_TYPE_CREATE_SEQUENCE_REQUEST);
  +
  +        String toAddress = rmMsgCtx.getOutGoingAddress();
  +
  +        createSeqRMMsgContext.setOutGoingAddress(toAddress);
  +        MessageContext msgContext = rmMsgCtx.getMsgContext();
  +        MessageContext createSeqMsgContext = new MessageContext(msgContext.getAxisEngine());
  +        RMMessageContext.copyMessageContext(msgContext, createSeqMsgContext);
  +        createSeqRMMsgContext.setMsgContext(createSeqMsgContext);
  +
  +        return createSeqRMMsgContext;
  +    }
  +
  +
  +    private static AcksTo getAcksTo(RMMessageContext rmMsgCtx, byte endPoint) throws Exception {
  +        AcksTo acksTo = null;
  +
  +        if (endPoint == Constants.CLIENT) {
  +            if (rmMsgCtx.getSync()) {
  +                acksTo = new AcksTo(new Address(new URI(Constants.WSA.NS_ADDRESSING_ANONYMOUS)));
  +            } else {
  +                if (rmMsgCtx.getAcksTo() != null)
  +                    acksTo = new AcksTo(new Address(new URI(rmMsgCtx.getAcksTo())));
  +                else if (rmMsgCtx.getReplyTo() != null)
  +                    acksTo = new AcksTo(new Address(new URI(rmMsgCtx.getReplyTo())));
  +                else if (rmMsgCtx.getSourceURL() != null)
  +                    acksTo = new AcksTo(new Address(new URI(rmMsgCtx.getSourceURL())));
  +            }
  +        } else if (endPoint == Constants.SERVER) {
  +            AddressingHeaders addrHeaders = rmMsgCtx.getAddressingHeaders();
  +
  +            To incommingTo = addrHeaders.getTo();
  +            acksTo = new AcksTo(new Address(incommingTo.toString()));
  +        }
  +        return acksTo;
       }
   
       public static RMMessageContext createCreateSeqResponseMsg(RMMessageContext rmMsgCtx) throws Exception {
  @@ -93,7 +152,6 @@
   
       public static RMMessageContext createAcknowledgementMsg(RMMessageContext rmMessageContext) throws Exception {
           return new RMMessageContext();
  -
       }
   
       public static RMMessageContext createServiceResponseMsg(RMMessageContext rmMsgCtx) throws Exception {
  @@ -101,8 +159,9 @@
       }
   
       public static RMMessageContext createServiceRequestMsg(MessageContext msgCtx) throws Exception {
  +        //Get a copy of the MessageContext. This is required when sending multiple messages from
  +        //one call object
           MessageContext newMsgContext = cloneMsgContext(msgCtx);
  -
           RMMessageContext requestMesssageContext = new RMMessageContext();
           //Get the message information from the client.
           Call call = (Call) newMsgContext.getProperty(MessageContext.CALL);
  @@ -110,11 +169,9 @@
           requestMesssageContext = ClientPropertyValidator.validate(call);
           requestMesssageContext.setOutGoingAddress((String) msgCtx.getProperty(MessageContext.TRANS_URL));
           requestMesssageContext.setMsgContext(newMsgContext);
  -
  -        // long nextMsgNumber = reqRMMsgContext.getMsgNumber();
           AddressingHeaders addrHeaders = getAddressingHeaders(requestMesssageContext);
  -
  -        UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
  +        if (requestMesssageContext.getAction() != null)
  +            addrHeaders.setAction(new Action(new URI(requestMesssageContext.getAction())));
           requestMesssageContext.setAddressingHeaders(addrHeaders);
           requestMesssageContext.setMessageType(Constants.MSG_TYPE_SERVICE_REQUEST);
           requestMesssageContext.setMessageID(Constants.UUID + uuidGen.nextUUID());
  @@ -131,52 +188,70 @@
           return clone;
       }
   
  -
       private static AddressingHeaders getAddressingHeaders(RMMessageContext rmMsgContext)
               throws URI.MalformedURIException {
   
  -        // MessageContext msgContext= rmMsgContext.getMsgContext();
  -        //Variable to hold the status of the asynchronous or synchronous state.
  -        boolean sync = rmMsgContext.getSync();
  -        AddressingHeaders addrHeaders = new AddressingHeaders();
  -        From from = null;
  -        ReplyTo replyTo = null;
  -        //String fromURL = rmMsgContext.getFrom();
  -        String replyToURL = rmMsgContext.getReplyTo();
  -
  -        //Need to use the anonymous_URI if the client is synchronous.
  -        if (!sync) {
  -            from = new From(new Address(rmMsgContext.getSourceURL()));
  -            addrHeaders.setFrom(from);
  -
  -            if (replyToURL != null) {
  -                replyTo = new ReplyTo(new Address(replyToURL));
  -                addrHeaders.setReplyTo(replyTo);
  +        if (rmMsgContext.getAddressingHeaders() != null) {
  +            return rmMsgContext.getAddressingHeaders();
  +        } else {
  +
  +            // MessageContext msgContext= rmMsgContext.getMsgContext();
  +            //Variable to hold the status of the asynchronous or synchronous state.
  +            boolean sync = rmMsgContext.getSync();
  +            AddressingHeaders addrHeaders = new AddressingHeaders();
  +            From from = null;
  +            ReplyTo replyTo = null;
  +            FaultTo faultTo = null;
  +            String replyToURL = rmMsgContext.getReplyTo();
  +            String fromURL = rmMsgContext.getFrom();
  +            String faultToURL = rmMsgContext.getFaultTo();
  +
  +            //Need to use the anonymous_URI if the client is synchronous.
  +            if (!sync) {
  +                if (fromURL != null) {
  +                    from = new From(new Address(fromURL));
  +                } else {
  +                    from = new From(new Address(rmMsgContext.getSourceURL()));
  +                }
  +                addrHeaders.setFrom(from);
  +                if (replyToURL != null) {
  +                    replyTo = new ReplyTo(new Address(replyToURL));
  +                    addrHeaders.setReplyTo(replyTo);
  +                } else {
  +                    replyTo = new ReplyTo(new Address(rmMsgContext.getSourceURL()));
  +                    addrHeaders.setReplyTo(replyTo);
  +                }
  +
               } else {
  -                replyTo = new ReplyTo(new Address(rmMsgContext.getSourceURL()));
  -                addrHeaders.setReplyTo(replyTo);
  +                if (fromURL != null) {
  +                    from = new From(new Address(fromURL));
  +                } else {
  +                    from = new From(new Address(Constants.WSA.NS_ADDRESSING_ANONYMOUS));
  +                }
  +                addrHeaders.setFrom(from);
  +                if (rmMsgContext.isHasResponse()) {
  +                    replyTo = new ReplyTo(new Address(replyToURL));
  +                    addrHeaders.setReplyTo(replyTo);
  +                }
               }
   
  -        } else {
  -            from = new From(new Address(Constants.WSA.NS_ADDRESSING_ANONYMOUS));
  -            addrHeaders.setFrom(from);
  -            if (rmMsgContext.isHasResponse()) {
  -                replyTo = new ReplyTo(new Address(replyToURL));
  -                addrHeaders.setReplyTo(replyTo);
  +            if (faultToURL != null) {
  +                faultTo = new FaultTo(new Address(faultToURL));
  +                addrHeaders.setFaultTo(faultTo);
  +            } else {
  +                faultTo = new FaultTo(new Address(Constants.WSA.NS_ADDRESSING_ANONYMOUS));
  +                addrHeaders.setFaultTo(faultTo);
  +            }
  +            //Set the target endpoint URL
  +            if (rmMsgContext.getTo() != null) {
  +                To to = new To(new Address(rmMsgContext.getTo()));
  +                addrHeaders.setTo(to);
  +            } else {
  +                To to = new To(new Address(rmMsgContext.getOutGoingAddress()));
  +                addrHeaders.setTo(to);
               }
   
  +            return addrHeaders;
           }
  -        //Set the target endpoint URL
  -        if (rmMsgContext.getTo() != null) {
  -            To to = new To(new Address(rmMsgContext.getTo()));
  -            addrHeaders.setTo(to);
  -        } else {
  -            To to = new To(new Address(rmMsgContext.getOutGoingAddress()));
  -            addrHeaders.setTo(to);
  -        }
  -
  -        return addrHeaders;
       }
  -
  -
   }
  \ No newline at end of file
  
  
  
  1.16      +17 -3     ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AckRequested.java
  
  Index: AckRequested.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AckRequested.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AckRequested.java	7 Mar 2005 05:34:35 -0000	1.15
  +++ AckRequested.java	2 May 2005 04:17:09 -0000	1.16
  @@ -87,11 +87,10 @@
        * @return SOAPEnvelope
        * @throws SOAPException
        */
  -    public SOAPEnvelope toSoapEnvelop(SOAPEnvelope envelope)
  -            throws SOAPException {
  +    public SOAPEnvelope toSoapEnvelop(SOAPEnvelope envelope) throws Exception {
   
           SOAPEnvelope env = envelope;
  -
  +        removeHeaders(env);
           /*
            * ackRequested.addChildElement(identifier.getSoapElement());
            * ackRequested.addChildElement(messageNumber.getSoapElement());
  @@ -215,4 +214,19 @@
       public void setMessageNumber(MessageNumber number) {
           messageNumber = number;
       }
  +
  +    public void removeHeaders(SOAPEnvelope soapEnvelope) throws Exception {
  +
  +        Iterator iterator = soapEnvelope.getHeader().getChildElements();
  +        MessageElement childElement;
  +
  +        while (iterator.hasNext()) {
  +            childElement = (MessageElement) iterator.next();
  +
  +            if (Constants.WSRM.ACK_REQUESTED.equals(childElement.getName()) && (Constants.WSRM.NS_URI_RM.equals(childElement.getNamespaceURI()))) {
  +                childElement.detachNode();
  +                break;
  +            }
  +        }
  +    }
   }
  \ No newline at end of file
  
  
  
  1.15      +4 -3      ws-fx/sandesha/src/org/apache/sandesha/ws/rm/Sequence.java
  
  Index: Sequence.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/Sequence.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Sequence.java	27 Apr 2005 10:30:46 -0000	1.14
  +++ Sequence.java	2 May 2005 04:17:09 -0000	1.15
  @@ -109,9 +109,6 @@
           headerElement.setName(Constants.WSRM.SEQUENCE);
           headerElement.setMustUnderstand(true);
   
  -        if (lastMessage != null) {
  -            lastMessage.toSOAPEnvelope(headerElement);
  -        }
   
           if (identifier != null) {
               identifier.toSOAPEnvelope(headerElement);
  @@ -121,6 +118,10 @@
               messageNumber.toSOAPEnvelope(headerElement);
           }
   
  +        if (lastMessage != null) {
  +            lastMessage.toSOAPEnvelope(headerElement);
  +        }
  +
           return env;
       }
   
  
  
  
  1.43      +5 -6      ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java
  
  Index: RMProvider.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/providers/RMProvider.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- RMProvider.java	12 Apr 2005 10:21:57 -0000	1.42
  +++ RMProvider.java	2 May 2005 04:17:09 -0000	1.43
  @@ -64,9 +64,7 @@
           if (isIgnorableMessage(msgContext)) {
               RPCProvider rpcProvider = new RPCProvider();
               rpcProvider.invoke(msgContext);
  -
           } else {
  -
               IStorageManager storageManager = RMInitiator.init(client);
               storageManager.init();
   
  @@ -95,7 +93,11 @@
                   }
               }
   
  -            rmMessageContext.setMessageID(addrHeaders.getMessageID().toString());
  +            if (addrHeaders.getMessageID() == null) {
  +                rmMessageContext.setMessageID((new Long(System.currentTimeMillis())).toString());
  +            } else {
  +                rmMessageContext.setMessageID(addrHeaders.getMessageID().toString());
  +            }
               IRMMessageProcessor rmMessageProcessor = RMMessageProcessorIdentifier.getMessageProcessor(rmMessageContext, storageManager);
   
               try {
  @@ -105,7 +107,6 @@
                   } else {
                       msgContext.setPastPivot(true);
                       // TODO Get the from envCreator
  -
                       // SOAPEnvelope resEn=EnvelopeCreator.createAcknowledgementEnvelope()
                   }
               } catch (AxisFault af) {
  @@ -120,7 +121,6 @@
                   }
                   return;
               }
  -
           }
       }
   
  @@ -157,7 +157,6 @@
               if (key.regionMatches(0, Constants.IGNORE_ACTION, 0, Constants.IGNORE_ACTION.length()))
                   actionList.add(options.get(key));
           }
  -
           return actionList;
       }
   
  
  
  
  1.11      +2 -2      ws-fx/sandesha/src/org/apache/sandesha/ws/utility/Identifier.java
  
  Index: Identifier.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/utility/Identifier.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Identifier.java	16 Feb 2005 04:21:21 -0000	1.10
  +++ Identifier.java	2 May 2005 04:17:09 -0000	1.11
  @@ -45,7 +45,7 @@
        */
       public Identifier() {
           identifierElement = new MessageElement();
  -        identifierElement.setName("wsu:Identifier");
  +        identifierElement.setName("wsrm:Identifier");
       }
   
       /**
  @@ -80,7 +80,7 @@
       public MessageElement toSOAPEnvelope(MessageElement msgElement)
               throws SOAPException {
   
  -        msgElement.addChildElement("Identifier", "wsu").addTextNode(identifier);
  +        msgElement.addChildElement("Identifier", "wsrm").addTextNode(identifier);
           return msgElement;
       }