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 ga...@apache.org on 2007/01/09 13:19:52 UTC
svn commit: r494387 - in /webservices/sandesha/trunk/java:
src/org/apache/sandesha2/ src/org/apache/sandesha2/client/
src/org/apache/sandesha2/handlers/ src/org/apache/sandesha2/msgprocessors/
src/org/apache/sandesha2/polling/ src/org/apache/sandesha2/...
Author: gatfora
Date: Tue Jan 9 04:19:50 2007
New Revision: 494387
URL: http://svn.apache.org/viewvc?view=rev&rev=494387
Log:
Move toEPR, replyToEPR, acksToEPR and ServerCompleted messages to RMSequenceBean and RMDBean
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaReportsTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java Tue Jan 9 04:19:50 2007
@@ -259,22 +259,13 @@
//For out going sequences this gives the messages that were sent and that were successfully
//acked by the other end point.
String CLIENT_COMPLETED_MESSAGES = "ClientCompletedMessages";
- String SERVER_COMPLETED_MESSAGES = "ServerCompletedMessages";
//For IN_ORDER sequences, we can have finite ranges of messages that can be
//delivered out of order. These are maintained as a String that is consistent
//with the form described in org.apache.sandesha2.util.RangeString
String OUT_OF_ORDER_RANGES = "OutOfOrderRanges";
-
- String TO_EPR = "ToEPR";
-
- String ACKS_TO_EPR = "acksToEPR";
String INTERNAL_SEQUENCE_ID = "TempSequenceId";
-
- String REPLY_TO_EPR = "ReplyToEPR";
-
- String OUT_CREATE_SEQUENCE_SENT = "OutCreateSeqSent";
String INCOMING_SEQUENCE_LIST = "IncomingSequenceList";
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Tue Jan 9 04:19:50 2007
@@ -246,14 +246,13 @@
}
// incoming sequences
- SequencePropertyBean serverCompletedMsgsFindBean = new SequencePropertyBean();
- serverCompletedMsgsFindBean.setName(Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
+ RMDBean rmdBean = new RMDBean();
+ Collection rmdBeans = storageManager.getRMDBeanMgr().find(rmdBean);
- Collection serverCompletedMsgsBeans = seqPropMgr.find(serverCompletedMsgsFindBean);
- Iterator iter = serverCompletedMsgsBeans.iterator();
+ Iterator iter = rmdBeans.iterator();
while (iter.hasNext()) {
- SequencePropertyBean serverCompletedMsgsBean = (SequencePropertyBean) iter.next();
- String sequenceID = serverCompletedMsgsBean.getSequencePropertyKey();
+ RMDBean serverCompletedMsgsBean = (RMDBean) iter.next();
+ String sequenceID = serverCompletedMsgsBean.getSequenceID();
sandeshaReport.addToIncomingSequenceList(sequenceID);
SequenceReport sequenceReport = getIncomingSequenceReport(sequenceID, configurationContext);
@@ -1119,8 +1118,8 @@
SequenceReport sequenceReport = new SequenceReport();
ArrayList completedMessageList = AcknowledgementManager.getServerCompletedMessagesList(sequenceID,
- seqPropMgr);
-
+ storageManager);
+
Iterator iter = completedMessageList.iterator();
while (iter.hasNext()) {
sequenceReport.addCompletedMessage((Long) iter.next());
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Tue Jan 9 04:19:50 2007
@@ -18,7 +18,7 @@
package org.apache.sandesha2.handlers;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.List;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -38,8 +38,7 @@
import org.apache.sandesha2.msgprocessors.SequenceProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.SequencePropertyBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.Sequence;
@@ -173,31 +172,19 @@
if (rmMsgContext.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
Sequence sequence = (Sequence) rmMsgContext.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
- String sequenceId = null;
long msgNo = sequence.getMessageNumber().getMessageNumber();
String propertyKey = SandeshaUtil.getSequencePropertyKey(rmMsgContext);
if (propertyKey != null && msgNo > 0) {
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean receivedMsgsBean = seqPropMgr.retrieve(propertyKey,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
- if (receivedMsgsBean != null) {
- String receivedMsgStr = receivedMsgsBean.getValue();
- ArrayList msgNoArrList = SandeshaUtil.getSplittedMsgNoArraylist(receivedMsgStr);
-
- Iterator iterator = msgNoArrList.iterator();
- while (iterator.hasNext()) {
- String temp = (String) iterator.next();
- String msgNoStr = new Long(msgNo).toString();
- if (msgNoStr.equals(temp)) {
- drop = true;
- }
- }
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, propertyKey);
+ if (rmdBean.getServerCompletedMessages() != null) {
+ if (rmdBean.getServerCompletedMessages().contains(new Long(msgNo)))
+ drop = true;
}
- if (drop == false) {
+ if (!drop) {
// Checking for RM specific EMPTY_BODY LASTMESSAGE.
SOAPBody body = rmMsgContext.getSOAPEnvelope().getBody();
boolean emptyBody = false;
@@ -210,26 +197,21 @@
log.debug(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.emptyLastMsg));
drop = true;
- if (receivedMsgsBean == null) {
- receivedMsgsBean = new SequencePropertyBean(sequenceId,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES, "");
- seqPropMgr.insert(receivedMsgsBean);
+ if (rmdBean.getServerCompletedMessages() == null) {
+ rmdBean.setServerCompletedMessages(new ArrayList());
}
- String receivedMsgStr = receivedMsgsBean.getValue();
- if (!receivedMsgStr.equals("") && receivedMsgStr != null)
- receivedMsgStr = receivedMsgStr + "," + Long.toString(msgNo);
- else
- receivedMsgStr = Long.toString(msgNo);
-
- receivedMsgsBean.setValue(receivedMsgStr);
+ List serverCompletedMsgs = rmdBean.getServerCompletedMessages();
+
+ // Add this message to the completed range
+ serverCompletedMsgs.add(Long.toString(msgNo));
+
+ rmdBean.setServerCompletedMessages(serverCompletedMsgs);
// TODO correct the syntac into '[received msgs]'
- seqPropMgr.update(receivedMsgsBean);
-
- drop = true;
-
+ // Update the rmdBean
+ storageManager.getRMDBeanMgr().update(rmdBean);
}
}
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Tue Jan 9 04:19:50 2007
@@ -47,6 +47,7 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.FaultManager;
@@ -140,12 +141,11 @@
FaultManager.checkForSequenceClosed(rmMsgCtx, sequenceId, storageManager);
// Setting the ack depending on AcksTo.
- SequencePropertyBean acksToBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.ACKS_TO_EPR);
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceId);
SequencePropertyBean versionBean = seqPropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
- EndpointReference acksTo = new EndpointReference(acksToBean.getValue());
+ EndpointReference acksTo = new EndpointReference(rmdBean.getAcksToEPR());
String acksToStr = acksTo.getAddress();
if (acksToStr == null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Tue Jan 9 04:19:50 2007
@@ -42,6 +42,7 @@
import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
@@ -215,18 +216,7 @@
boolean sendCreateSequence = false;
- String outSequenceID = SandeshaUtil.getSequenceIDFromInternalSequenceID(internalSequenceId, storageManager);
-
- // setting async ack endpoint for the server side. (if present)
- if (serverSide) {
-// String incomingSequenceID = SandeshaUtil.getServerSideIncomingSeqIdFromInternalSeqId(internalSequenceId);
- SequencePropertyBean incomingToBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.TO_EPR);
- if (incomingToBean != null) {
- String incomingTo = incomingToBean.getValue();
- msgContext.setProperty(SandeshaClientConstants.AcksTo, incomingTo);
- }
- }
+ RMSBean rmsBean = SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager, internalSequenceId);
// FINDING THE SPEC VERSION
String specVersion = null;
@@ -273,100 +263,92 @@
// TODO change the default to v1_1
specVersion = SpecSpecificConstants.getDefaultSpecVersion();
- if (outSequenceID == null) { // out sequence will be set for the
+ String outSequenceID = null;
+ if (rmsBean == null) { // out sequence will be set for the
// server side, in the case of an offer.
sendCreateSequence = true; // message number being one and not
// having an out sequence, implies
// that a create sequence has to be
// send.
+ } else {
+ outSequenceID = rmsBean.getSequenceID();
}
ServiceContext serviceContext = msgContext.getServiceContext();
OperationContext operationContext = msgContext.getOperationContext();
- RMSBean rmsBean = null;
-
// SENDING THE CREATE SEQUENCE.
if (sendCreateSequence) {
// if first message - setup the sending side sequence - both for the
// server and the client sides
- SequenceManager.setupNewClientSequence(msgContext, sequencePropertyKey, specVersion, storageManager);
+ rmsBean = SequenceManager.setupNewClientSequence(msgContext, sequencePropertyKey, specVersion, storageManager);
EndpointReference acksToEPR = null;
- SequencePropertyBean responseCreateSeqAdded = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.OUT_CREATE_SEQUENCE_SENT);
- if (responseCreateSeqAdded == null) {
- responseCreateSeqAdded = new SequencePropertyBean(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.OUT_CREATE_SEQUENCE_SENT, "true");
- seqPropMgr.insert(responseCreateSeqAdded);
-
- if (serviceContext != null) {
- String address = (String) msgContext.getProperty(SandeshaClientConstants.AcksTo);
- if(address != null) acksToEPR = new EndpointReference(address);
- }
+ if (serviceContext != null) {
+ String address = (String) msgContext.getProperty(SandeshaClientConstants.AcksTo);
+ if(address != null) acksToEPR = new EndpointReference(address);
+ }
- if (msgContext.isServerSide()) {
- // we do not set acksTo value to anonymous when the create
- // sequence is send from the server.
- MessageContext requestMessage;
- try {
- requestMessage = operationContext
- .getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- } catch (AxisFault e) {
- throw new SandeshaException(e);
- }
+ if (msgContext.isServerSide()) {
+ // we do not set acksTo value to anonymous when the create
+ // sequence is send from the server.
+ MessageContext requestMessage;
+ try {
+ requestMessage = operationContext
+ .getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ } catch (AxisFault e) {
+ throw new SandeshaException(e);
+ }
- if (requestMessage == null) {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.requestMsgNotPresent);
- log.debug(message);
- throw new SandeshaException(message);
- }
- acksToEPR = requestMessage.getTo();
+ if (requestMessage == null) {
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.requestMsgNotPresent);
+ log.debug(message);
+ throw new SandeshaException(message);
+ }
+ acksToEPR = requestMessage.getTo();
- } else {
- if (acksToEPR == null){
- EndpointReference replyToEPR = msgContext.getReplyTo();
+ } else {
+ if (acksToEPR == null){
+ EndpointReference replyToEPR = msgContext.getReplyTo();
- if(replyToEPR!=null && !replyToEPR.getAddress().equals("")){
- //use the replyTo address as acksTo
- if (log.isDebugEnabled())
- log.debug("Using replyTo " + replyToEPR + " EPR as AcksTo, addr=" + replyToEPR.getAddress());
+ if(replyToEPR!=null && !replyToEPR.getAddress().equals("")){
+ //use the replyTo address as acksTo
+ if (log.isDebugEnabled())
+ log.debug("Using replyTo " + replyToEPR + " EPR as AcksTo, addr=" + replyToEPR.getAddress());
- acksToEPR = replyToEPR;
- }
+ acksToEPR = replyToEPR;
}
}
+ }
- if (acksToEPR != null && !acksToEPR.hasAnonymousAddress() && !serverSide) {
- String transportIn = (String) configContext // TODO verify
- .getProperty(MessageContext.TRANSPORT_IN);
- if (transportIn == null)
- transportIn = org.apache.axis2.Constants.TRANSPORT_HTTP;
- } else if (acksToEPR == null && serverSide) {
+ if (acksToEPR != null && !acksToEPR.hasAnonymousAddress() && !serverSide) {
+ String transportIn = (String) configContext // TODO verify
+ .getProperty(MessageContext.TRANSPORT_IN);
+ if (transportIn == null)
+ transportIn = org.apache.axis2.Constants.TRANSPORT_HTTP;
+ } else if (acksToEPR == null && serverSide) {
// String incomingSequencId = SandeshaUtil
// .getServerSideIncomingSeqIdFromInternalSeqId(internalSequenceId);
- try {
- MessageContext requestMsgContext = operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- RMMsgContext requestRMMsgContext = MsgInitializer.initializeMessage(requestMsgContext);
+ try {
+ MessageContext requestMsgContext = operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ RMMsgContext requestRMMsgContext = MsgInitializer.initializeMessage(requestMsgContext);
+
+ String requestSideSequencePropertyKey = SandeshaUtil.getSequencePropertyKey(requestRMMsgContext);
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, requestSideSequencePropertyKey);
- String requestSideSequencePropertyKey = SandeshaUtil.getSequencePropertyKey(requestRMMsgContext);
-
- SequencePropertyBean bean = seqPropMgr.retrieve(requestSideSequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR);
- if (bean != null) {
- String beanAcksToValue = bean.getValue();
- if (beanAcksToValue != null)
- acksToEPR = new EndpointReference(beanAcksToValue);
- }
- } catch (AxisFault e) {
- throw new SandeshaException (e);
+ if (rmdBean != null && rmdBean.getReplyToEPR() != null) {
+ String beanAcksToValue = rmdBean.getReplyToEPR();
+ if (beanAcksToValue != null)
+ acksToEPR = new EndpointReference(beanAcksToValue);
}
+ } catch (AxisFault e) {
+ throw new SandeshaException (e);
}
- rmsBean = addCreateSequenceMessage(rmMsgCtx, sequencePropertyKey ,internalSequenceId, acksToEPR, storageManager);
}
+ rmsBean = addCreateSequenceMessage(rmMsgCtx, rmsBean, sequencePropertyKey ,internalSequenceId, acksToEPR, storageManager);
}
if (rmsBean == null) {
@@ -423,6 +405,13 @@
rmsBean.setHighestOutRelatesTo(relatesTo.getValue());
}
+ // setting async ack endpoint for the server side. (if present)
+ if (serverSide) {
+ if (rmsBean.getToEPR() != null) {
+ msgContext.setProperty(SandeshaClientConstants.AcksTo, rmsBean.getToEPR());
+ }
+ }
+
// Update the rmsBean
storageManager.getRMSBeanMgr().update(rmsBean);
@@ -464,8 +453,7 @@
// processing the response if not an dummy.
if (!dummyMessage)
- processResponseMessage(rmMsgCtx, internalSequenceId, outSequenceID, messageNumber, storageKey, storageManager);
-
+ processResponseMessage(rmMsgCtx, rmsBean, internalSequenceId, outSequenceID, messageNumber, storageKey, storageManager);
//Users wont be able to get reliable response msgs in the back channel in the back channel of a
//reliable message. If he doesn't have a endpoint he should use polling mechanisms.
@@ -476,17 +464,17 @@
return true;
}
- private RMSBean addCreateSequenceMessage(RMMsgContext applicationRMMsg, String sequencePropertyKey, String internalSequenceId, EndpointReference acksTo,
+ private RMSBean addCreateSequenceMessage(RMMsgContext applicationRMMsg, RMSBean rmsBean, String sequencePropertyKey, String internalSequenceId, EndpointReference acksTo,
StorageManager storageManager) throws AxisFault {
if (log.isDebugEnabled())
- log.debug("Enter: ApplicationMsgProcessor::addCreateSequenceMessage, " + internalSequenceId);
+ log.debug("Enter: ApplicationMsgProcessor::addCreateSequenceMessage, " + internalSequenceId + ", " + rmsBean);
MessageContext applicationMsg = applicationRMMsg.getMessageContext();
ConfigurationContext configCtx = applicationMsg.getConfigurationContext();
// generating a new create sequeuce message.
- RMMsgContext createSeqRMMessage = RMMsgCreator.createCreateSeqMsg(applicationRMMsg, sequencePropertyKey, acksTo,
+ RMMsgContext createSeqRMMessage = RMMsgCreator.createCreateSeqMsg(rmsBean, applicationRMMsg, sequencePropertyKey, acksTo,
storageManager);
createSeqRMMessage.setFlow(MessageContext.OUT_FLOW);
@@ -516,16 +504,15 @@
String createSequenceMessageStoreKey = SandeshaUtil.getUUID(); // the key that will be used to store
//the create sequence message.
- RMSBean rMSBean = new RMSBean();
- rMSBean.setInternalSequenceID(internalSequenceId);
- rMSBean.setCreateSeqMsgID(createSeqMsg.getMessageID());
- rMSBean.setCreateSequenceMsgStoreKey(createSequenceMessageStoreKey);
+ rmsBean.setInternalSequenceID(internalSequenceId);
+ rmsBean.setCreateSeqMsgID(createSeqMsg.getMessageID());
+ rmsBean.setCreateSequenceMsgStoreKey(createSequenceMessageStoreKey);
//cloning the message and storing it as a reference.
MessageContext clonedMessage = SandeshaUtil.cloneMessageContext(createSeqMsg);
String clonedMsgStoreKey = SandeshaUtil.getUUID();
storageManager.storeMessageContext(clonedMsgStoreKey, clonedMessage);
- rMSBean.setReferenceMessageStoreKey(clonedMsgStoreKey);
+ rmsBean.setReferenceMessageStoreKey(clonedMsgStoreKey);
//TODO set the replyTo of CreateSeq (and others) to Anymomous if Application Msgs hv it as Anonymous.
@@ -549,10 +536,10 @@
SecurityToken token = (SecurityToken) createSeqRMMessage.getProperty(Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(token != null) {
SecurityManager secManager = SandeshaUtil.getSecurityManager(configCtx);
- rMSBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
+ rmsBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
}
- createSeqMgr.insert(rMSBean);
+ createSeqMgr.insert(rmsBean);
// if (createSeqMsg.getReplyTo() == null) {
// String anonymousURI = SpecSpecificConstants.getAddressingAnonymousURI(createSeqMsg);
@@ -579,11 +566,11 @@
retransmitterMgr.insert(createSeqEntry);
if (log.isDebugEnabled())
- log.debug("Exit: ApplicationMsgProcessor::addCreateSequenceMessage, " + rMSBean);
- return rMSBean;
+ log.debug("Exit: ApplicationMsgProcessor::addCreateSequenceMessage, " + rmsBean);
+ return rmsBean;
}
- private void processResponseMessage(RMMsgContext rmMsg, String internalSequenceId, String outSequenceID, long messageNumber,
+ private void processResponseMessage(RMMsgContext rmMsg, RMSBean rmsBean, String internalSequenceId, String outSequenceID, long messageNumber,
String storageKey, StorageManager storageManager) throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter: ApplicationMsgProcessor::processResponseMessage, " + internalSequenceId + ", " + outSequenceID);
@@ -593,22 +580,7 @@
SequencePropertyBeanMgr sequencePropertyMgr = storageManager.getSequencePropertyBeanMgr();
SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
- SequencePropertyBean toBean = sequencePropertyMgr.retrieve(internalSequenceId,
- Sandesha2Constants.SequenceProperties.TO_EPR);
-
- if (toBean == null) {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
- log.debug(message);
- throw new SandeshaException(message);
- }
-
- EndpointReference toEPR = new EndpointReference(toBean.getValue());
-
- if (toEPR == null || toEPR.getAddress() == null || "".equals(toEPR.getAddress())) {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
- log.debug(message);
- throw new SandeshaException(message);
- }
+ EndpointReference toEPR = new EndpointReference(rmsBean.getToEPR());
String newToStr = null;
if (msg.isServerSide()) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Tue Jan 9 04:19:50 2007
@@ -41,6 +41,7 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.FaultManager;
@@ -101,9 +102,9 @@
try {
// Create the new sequence id, as well as establishing the beans that handle the
// sequence state.
- String newSequenceId = SequenceManager.setupNewSequence(createSeqRMMsg, storageManager, secManager, token);
+ RMDBean rmdBean = SequenceManager.setupNewSequence(createSeqRMMsg, storageManager, secManager, token);
- RMMsgContext createSeqResponse = RMMsgCreator.createCreateSeqResponseMsg(createSeqRMMsg, newSequenceId);
+ RMMsgContext createSeqResponse = RMMsgCreator.createCreateSeqResponseMsg(createSeqRMMsg, rmdBean.getSequenceID());
outMessage = createSeqResponse.getMessageContext();
createSeqResponse.setFlow(MessageContext.OUT_FLOW);
@@ -142,12 +143,14 @@
RMSBean rMSBean = new RMSBean();
rMSBean.setSequenceID(offeredSequenceID);
String outgoingSideInternalSequenceId = SandeshaUtil
- .getOutgoingSideInternalSequenceID(newSequenceId);
+ .getOutgoingSideInternalSequenceID(rmdBean.getSequenceID());
rMSBean.setInternalSequenceID(outgoingSideInternalSequenceId);
- rMSBean.setCreateSeqMsgID(SandeshaUtil.getUUID()); // this
- // is a
- // dummy
- // value.
+ // this is a dummy value
+ rMSBean.setCreateSeqMsgID(SandeshaUtil.getUUID());
+
+ rMSBean.setToEPR(rmdBean.getToEPR());
+ rMSBean.setAcksToEPR(rmdBean.getAcksToEPR());
+ rMSBean.setReplyToEPR(rmdBean.getReplyToEPR());
String outgoingSideSequencePropertyKey = outgoingSideInternalSequenceId;
@@ -193,13 +196,6 @@
createSeqResponse.addSOAPEnvelope();
}
}
-
- EndpointReference acksTo = createSeqPart.getAcksTo().getEPR();
- if (acksTo == null || acksTo.getAddress() == null || "".equals(acksTo.getAddress())) {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noAcksToPartInCreateSequence);
- log.debug(message);
- throw new AxisFault(message);
- }
// Add this sequence to the list of inbound sequences
SequencePropertyBean incomingSequenceListBean = seqPropMgr.retrieve(
@@ -217,24 +213,18 @@
}
ArrayList incomingSequenceList = SandeshaUtil.getArrayListFromString(incomingSequenceListBean.getValue());
- incomingSequenceList.add(newSequenceId);
+ incomingSequenceList.add(rmdBean.getSequenceID());
incomingSequenceListBean.setValue(incomingSequenceList.toString());
seqPropMgr.update(incomingSequenceListBean);
//TODO add createSequenceResponse message as the referenceMessage to the RMDBean.
-
-
- SequencePropertyBean acksToBean = new SequencePropertyBean(newSequenceId,
- Sandesha2Constants.SequenceProperties.ACKS_TO_EPR, acksTo.getAddress());
-
- seqPropMgr.insert(acksToBean);
outMessage.setResponseWritten(true);
// commiting tr. before sending the response msg.
- SequenceManager.updateLastActivatedTime(newSequenceId, storageManager);
+ SequenceManager.updateLastActivatedTime(rmdBean.getSequenceID(), storageManager);
AxisEngine engine = new AxisEngine(context);
try{
@@ -247,10 +237,8 @@
}
boolean anon = true;
- SequencePropertyBean toBean = seqPropMgr.retrieve(newSequenceId,
- Sandesha2Constants.SequenceProperties.TO_EPR);
- if (toBean != null) {
- EndpointReference toEPR = new EndpointReference(toBean.getValue());
+ if (rmdBean.getToEPR() != null) {
+ EndpointReference toEPR = new EndpointReference(rmdBean.getToEPR());
if (!toEPR.hasAnonymousAddress()) anon = false;
}
if(anon) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Tue Jan 9 04:19:50 2007
@@ -112,15 +112,15 @@
SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
- RMSBean createSeqBean = createSeqMgr.retrieve(createSeqMsgId);
- if (createSeqBean == null) {
+ RMSBean rmsBean = createSeqMgr.retrieve(createSeqMsgId);
+ if (rmsBean == null) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.createSeqEntryNotFound);
log.debug(message);
throw new SandeshaException(message);
}
// Check that the create sequence response message proves possession of the correct token
- String tokenData = createSeqBean.getSecurityTokenData();
+ String tokenData = rmsBean.getSecurityTokenData();
if(tokenData != null) {
SecurityManager secManager = SandeshaUtil.getSecurityManager(configCtx);
MessageContext crtSeqResponseCtx = createSeqResponseRMMsgCtx.getMessageContext();
@@ -129,7 +129,7 @@
secManager.checkProofOfPossession(token, body, crtSeqResponseCtx);
}
- String internalSequenceId = createSeqBean.getInternalSequenceID();
+ String internalSequenceId = rmsBean.getInternalSequenceID();
if (internalSequenceId == null || "".equals(internalSequenceId)) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.tempSeqIdNotSet);
log.debug(message);
@@ -139,21 +139,20 @@
String sequencePropertyKey = SandeshaUtil.getSequencePropertyKey(createSeqResponseRMMsgCtx);
- createSeqBean.setSequenceID(newOutSequenceId);
+ rmsBean.setSequenceID(newOutSequenceId);
// We must poll for any reply-to that uses the anonymous URI. If it is a ws-a reply to then
// the create must include an offer (or this client cannot be identified). If the reply-to
// is the RM anon URI template then the offer is not required.
if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(createSeqResponseRMMsgCtx.getRMSpecVersion())) {
- String replyToAddress = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR, storageManager);
+ String replyToAddress = rmsBean.getReplyToEPR();
if(SandeshaUtil.isWSRMAnonymous(replyToAddress)) {
- createSeqBean.setPollingMode(true);
+ rmsBean.setPollingMode(true);
SandeshaUtil.startPollingManager(configCtx);
}
}
- createSeqMgr.update(createSeqBean);
+ createSeqMgr.update(rmsBean);
SenderBean createSequenceSenderBean = retransmitterMgr.retrieve(createSeqMsgId);
if (createSequenceSenderBean == null)
@@ -175,7 +174,6 @@
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN, tokenData);
sequencePropMgr.insert(newToken);
}
-
// processing for accept (offer has been sent)
Accept accept = createSeqResponsePart.getAccept();
@@ -192,16 +190,11 @@
}
String offeredSequenceId = offeredSequenceBean.getValue();
-
- EndpointReference acksToEPR = accept.getAcksTo().getEPR();
- SequencePropertyBean acksToBean = new SequencePropertyBean();
- acksToBean.setName(Sandesha2Constants.SequenceProperties.ACKS_TO_EPR);
- acksToBean.setSequencePropertyKey(offeredSequenceId);
- acksToBean.setValue(acksToEPR.getAddress());
-
- sequencePropMgr.insert(acksToBean);
RMDBean rMDBean = new RMDBean();
+
+ EndpointReference acksToEPR = accept.getAcksTo().getEPR();
+ rMDBean.setAcksToEPR(acksToEPR.getAddress());
rMDBean.setSequenceID(offeredSequenceId);
rMDBean.setNextMsgNoToProcess(1);
@@ -209,7 +202,7 @@
//of the receiving side as well.
//This can be used when creating new outgoing messages.
- String referenceMsgStoreKey = createSeqBean.getReferenceMessageStoreKey();
+ String referenceMsgStoreKey = rmsBean.getReferenceMessageStoreKey();
MessageContext referenceMsg = storageManager.retrieveMessageContext(referenceMsgStoreKey, configCtx);
String newMessageStoreKey = SandeshaUtil.getUUID();
@@ -221,27 +214,24 @@
// rmdBean for polling too, so that it still gets serviced after the outbound
// sequence terminates.
if (Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(createSeqResponseRMMsgCtx.getRMSpecVersion())) {
- String replyToAddress = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR, storageManager);
+ String replyToAddress = rmsBean.getReplyToEPR();
EndpointReference ref = new EndpointReference(replyToAddress);
- if(!createSeqBean.isPollingMode() && (replyToAddress == null || ref.hasAnonymousAddress())) {
+ if(!rmsBean.isPollingMode() && (replyToAddress == null || ref.hasAnonymousAddress())) {
rMDBean.setPollingMode(true);
SandeshaUtil.startPollingManager(configCtx);
}
}
- RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
- nextMsgMgr.insert(rMDBean);
-
String rmSpecVersion = createSeqResponseRMMsgCtx.getRMSpecVersion();
SequencePropertyBean specVersionBean = new SequencePropertyBean(offeredSequenceId,
Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION, rmSpecVersion);
sequencePropMgr.insert(specVersionBean);
- SequencePropertyBean receivedMsgBean = new SequencePropertyBean(offeredSequenceId,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES, "");
- sequencePropMgr.insert(receivedMsgBean);
+ rMDBean.setServerCompletedMessages(new ArrayList());
+
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ rmdBeanMgr.insert(rMDBean);
SequencePropertyBean msgsBean = new SequencePropertyBean();
msgsBean.setSequencePropertyKey(offeredSequenceId);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java Tue Jan 9 04:19:50 2007
@@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import javax.xml.namespace.QName;
@@ -140,9 +141,6 @@
// updating the last activated time of the sequence.
SequenceManager.updateLastActivatedTime(propertyKey, storageManager);
- SequencePropertyBean msgsBean = seqPropMgr.retrieve(propertyKey,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
-
long msgNo = sequence.getMessageNumber().getMessageNumber();
if (msgNo == 0) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.invalidMsgNumber, Long
@@ -159,7 +157,7 @@
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotFindSequence,
sequenceId));
}
-
+
String key = SandeshaUtil.getUUID(); // key to store the message.
// updating the Highest_In_Msg_No property which gives the highest
// message number retrieved from this sequence.
@@ -177,21 +175,13 @@
bean.setHighestInMessageId(messageId);
bean.setHighestInMessageNumber(msgNo);
- // Update the bean
- mgr.update(bean);
}
- String messagesStr = "";
- if (msgsBean != null)
- messagesStr = msgsBean.getValue();
- else {
- msgsBean = new SequencePropertyBean();
- msgsBean.setSequencePropertyKey(propertyKey);
- msgsBean.setName(Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
- msgsBean.setValue(messagesStr);
- }
-
- boolean msgNoPresentInList = msgNoPresentInList(messagesStr, msgNo);
+ // Get the server completed messages list
+ List serverCompletedMessages = bean.getServerCompletedMessages();
+
+ // If the message in the list of completed
+ boolean msgNoPresentInList = serverCompletedMessages.contains(new Long(msgNo));
if (msgNoPresentInList
&& (Sandesha2Constants.QOS.InvocationType.DEFAULT_INVOCATION_TYPE == Sandesha2Constants.QOS.InvocationType.EXACTLY_ONCE)) {
@@ -203,14 +193,11 @@
if (!msgNoPresentInList)
{
- if (messagesStr != null && !"".equals(messagesStr))
- messagesStr = messagesStr + "," + Long.toString(msgNo);
- else
- messagesStr = Long.toString(msgNo);
-
- msgsBean.setValue(messagesStr);
- seqPropMgr.update(msgsBean);
+ serverCompletedMessages.add(new Long(msgNo));
}
+
+ // Update the RMD bean
+ mgr.update(bean);
// inorder invocation is still a global property
boolean inOrderInvocation = SandeshaUtil.getPropertyBean(
@@ -254,20 +241,6 @@
if (log.isDebugEnabled())
log.debug("Exit: SequenceProcessor::processReliableMessage " + msgCtxPaused);
return msgCtxPaused;
- }
-
- // TODO convert following from INT to LONG
- private boolean msgNoPresentInList(String list, long no) {
- String[] msgStrs = list.split(",");
-
- int l = msgStrs.length;
-
- for (int i = 0; i < l; i++) {
- if (msgStrs[i].equals(Long.toString(no)))
- return true;
- }
-
- return false;
}
public static void sendAckIfNeeded(RMMsgContext rmMsgCtx, StorageManager storageManager)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java Tue Jan 9 04:19:50 2007
@@ -37,6 +37,7 @@
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMSequenceBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -112,7 +113,7 @@
}
}
RMSBean beanToPoll = (RMSBean) results.get(rmsIndex++);
- pollForSequence(beanToPoll.getSequenceID(), beanToPoll.getInternalSequenceID(), beanToPoll.getReferenceMessageStoreKey());
+ pollForSequence(beanToPoll.getSequenceID(), beanToPoll.getInternalSequenceID(), beanToPoll.getReferenceMessageStoreKey(), beanToPoll);
if(log.isDebugEnabled()) log.debug("Exit: PollingManager::pollRMSSide");
}
@@ -140,13 +141,13 @@
}
}
RMDBean nextMsgBean = (RMDBean) results.get(rmdIndex++);
- pollForSequence(nextMsgBean.getSequenceID(), nextMsgBean.getSequenceID(), nextMsgBean.getReferenceMessageKey());
+ pollForSequence(nextMsgBean.getSequenceID(), nextMsgBean.getSequenceID(), nextMsgBean.getReferenceMessageKey(), nextMsgBean);
if(log.isDebugEnabled()) log.debug("Entry: PollingManager::pollRMDSide");
}
- private void pollForSequence(String sequenceId, String sequencePropertyKey, String referenceMsgKey) throws SandeshaException, SandeshaStorageException, AxisFault {
- if(log.isDebugEnabled()) log.debug("Entry: PollingManager::pollForSequence, " + sequenceId + ", " + sequencePropertyKey + ", " + referenceMsgKey);
+ private void pollForSequence(String sequenceId, String sequencePropertyKey, String referenceMsgKey, RMSequenceBean rmBean) throws SandeshaException, SandeshaStorageException, AxisFault {
+ if(log.isDebugEnabled()) log.debug("Entry: PollingManager::pollForSequence, " + sequenceId + ", " + sequencePropertyKey + ", " + referenceMsgKey + ", " + rmBean);
// Don't poll for a terminated sequence
// TODO once the 'terminated' flag is a property on the RMS / RMD bean, we should
@@ -159,8 +160,7 @@
}
//create a MakeConnection message
- String replyTo = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR,storageManager);
+ String replyTo = rmBean.getReplyToEPR();
String WSRMAnonReplyToURI = null;
if (SandeshaUtil.isWSRMAnonymous(replyTo)) {
// If we are polling on a RM anon URI then we don't want to include the sequence id
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java Tue Jan 9 04:19:50 2007
@@ -17,6 +17,8 @@
package org.apache.sandesha2.storage.beans;
+import java.util.List;
+
/**
* This bean is used at the receiving side (of both server and client)
* There is one entry for each sequence.
@@ -31,14 +33,7 @@
* The next message to be invoked of the representing sequence.
*/
private long nextMsgNoToProcess;
-
- /**
- * This tells weather this sequence is in the polling mode or not.
- * PollingManager will use this property decide the sequences that need
- * polling and will do MakeConnections on them.
- */
- private boolean pollingMode=false;
-
+
/**
* This will be used as a referenced
*/
@@ -48,7 +43,7 @@
private String highestInMessageId;
-
+ private List serverCompletedMessages = null;
public RMDBean() {
@@ -74,14 +69,6 @@
this.nextMsgNoToProcess = nextMsgNoToProcess;
}
- public boolean isPollingMode() {
- return pollingMode;
- }
-
- public void setPollingMode(boolean pollingMode) {
- this.pollingMode = pollingMode;
- }
-
public String getReferenceMessageKey() {
return referenceMessageKey;
}
@@ -111,11 +98,18 @@
result.append(this.getClass().getName());
result.append(super.toString());
result.append("\nNext Msg # : "); result.append(nextMsgNoToProcess);
- result.append("\nPolling : "); result.append(pollingMode);
result.append("\nRef Msg Key: "); result.append(referenceMessageKey);
result.append("\nHishestInMessageNumber: "); result.append(highestInMessageNumber);
result.append("\nHishestInMessageKey: "); result.append(highestInMessageId);
return result.toString();
}
+
+ public List getServerCompletedMessages() {
+ return serverCompletedMessages;
+ }
+
+ public void setServerCompletedMessages(List serverCompletedMessages) {
+ this.serverCompletedMessages = serverCompletedMessages;
+ }
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java Tue Jan 9 04:19:50 2007
@@ -46,15 +46,7 @@
* This is the security token data needed to reconstruct the token that secures this sequence.
*/
private String securityTokenData;
-
-
- /**
- * Set to true if this RMS used a WS-RM anon replyTo, so that we can poll for messages
- * related to that URI.
- */
- private boolean pollingMode;
-
-
+
/**
* The key that is used to store the CreateSequence message in the Message Storage.
* This is stored here, so that the CreateSequence message can be used as a reference when Sandesha
@@ -145,14 +137,6 @@
public void setReferenceMessageStoreKey(String referenceMessageStoreKey) {
this.referenceMessageStoreKey = referenceMessageStoreKey;
}
-
- public boolean isPollingMode() {
- return pollingMode;
- }
-
- public void setPollingMode(boolean pollingMode) {
- this.pollingMode = pollingMode;
- }
public Exception getLastSendError() {
return lastSendError;
@@ -218,7 +202,6 @@
result.append("\nHas SecurityToken: "); result.append(securityTokenData != null && securityTokenData.length() > 0);
result.append("\nCreateSeq Msg Key: "); result.append(createSequenceMsgStoreKey);
result.append("\nReference Msg Key: "); result.append(referenceMessageStoreKey);
- result.append("\nPolling : "); result.append(pollingMode);
result.append("\nLastOutMessageNumber: "); result.append(lastOutMessage);
result.append("\nHighestOutMessage: "); result.append(highestOutMessageNumber);
result.append("\nHighestOutRelatesTo: ");result.append(highestOutRelatesTo);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java Tue Jan 9 04:19:50 2007
@@ -30,6 +30,19 @@
* The sequenceID of the representing sequence.
*/
private String sequenceID;
+
+ private String toEPR;
+
+ private String replyToEPR;
+
+ private String acksToEPR;
+
+ /**
+ * This tells weather this sequence is in the polling mode or not.
+ * PollingManager will use this property decide the sequences that need
+ * polling and will do MakeConnections on them.
+ */
+ private boolean pollingMode=false;
public RMSequenceBean() {
@@ -54,10 +67,45 @@
this.sequenceID = sequenceID;
}
+ public String getAcksToEPR() {
+ return acksToEPR;
+ }
+
+ public void setAcksToEPR(String acksToEPR) {
+ this.acksToEPR = acksToEPR;
+ }
+
+ public String getReplyToEPR() {
+ return replyToEPR;
+ }
+
+ public void setReplyToEPR(String replyToEPR) {
+ this.replyToEPR = replyToEPR;
+ }
+
+ public String getToEPR() {
+ return toEPR;
+ }
+
+ public void setToEPR(String toEPR) {
+ this.toEPR = toEPR;
+ }
+
+ public boolean isPollingMode() {
+ return pollingMode;
+ }
+
+ public void setPollingMode(boolean pollingMode) {
+ this.pollingMode = pollingMode;
+ }
+
public String toString() {
StringBuffer result = new StringBuffer();
result.append("\nSequence Id: "); result.append(sequenceID);
+ result.append("\ntoEPR : "); result.append(toEPR);
+ result.append("\nreplyToEPR : "); result.append(replyToEPR);
+ result.append("\nacksToEPR : "); result.append(acksToEPR);
+ result.append("\nPolling : "); result.append(pollingMode);
return result.toString();
}
-
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Tue Jan 9 04:19:50 2007
@@ -164,14 +164,18 @@
}
public MessageContext retrieveMessageContext(String key,ConfigurationContext context) throws SandeshaStorageException {
+ if(log.isDebugEnabled()) log.debug("Enter: InMemoryStorageManager::retrieveMessageContext, key: " + key);
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
- if (storageMap==null)
+ if (storageMap==null) {
+ if(log.isDebugEnabled()) log.debug("Exit: InMemoryStorageManager::retrieveMessageContext");
return null;
+ }
MessageContext messageContext = (MessageContext) storageMap.get(key);
HashMap envMap = (HashMap) getContext().getProperty(ENVELOPE_MAP_KEY);
if(envMap==null) {
+ if(log.isDebugEnabled()) log.debug("Exit: InMemoryStorageManager::retrieveMessageContext");
return null;
}
@@ -190,11 +194,12 @@
}
}
+ if(log.isDebugEnabled()) log.debug("Exit: InMemoryStorageManager::retrieveMessageContext, " + messageContext);
return messageContext;
}
public void storeMessageContext(String key,MessageContext msgContext) {
- if(log.isDebugEnabled()) log.debug("Entry: InMemoryStorageManager::storeMessageContext, key: " + key);
+ if(log.isDebugEnabled()) log.debug("Enter: InMemoryStorageManager::storeMessageContext, key: " + key);
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
if (storageMap==null) {
@@ -227,7 +232,7 @@
}
public void updateMessageContext(String key,MessageContext msgContext) throws SandeshaStorageException {
- if(log.isDebugEnabled()) log.debug("Entry: InMemoryStorageManager::updateMessageContext, key: " + key);
+ if(log.isDebugEnabled()) log.debug("Enter: InMemoryStorageManager::updateMessageContext, key: " + key);
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
@@ -252,8 +257,8 @@
if(log.isDebugEnabled()) log.debug("Exit: InMemoryStorageManager::updateMessageContext, key: " + key);
}
- public void removeMessageContext(String key) throws SandeshaStorageException {
- if(log.isDebugEnabled()) log.debug("Entry: InMemoryStorageManager::removeMessageContext, key: " + key);
+ public void removeMessageContext(String key) {
+ if(log.isDebugEnabled()) log.debug("Enter: InMemoryStorageManager::removeMessageContext, key: " + key);
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
HashMap envelopeMap = (HashMap) getContext().getProperty(ENVELOPE_MAP_KEY);
@@ -273,5 +278,6 @@
}
}
+
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java Tue Jan 9 04:19:50 2007
@@ -43,6 +43,7 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
@@ -98,7 +99,7 @@
Collection collection = retransmitterBeanMgr.find(findBean);
Iterator it = collection.iterator();
- piggybackLoop: while (it.hasNext()) {
+ while (it.hasNext()) {
SenderBean ackBean = (SenderBean) it.next();
long timeNow = System.currentTimeMillis();
@@ -187,20 +188,14 @@
return completedMsgList;
}
- public static ArrayList getServerCompletedMessagesList(String sequenceID, SequencePropertyBeanMgr seqPropMgr)
+ public static ArrayList getServerCompletedMessagesList(String sequenceID, StorageManager storageManager)
throws SandeshaException {
if (log.isDebugEnabled())
- log.debug("Enter: AcknowledgementManager::getServerCompletedMessagesList");
+ log.debug("Enter: AcknowledgementManager::getServerCompletedMessagesList " + sequenceID);
- SequencePropertyBean completedMessagesBean = null;
-
- completedMessagesBean = seqPropMgr.retrieve(sequenceID,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
-
- ArrayList completedMsgList = null;
- if (completedMessagesBean != null) {
- completedMsgList = SandeshaUtil.getArrayListFromMsgsString(completedMessagesBean.getValue());
- } else {
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceID);
+
+ if (rmdBean.getServerCompletedMessages() == null) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.completedMsgBeanIsNull, sequenceID);
SandeshaException e = new SandeshaException(message);
if(log.isDebugEnabled()) log.debug("Throwing exception", e);
@@ -209,7 +204,7 @@
if (log.isDebugEnabled())
log.debug("Exit: AcknowledgementManager::getServerCompletedMessagesList");
- return completedMsgList;
+ return (ArrayList)rmdBean.getServerCompletedMessages();
}
public static RMMsgContext generateAckMessage(RMMsgContext referenceRMMessage, String sequencePropertyKey ,String sequenceId,
@@ -219,13 +214,10 @@
MessageContext referenceMsg = referenceRMMessage.getMessageContext();
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
-
// Setting the ack depending on AcksTo.
- SequencePropertyBean acksToBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.ACKS_TO_EPR);
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceId);
- EndpointReference acksTo = new EndpointReference(acksToBean.getValue());
+ EndpointReference acksTo = new EndpointReference(rmdBean.getAcksToEPR());
String acksToStr = acksTo.getAddress();
if (acksToStr == null)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java Tue Jan 9 04:19:50 2007
@@ -43,6 +43,8 @@
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.Accept;
import org.apache.sandesha2.wsrm.AckFinal;
@@ -80,7 +82,7 @@
* @return
* @throws SandeshaException
*/
- public static RMMsgContext createCreateSeqMsg(RMMsgContext applicationRMMsg, String sequencePropertyKey,
+ public static RMMsgContext createCreateSeqMsg(RMSBean rmsBean, RMMsgContext applicationRMMsg, String sequencePropertyKey,
EndpointReference acksToEPR, StorageManager storageManager) throws AxisFault {
MessageContext applicationMsgContext = applicationRMMsg.getMessageContext();
@@ -172,11 +174,8 @@
}
}
- String to = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.TO_EPR, storageManager);
- String replyTo = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR,
- storageManager);
+ String to = rmsBean.getToEPR();
+ String replyTo = rmsBean.getReplyToEPR();
if (to == null) {
String message = SandeshaMessageHelper
@@ -446,11 +445,7 @@
if(log.isDebugEnabled())
log.debug("Entry: RMMsgCreator::addAckMessage " + sequenceId);
- SOAPFactory factory = null;
SOAPEnvelope envelope = applicationMsg.getSOAPEnvelope();
- factory = (SOAPFactory) envelope.getOMFactory();
-
- envelope = applicationMsg.getSOAPEnvelope();
String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
if (rmVersion == null)
@@ -465,11 +460,9 @@
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean seqBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
- String msgNoList = seqBean.getValue();
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceId);
- ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(msgNoList, factory, rmNamespaceValue);
+ ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(rmdBean.getServerCompletedMessages(), rmNamespaceValue);
Iterator iterator = ackRangeArrayList.iterator();
while (iterator.hasNext()) {
AcknowledgementRange ackRange = (AcknowledgementRange) iterator.next();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Tue Jan 9 04:19:50 2007
@@ -22,6 +22,7 @@
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -70,8 +71,10 @@
import org.apache.sandesha2.polling.PollingManager;
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.storage.StorageManager;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
@@ -125,13 +128,12 @@
* @return
* @throws SandeshaException
*/
- public static ArrayList getAckRangeArrayList(String msgNoStr, SOAPFactory factory, String rmNamespaceValue)
+ public static ArrayList getAckRangeArrayList(List completedMessages, String rmNamespaceValue)
throws SandeshaException {
ArrayList ackRanges = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(msgNoStr, ",");
- ArrayList sortedMsgNoArrayList = getSortedMsgNoArrayList(tokenizer);
+ ArrayList sortedMsgNoArrayList = getSortedMsgNoArrayList(completedMessages);
Iterator iterator = sortedMsgNoArrayList.iterator();
long lower = 0;
@@ -172,28 +174,7 @@
return ackRanges;
}
- private static ArrayList getSortedMsgNoArrayList(StringTokenizer tokenizer) throws SandeshaException {
- ArrayList msgNubers = new ArrayList();
-
- while (tokenizer.hasMoreElements()) {
- String temp = tokenizer.nextToken();
-
- try {
- long msgNo = Long.parseLong(temp);
- msgNubers.add(new Long(msgNo));
- } catch (Exception ex) {
- String message = SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.invalidMsgNumberList);
- log.debug(message);
- throw new SandeshaException(message);
- }
- }
-
- ArrayList sortedMsgNumberList = sort(msgNubers);
- return sortedMsgNumberList;
- }
-
- public static ArrayList sort(ArrayList list) {
+ public static ArrayList getSortedMsgNoArrayList(List list) {
ArrayList sortedList = new ArrayList();
@@ -771,6 +752,18 @@
return bean;
}
+ public static RMDBean getRMDBeanFromSequenceId(StorageManager storageManager, String sequenceID)
+
+ throws SandeshaException {
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ RMDBean bean = new RMDBean();
+ bean.setSequenceID(sequenceID);
+
+ bean = rmdBeanMgr.findUnique(bean);
+
+ return bean;
+ }
+
public static String getSequenceIDFromInternalSequenceID(String internalSequenceID,
StorageManager storageManager) throws SandeshaException {
@@ -1235,6 +1228,5 @@
}
return newEPR;
- }
-
+ }
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Tue Jan 9 04:19:50 2007
@@ -8,14 +8,15 @@
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.ArrayList;
import javax.xml.namespace.QName;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.engine.ListenerManager;
@@ -35,6 +36,7 @@
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.CreateSequence;
@@ -51,11 +53,16 @@
* Set up a new inbound sequence, triggered by the arrival of a create sequence message. As this
* is an inbound sequence, the sequencePropertyKey is the sequenceId.
*/
- public static String setupNewSequence(RMMsgContext createSequenceMsg, StorageManager storageManager, SecurityManager securityManager, SecurityToken token)
+ public static RMDBean setupNewSequence(RMMsgContext createSequenceMsg, StorageManager storageManager, SecurityManager securityManager, SecurityToken token)
throws AxisFault {
-
+ if (log.isDebugEnabled())
+ log.debug("Enter: SequenceManager::setupNewSequence");
+
String sequenceId = SandeshaUtil.getUUID();
+ // Generate the new RMD Bean
+ RMDBean rmdBean = new RMDBean();
+
EndpointReference to = createSequenceMsg.getTo();
if (to == null) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
@@ -86,27 +93,14 @@
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean receivedMsgBean = new SequencePropertyBean(sequenceId,
- Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES, "");
-
- // If no replyTo value. Send responses as sync.
- SequencePropertyBean toBean = null;
- if (replyTo != null) {
- toBean = new SequencePropertyBean(sequenceId, Sandesha2Constants.SequenceProperties.TO_EPR, replyTo
- .getAddress());
- }
-
- SequencePropertyBean replyToBean = new SequencePropertyBean(sequenceId,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR, to.getAddress());
- SequencePropertyBean acksToBean = new SequencePropertyBean(sequenceId,
- Sandesha2Constants.SequenceProperties.ACKS_TO_EPR, acksTo.getAddress());
+ rmdBean.setServerCompletedMessages(new ArrayList());
- seqPropMgr.insert(receivedMsgBean);
- seqPropMgr.insert(replyToBean);
- seqPropMgr.insert(acksToBean);
+ rmdBean.setReplyToEPR(to.getAddress());
+ rmdBean.setAcksToEPR(acksTo.getAddress());
- if (toBean != null)
- seqPropMgr.insert(toBean);
+ // If no replyTo value. Send responses as sync.
+ if (replyTo != null)
+ rmdBean.setToEPR(replyTo.getAddress());
// Store the security token alongside the sequence
if(token != null) {
@@ -118,7 +112,6 @@
RMDBeanMgr nextMsgMgr = storageManager.getRMDBeanMgr();
- RMDBean rmdBean = new RMDBean();
rmdBean.setSequenceID(sequenceId);
rmdBean.setNextMsgNoToProcess(1);
@@ -163,16 +156,21 @@
// TODO get the SOAP version from the create seq message.
- return sequenceId;
+ if (log.isDebugEnabled())
+ log.debug("Exit: SequenceManager::setupNewSequence, " + rmdBean);
+ return rmdBean;
}
public void removeSequence(String sequence) {
}
- public static void setupNewClientSequence(MessageContext firstAplicationMsgCtx, String sequencePropertyKey,
+ public static RMSBean setupNewClientSequence(MessageContext firstAplicationMsgCtx, String sequencePropertyKey,
String specVersion, StorageManager storageManager) throws SandeshaException {
-
+ if (log.isDebugEnabled())
+ log.debug("Enter: SequenceManager::setupNewClientSequence " + sequencePropertyKey);
+
+ RMSBean rmsBean = new RMSBean();
ConfigurationContext configurationContext = firstAplicationMsgCtx.getConfigurationContext();
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
@@ -193,10 +191,7 @@
throw new SandeshaException(message);
}
- SequencePropertyBean toBean = new SequencePropertyBean(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.TO_EPR, toEPR.getAddress());
- SequencePropertyBean replyToBean = null;
- SequencePropertyBean acksToBean = null;
+ rmsBean.setToEPR(toEPR.getAddress());
if (firstAplicationMsgCtx.isServerSide()) {
// setting replyTo value, if this is the server side.
@@ -211,24 +206,12 @@
throw new SandeshaException(message);
}
- EndpointReference replyToEPR = requestMessage.getTo(); // 'replyTo'
- // of
- // the
- // response
- // msg
- // is
- // the
- // 'to'
- // value
- // of
- // the
- // req
- // msg.
+ // replyTo of the response msg is the 'to' value of the req msg
+ EndpointReference replyToEPR = requestMessage.getTo();
+
if (replyToEPR != null) {
- replyToBean = new SequencePropertyBean(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR, replyToEPR.getAddress());
- acksToBean = new SequencePropertyBean(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.ACKS_TO_EPR, replyToEPR.getAddress());
+ rmsBean.setReplyToEPR(replyToEPR.getAddress());
+ rmsBean.setAcksToEPR(replyToEPR.getAddress());
} else {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
log.error(message);
@@ -243,8 +226,7 @@
} else {
EndpointReference replyToEPR = firstAplicationMsgCtx.getReplyTo();
if (replyToEPR!=null) {
- replyToBean = new SequencePropertyBean(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR, replyToEPR.getAddress());
+ rmsBean.setReplyToEPR(replyToEPR.getAddress());
}
}
@@ -252,8 +234,7 @@
// Default value for acksTo is anonymous (this happens only for the client side)
boolean anonAcks = true;
if (acksTo != null) {
- acksToBean = new SequencePropertyBean(sequencePropertyKey, Sandesha2Constants.SequenceProperties.ACKS_TO_EPR,
- acksTo);
+ rmsBean.setAcksToEPR(acksTo);
EndpointReference epr = new EndpointReference(acksTo);
anonAcks = epr.hasAnonymousAddress();
}
@@ -289,14 +270,8 @@
seqPropMgr.insert(msgsBean);
- seqPropMgr.insert(toBean);
- if (acksToBean != null)
- seqPropMgr.insert(acksToBean);
- if (replyToBean != null)
- seqPropMgr.insert(replyToBean);
-
// saving transportTo value;
- String transportTo = (String) firstAplicationMsgCtx.getProperty(MessageContextConstants.TRANSPORT_URL);
+ String transportTo = (String) firstAplicationMsgCtx.getProperty(Constants.Configuration.TRANSPORT_URL);
if (transportTo != null) {
SequencePropertyBean transportToBean = new SequencePropertyBean();
transportToBean.setSequencePropertyKey(sequencePropertyKey);
@@ -315,12 +290,13 @@
// updating the last activated time.
updateLastActivatedTime(sequencePropertyKey, storageManager);
-
+
SandeshaUtil.startSenderForTheSequence(configurationContext, sequencePropertyKey);
-
updateClientSideListnerIfNeeded(firstAplicationMsgCtx, anonAcks);
-
+ if (log.isDebugEnabled())
+ log.debug("Exit: SequenceManager::setupNewClientSequence " + rmsBean);
+ return rmsBean;
}
private static void updateClientSideListnerIfNeeded(MessageContext messageContext, boolean anonAcks)
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java Tue Jan 9 04:19:50 2007
@@ -353,13 +353,12 @@
toEPR = new EndpointReference (endpointBean.getValue());
}
+ RMSBean rmsBean = SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager, internalSequenceID);
+
if (toEPR==null) {
-
- SequencePropertyBean toBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.TO_EPR);
- if (toBean!=null) {
- toEPR = new EndpointReference(toBean.getValue());
+ if (rmsBean.getToEPR()!=null) {
+ toEPR = new EndpointReference(rmsBean.getToEPR());
if (toEPR == null) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null);
throw new SandeshaException(message);
@@ -370,10 +369,8 @@
if (toEPR!=null)
terminateRMMessage.setTo(toEPR);
- SequencePropertyBean replyToBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.REPLY_TO_EPR);
- if (replyToBean!=null) {
- terminateRMMessage.setReplyTo(new EndpointReference (replyToBean.getValue()));
+ if (rmsBean.getReplyToEPR()!=null) {
+ terminateRMMessage.setReplyTo(new EndpointReference (rmsBean.getReplyToEPR()));
}
String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaReportsTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaReportsTest.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaReportsTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaReportsTest.java Tue Jan 9 04:19:50 2007
@@ -82,7 +82,6 @@
TestCallback callback1 = new TestCallback ("Callback 1");
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo1",sequenceKey),callback1);
- clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true");
TestCallback callback2 = new TestCallback ("Callback 2");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo2",sequenceKey),callback2);
@@ -96,7 +95,7 @@
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(2)));
- assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
+ assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_ESTABLISHED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
//testing incoming sequence reports
@@ -106,7 +105,6 @@
assertEquals(incomingSequenceReport.getCompletedMessages().size(),2);
assertNotNull(incomingSequenceReport.getSequenceID());
assertEquals(incomingSequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_IN);
- assertEquals(incomingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertNotNull(incomingSequenceReport.getInternalSequenceID());
assertEquals(incomingSequenceReport.getSequenceID(),incomingSequenceReport.getInternalSequenceID()); //for the incoming side, internalSequenceID==sequenceID
@@ -119,6 +117,12 @@
}
if(lastError != null) throw lastError;
+ SandeshaClient.terminateSequence(serviceClient, sequenceKey);
+ SandeshaClient.waitUntilSequenceCompleted(serviceClient, sequenceKey);
+
+ SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
+ assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
+
configContext.getListenerManager().stop();
serviceClient.cleanup();
}
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java Tue Jan 9 04:19:50 2007
@@ -62,10 +62,15 @@
}
public void testGetAckRangeArrayList () throws SandeshaException {
- SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(Sandesha2Constants.SOAPVersion.v1_1);
- String msgNumberStr = "3,6,1,5,8,2";
+ ArrayList msgNumberArr = new ArrayList();
+ msgNumberArr.add(new Long(3));
+ msgNumberArr.add(new Long(6));
+ msgNumberArr.add(new Long(1));
+ msgNumberArr.add(new Long(5));
+ msgNumberArr.add(new Long(8));
+ msgNumberArr.add(new Long(2));
- ArrayList list = SandeshaUtil.getAckRangeArrayList(msgNumberStr,factory,Sandesha2Constants.SPEC_2005_02.NS_URI);
+ ArrayList list = SandeshaUtil.getAckRangeArrayList(msgNumberArr,Sandesha2Constants.SPEC_2005_02.NS_URI);
assertNotNull(list);
assertEquals(list.size(),3);
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java Tue Jan 9 04:19:50 2007
@@ -101,10 +101,10 @@
assertEquals(callback1.getResult(),"echo1");
//checking weather the incomingSequenceReport has the offered sequence ID
- SandeshaReport rmReport = SandeshaClient.getSandeshaReport(configContext);
- ArrayList incomingSeqList = rmReport.getIncomingSequenceList();
- assertEquals(incomingSeqList.size(),1);
- assertEquals(incomingSeqList.get(0),offeredSequenceID);
+ //SandeshaReport rmReport = SandeshaClient.getSandeshaReport(configContext);
+ //ArrayList incomingSeqList = rmReport.getIncomingSequenceList();
+ //assertEquals(incomingSeqList.size(),1);
+ //assertEquals(incomingSeqList.get(0),offeredSequenceID);
lastError = null;
break;
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java?view=diff&rev=494387&r1=494386&r2=494387
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java Tue Jan 9 04:19:50 2007
@@ -71,7 +71,6 @@
TestCallback callback2 = new TestCallback ("Callback 2");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo2",sequenceKey),callback2);
- clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true");
TestCallback callback3 = new TestCallback ("Callback 3");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo3",sequenceKey),callback3);
@@ -87,7 +86,7 @@
assertTrue(outgoingSequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(outgoingSequenceReport.getCompletedMessages().contains(new Long(2)));
assertTrue(outgoingSequenceReport.getCompletedMessages().contains(new Long(3)));
- assertEquals(outgoingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
+ assertEquals(outgoingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_ESTABLISHED);
assertEquals(outgoingSequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
ArrayList incomingReports = SandeshaClient.getIncomingSequenceReports(configContext);
@@ -97,7 +96,6 @@
assertTrue(incomingSequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(incomingSequenceReport.getCompletedMessages().contains(new Long(2)));
assertTrue(incomingSequenceReport.getCompletedMessages().contains(new Long(3)));
- assertEquals(incomingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(incomingSequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_IN);
assertTrue(callback1.isComplete());
@@ -116,6 +114,14 @@
}
}
if(lastError != null) throw lastError;
+
+ SandeshaClient.terminateSequence(serviceClient, sequenceKey);
+
+ SandeshaClient.waitUntilSequenceCompleted(serviceClient, sequenceKey);
+
+ //assertion that the out sequence is terminated.
+ SequenceReport outgoingSequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
+ assertEquals(outgoingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
configContext.getListenerManager().stop();
serviceClient.cleanup();
@@ -143,8 +149,8 @@
clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- String offeredSequeiceId = SandeshaUtil.getUUID();
- clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,offeredSequeiceId);
+ String offeredSequenceId = SandeshaUtil.getUUID();
+ clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,offeredSequenceId);
serviceClient.setOptions(clientOptions);
//serviceClient.
@@ -156,14 +162,12 @@
serviceClient.setOptions(clientOptions);
-
TestCallback callback1 = new TestCallback ("Callback 1");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo1",sequenceKey),callback1);
TestCallback callback2 = new TestCallback ("Callback 2");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo2",sequenceKey),callback2);
- clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true");
TestCallback callback3 = new TestCallback ("Callback 3");
serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo3",sequenceKey),callback3);
@@ -179,15 +183,13 @@
assertTrue(outgoingSequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(outgoingSequenceReport.getCompletedMessages().contains(new Long(2)));
assertTrue(outgoingSequenceReport.getCompletedMessages().contains(new Long(3)));
- assertEquals(outgoingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(outgoingSequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
- SequenceReport incomingSequenceReport = SandeshaClient.getIncomingSequenceReport(offeredSequeiceId,configContext);
+ SequenceReport incomingSequenceReport = SandeshaClient.getIncomingSequenceReport(offeredSequenceId,configContext);
assertEquals (incomingSequenceReport.getCompletedMessages().size(),3);
assertTrue(incomingSequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(incomingSequenceReport.getCompletedMessages().contains(new Long(2)));
assertTrue(incomingSequenceReport.getCompletedMessages().contains(new Long(3)));
- assertEquals(incomingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(incomingSequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_IN);
assertTrue(callback1.isComplete());
@@ -208,6 +210,14 @@
if(lastError != null) throw lastError;
+ SandeshaClient.terminateSequence(serviceClient, sequenceKey);
+
+ SandeshaClient.waitUntilSequenceCompleted(serviceClient, sequenceKey);
+
+ //assertion that the out sequence is terminated.
+ SequenceReport outgoingSequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
+ assertEquals(outgoingSequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
+
configContext.getListenerManager().stop();
serviceClient.cleanup();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org