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 2004/08/11 12:47:51 UTC

cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server AcknowledgementProcessor.java CompositeProcessor.java CreateSequenceProcessor.java CreateSequenceResponseProcessor.java

jaliya      2004/08/11 03:47:51

  Modified:    sandesha/src/org/apache/sandesha/server
                        AcknowledgementProcessor.java
                        CompositeProcessor.java
                        CreateSequenceProcessor.java
                        CreateSequenceResponseProcessor.java
  Log:
  Message Processors implemented
  
  Revision  Changes    Path
  1.2       +135 -7    ws-fx/sandesha/src/org/apache/sandesha/server/AcknowledgementProcessor.java
  
  Index: AcknowledgementProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/AcknowledgementProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AcknowledgementProcessor.java	4 Aug 2004 12:05:43 -0000	1.1
  +++ AcknowledgementProcessor.java	11 Aug 2004 10:47:51 -0000	1.2
  @@ -16,27 +16,155 @@
    */
   package org.apache.sandesha.server;
   
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Vector;
  +
  +import javax.xml.soap.SOAPEnvelope;
  +
  +import org.apache.axis.Message;
  +import org.apache.sandesha.EnvelopeCreator;
  +import org.apache.sandesha.IStorageManager;
   import org.apache.sandesha.RMMessageContext;
  +import org.apache.sandesha.ws.rm.AcknowledgementRange;
  +import org.apache.sandesha.ws.rm.SequenceAcknowledgement;
   
   /**
    * @author 
    */
   public class AcknowledgementProcessor implements IRMMessageProcessor {
  +	IStorageManager storageManger = null;
  +
  +	public AcknowledgementProcessor(IStorageManager storageManger) {
  +		this.storageManger = storageManger;
  +	}
   
  -	/* (non-Javadoc)
  -	 * @see org.apache.sandesha.server.IRMMessageProcessor#processMessage(org.apache.sandesha.RMMessageContext)
  -	 */
   	public boolean processMessage(RMMessageContext rmMessageContext) {
  -		// TODO Auto-generated method stub
  +		SequenceAcknowledgement seqAcknowledgement =
  +			rmMessageContext.getRMHeaders().getSequenceAcknowledgement();
  +		String seqID = seqAcknowledgement.getIdentifier().getIdentifier();
  +		List ackRanges = seqAcknowledgement.getAckRanges();
  +		Iterator ite = ackRanges.iterator();
  +
  +		while (ite.hasNext()) {
  +			AcknowledgementRange ackRange = (AcknowledgementRange) ite.next();
  +			long msgNumber = ackRange.getMinValue();
  +			while (ackRange.getMaxValue() >= msgNumber) {
  +				storageManger.setAcknowledged(seqID,msgNumber);
  +				//storageManager.setAcknowledged(String seqID,long msgNumber)
  +				msgNumber++;
  +			}
  +		}
  +		//At the moment this return is not used.
   		return false;
   	}
   
  -	/* (non-Javadoc)
  -	 * @see org.apache.sandesha.server.IRMMessageProcessor#getSynchronousResponse()
  -	 */
   	public Object getSynchronousResponse() {
   		// TODO Auto-generated method stub
   		return null;
   	}
   
  +	public boolean sendAcknowledgement(RMMessageContext rmMessageContext) {
  +		//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();
  +
  +		//Assume that the list is sorted and in the ascending order.
  +		Map listOfMsgNumbers = storageManger.getListOfMessageNumbers(seqID);
  +		Vector ackRangeVector = null;
  +		if (listOfMsgNumbers != null) {
  +			ackRangeVector = getAckRangesVector(listOfMsgNumbers);
  +		} else {
  +			ackRangeVector = new Vector();
  +			AcknowledgementRange ackRange = new AcknowledgementRange();
  +			ackRange.setMaxValue(messageNumber);
  +			ackRange.setMinValue(messageNumber);
  +			ackRangeVector.add(ackRange);
  +
  +		}
  +
  +		SOAPEnvelope ackEnvelope = EnvelopeCreator.createAcknowledgement(rmMessageContext, ackRangeVector);
  +		//Add the envelope to the response message of the messageContext.
  +		rmMessageContext.getMsgContext().setResponseMessage(new Message(ackEnvelope));
  +
  +		if ((rmMessageContext
  +			.getAddressingHeaders()
  +			.getFrom()
  +			.getAddress()
  +			.toString()
  +			.equals(org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS))) {
  +			//Now we have synchronized ack.
  +			rmMessageContext.getMsgContext().setResponseMessage(new Message(ackEnvelope));
  +			return true;
  +		} else {
  +			//Store the asynchronize ack in the queue.
  +			//The name for this queue is not yet fixed.
  +			storageManger.addAcknowledgement(rmMessageContext);
  +			return false;
  +		}
  +
  +	}
  +	/**
  +	 * This method will split the input map with messages numbers to respectable message ranges
  +	 * and will return a vector of AcknowledgementRange.
  +	 * @param listOfMsgNumbers
  +	 * @return
  +	 */
  +	private Vector getAckRangesVector(Map listOfMsgNumbers) {
  +		long min;
  +		long max;
  +		long size = listOfMsgNumbers.size();
  +		Vector vec = new Vector();
  +		boolean found = false;
  +
  +		min = ((Long) listOfMsgNumbers.get(new Long(1))).longValue();
  +		max = min;
  +
  +		if (size > 1) {
  +			for (long i = 1; i <= size; i++) {
  +				// System.out.println(i);
  +
  +				if (i + 1 > size) {
  +					found = true;
  +					max = ((Long) listOfMsgNumbers.get(new Long(i))).longValue();
  +				} else {
  +
  +					if ((((Long) listOfMsgNumbers.get(new Long(i + 1))).longValue()
  +						- ((Long) listOfMsgNumbers.get(new Long(i))).longValue())
  +						== 1) {
  +						max = ((Long) listOfMsgNumbers.get(new Long(i + 1))).longValue();
  +						found = true;
  +					} else {
  +						found = false;
  +						max = ((Long) listOfMsgNumbers.get(new Long(i))).longValue();
  +						AcknowledgementRange ackRange = new AcknowledgementRange();
  +						ackRange.setMaxValue(max);
  +						ackRange.setMinValue(min);
  +						vec.add(ackRange);
  +						//System.out.println("Range " + min + "  " + max);
  +						min = ((Long) listOfMsgNumbers.get(new Long(i + 1))).longValue();
  +					}
  +
  +				}
  +			}
  +			if (found) {
  +				//System.out.println("Range "+min+"  "+max);
  +				AcknowledgementRange ackRange = new AcknowledgementRange();
  +				ackRange.setMaxValue(max);
  +				ackRange.setMinValue(min);
  +				vec.add(ackRange);
  +			}
  +		} else {
  +			// System.out.println("Range "+min+"  "+max);
  +			AcknowledgementRange ackRange = new AcknowledgementRange();
  +			ackRange.setMaxValue(max);
  +			ackRange.setMinValue(min);
  +			vec.add(ackRange);
  +		}
  +		return vec;
  +	}
   }
  
  
  
  1.2       +33 -7     ws-fx/sandesha/src/org/apache/sandesha/server/CompositeProcessor.java
  
  Index: CompositeProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CompositeProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompositeProcessor.java	4 Aug 2004 12:05:43 -0000	1.1
  +++ CompositeProcessor.java	11 Aug 2004 10:47:51 -0000	1.2
  @@ -16,24 +16,50 @@
    */
   package org.apache.sandesha.server;
   
  +import org.apache.sandesha.IStorageManager;
   import org.apache.sandesha.RMMessageContext;
  +import org.apache.sandesha.ws.rm.RMHeaders;
   
   /**
    * @author 
    */
   public class CompositeProcessor implements IRMMessageProcessor {
   
  -	/* (non-Javadoc)
  -	 * @see org.apache.sandesha.server.IRMMessageProcessor#processMessage(org.apache.sandesha.RMMessageContext)
  -	 */
  +	IStorageManager storageManger = null;
  +
  +	public CompositeProcessor(IStorageManager storageManger) {
  +		this.storageManger = storageManger;
  +	}
  +
   	public boolean processMessage(RMMessageContext rmMessageContext) {
  -		// TODO Auto-generated method stub
  +
  +		//if the message is and Ack then process the ack
  +		//if the message has a body then insert it to the inqueue
  +
  +		RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
  +		AcknowledgementProcessor ackProcessor = new AcknowledgementProcessor(this.storageManger);
  +
  +		if (rmHeaders.getSequenceAcknowledgement() != null) {
  +			ackProcessor.processMessage(rmMessageContext);
  +		}
  +
  +		if (rmHeaders.getSequence().getMessageNumber() != null) {
  +			String sequenceID = rmHeaders.getSequence().getIdentifier().getIdentifier();
  +			long messageNumber = rmHeaders.getSequence().getMessageNumber().getMessageNumber();
  +
  +			if (storageManger.isMessageExist(sequenceID, messageNumber) != true) {
  +				storageManger.insertRequestMessage(rmMessageContext);
  +			}
  +
  +			//send ack
  +			//Send an Ack for every message received by the server.
  +			//This should be changed according to the WS-policy.
  +			return ackProcessor.sendAcknowledgement(rmMessageContext);
  +		}
  +
   		return false;
   	}
   
  -	/* (non-Javadoc)
  -	 * @see org.apache.sandesha.server.IRMMessageProcessor#getSynchronousResponse()
  -	 */
   	public Object getSynchronousResponse() {
   		// TODO Auto-generated method stub
   		return null;
  
  
  
  1.3       +19 -12    ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceProcessor.java
  
  Index: CreateSequenceProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceProcessor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CreateSequenceProcessor.java	5 Aug 2004 11:37:20 -0000	1.2
  +++ CreateSequenceProcessor.java	11 Aug 2004 10:47:51 -0000	1.3
  @@ -16,11 +16,14 @@
    */
   package org.apache.sandesha.server;
   
  +import org.apache.axis.Message;
   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.AddressingHeaders;
   import org.apache.axis.message.addressing.Constants;
   import org.apache.sandesha.EnvelopeCreator;
  +import org.apache.sandesha.IStorageManager;
   import org.apache.sandesha.RMException;
   import org.apache.sandesha.RMMessageContext;
   import org.apache.sandesha.ws.rm.RMHeaders;
  @@ -30,36 +33,40 @@
    */
   public class CreateSequenceProcessor implements IRMMessageProcessor {
   
  -	public boolean processMessage(RMMessageContext rmMessageContext)
  -		throws RMException {
  +	IStorageManager storageManger = null;
  +
  +	public CreateSequenceProcessor(IStorageManager storageManger) {
  +		this.storageManger = storageManger;
  +	}
  +
  +	public boolean processMessage(RMMessageContext rmMessageContext) throws RMException {
   
   		AddressingHeaders addrHeaders = rmMessageContext.getAddressingHeaders();
   		RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
   
   		if (addrHeaders.getReplyTo() != null) {
   
  -			//We have some synchronous stuff here
   			UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
   			String uuid = uuidGen.nextUUID();
   
  -			//Initialize the queue.
  -			ServerQueueManager serverQueueManager = new ServerQueueManager();
  -			serverQueueManager.init();
   			//TODO
  -			serverQueueManager.addSequence(uuid);
  +			storageManger.addSequence(uuid);
   
   			//Create the SOAPEnvelop to send and set it to the resEnv of rmMessageCotext.
  -			//TODO
  -			EnvelopeCreator.createCreateSequenceResponseEnvelope(
  -				uuid,
  -				rmMessageContext);
  +			SOAPEnvelope resEnvelope =
  +				EnvelopeCreator.createCreateSequenceResponseEnvelope(uuid, rmMessageContext);
  +
  +			rmMessageContext.getMsgContext().setResponseMessage(new Message(resEnvelope));
   
  +			//We have some synchronous stuff here
   			if (addrHeaders.getReplyTo().getAddress().toString().equals(Constants.NS_URI_ANONYMOUS)) {
   				//Do we need anything here??
   				//Inform that we have a synchronous response.
   				return true;
   			} else {
  -				serverQueueManager.addMessageToOutQueue(rmMessageContext);
  +				//FIX THIS FIX THIS
  +				//This should be storageManger.addCreateSequenceResponse();
  +				storageManger.addCreateSequenceResponse(rmMessageContext);
   				return false;
   			}
   
  
  
  
  1.2       +25 -8     ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceResponseProcessor.java
  
  Index: CreateSequenceResponseProcessor.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/CreateSequenceResponseProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CreateSequenceResponseProcessor.java	5 Aug 2004 11:38:06 -0000	1.1
  +++ CreateSequenceResponseProcessor.java	11 Aug 2004 10:47:51 -0000	1.2
  @@ -16,25 +16,42 @@
    */
   package org.apache.sandesha.server;
   
  +import org.apache.axis.message.addressing.RelatesTo;
  +import org.apache.sandesha.IStorageManager;
  +import org.apache.sandesha.RMException;
   import org.apache.sandesha.RMMessageContext;
  +import org.apache.sandesha.ws.rm.CreateSequenceResponse;
   
   /**
    * @author JEkanayake
    *
    */
   public class CreateSequenceResponseProcessor implements IRMMessageProcessor {
  +	IStorageManager storageManger=null;
  +	
  +	public CreateSequenceResponseProcessor(IStorageManager storageManger){
  +		this.storageManger=	storageManger;
  +	}
  +	
  +
  +	public boolean processMessage(RMMessageContext rmMessageContext) throws RMException{
  +
  +		CreateSequenceResponse createSeqRes = rmMessageContext.getRMHeaders().getCreateSequenceResponse();
  +		//Assumne that the relatesTo is present.
  +		//CHEK CHEK *********************************************************************************
  +		RelatesTo relatesTo = (RelatesTo) rmMessageContext.getAddressingHeaders().getRelatesTo().get(0);
  +		String sequenceID = createSeqRes.getIdentifier().toString();
  +		
  +		//storageManger.setResponseSequence(String relatesTo,String sequenceID);
  +		//storageManger.setResponseSequence(relatesTo.getId etc..,sequenceID);
  +
  +		//Delete the CreateSequence request message in the create sequence request queue. 
  +		//storageManger.removeCreateSequenceRequest(String messageID)
   
  -	/* (non-Javadoc)
  -	 * @see org.apache.sandesha.server.IRMMessageProcessor#processMessage(org.apache.sandesha.RMMessageContext)
  -	 */
  -	public boolean processMessage(RMMessageContext rmMessageContext) {
  -		// TODO Auto-generated method stub
  +		//No response to this message.
   		return false;
   	}
   
  -	/* (non-Javadoc)
  -	 * @see org.apache.sandesha.server.IRMMessageProcessor#getSynchronousResponse()
  -	 */
   	public Object getSynchronousResponse() {
   		// TODO Auto-generated method stub
   		return null;