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 ch...@apache.org on 2006/11/20 06:26:02 UTC
svn commit: r477053 [1/2] - in
/webservices/sandesha/branches/sandesha2/java/1_1:
src/org/apache/sandesha2/client/ src/org/apache/sandesha2/handlers/
src/org/apache/sandesha2/msgprocessors/ src/org/apache/sandesha2/polling/
src/org/apache/sandesha2/sto...
Author: chamikara
Date: Sun Nov 19 21:26:00 2006
New Revision: 477053
URL: http://svn.apache.org/viewvc?view=rev&rev=477053
Log:
Did the following refactoring.
CreateSequenceBean -> RMSBean
NextMsgBean -> RMDBean
CreateSequenceBeanMgr -> RMSBeanMgr
NextMsgBeanMgr -> RMDBeanMgr
Added a UsesSequenceSTRProcesser to process the 'usesSequenceSTR' header.
Currently this does mustUnderstand processing.
Added:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/UsesSequenceSTRProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMDBean.java
- copied, changed from r473920, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/NextMsgBean.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMSBean.java
- copied, changed from r473920, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java
- copied, changed from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
Removed:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/NextMsgBean.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/StorageManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Invoker.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Sender.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java Sun Nov 19 21:26:00 2006
@@ -51,11 +51,11 @@
import org.apache.sandesha2.msgprocessors.ApplicationMsgProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.AcknowledgementManager;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -126,7 +126,7 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
String withinTransactionStr = (String) configurationContext.getProperty(Sandesha2Constants.WITHIN_TRANSACTION);
boolean withinTransaction = false;
@@ -143,10 +143,10 @@
sequenceReport.setInternalSequenceID(internalSequenceID);
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
- createSeqFindBean.setInternalSequenceID(internalSequenceID);
+ RMSBean rmsFindBean = new RMSBean();
+ rmsFindBean.setInternalSequenceID(internalSequenceID);
- CreateSeqBean createSeqBean = createSeqMgr.findUnique(createSeqFindBean);
+ RMSBean createSeqBean = rmsBeanMgr.findUnique(rmsFindBean);
// if data not is available sequence has to be terminated or
// timedOut.
@@ -964,10 +964,10 @@
return SequenceReport.SEQUENCE_STATUS_TIMED_OUT;
}
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceID);
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ RMDBean rmdBean = rmdBeanMgr.retrieve(sequenceID);
- if (nextMsgBean != null) {
+ if (rmdBean != null) {
return SequenceReport.SEQUENCE_STATUS_ESTABLISHED;
}
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/handlers/SandeshaInHandler.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/handlers/SandeshaInHandler.java Sun Nov 19 21:26:00 2006
@@ -34,6 +34,7 @@
import org.apache.sandesha2.msgprocessors.AcknowledgementProcessor;
import org.apache.sandesha2.msgprocessors.MsgProcessor;
import org.apache.sandesha2.msgprocessors.MsgProcessorFactory;
+import org.apache.sandesha2.msgprocessors.UsesSequenceSTRProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.util.MsgInitializer;
@@ -112,9 +113,6 @@
returnValue = InvocationResponse.SUSPEND;
}
-
-
-
AxisService axisService = msgCtx.getAxisService();
if (axisService == null) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.axisServiceIsNull);
@@ -130,6 +128,15 @@
log.debug(message);
throw new AxisFault(message, ex);
}
+
+ // validating the message
+ MessageValidator.validateMessage(rmMsgCtx, storageManager);
+
+ //Processing possible usesSequenceSTR headers.
+ if (rmMsgCtx.getMessageType()==Sandesha2Constants.MessageTypes.CREATE_SEQ) {
+ UsesSequenceSTRProcessor usesSequenceSTRProcessor = new UsesSequenceSTRProcessor ();
+ usesSequenceSTRProcessor.processUseSequenceSTRHeader (rmMsgCtx);
+ }
//Ack messages will be paused
if (rmMsgCtx.getMessageType()==Sandesha2Constants.MessageTypes.ACK) {
@@ -137,9 +144,6 @@
returnValue = InvocationResponse.SUSPEND;
}
- // validating the message
- MessageValidator.validateMessage(rmMsgCtx, storageManager);
-
MsgProcessor msgProcessor = MsgProcessorFactory.getMessageProcessor(rmMsgCtx);
if (msgProcessor != null){
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Sun Nov 19 21:26:00 2006
@@ -239,7 +239,7 @@
} else {
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
String key = SandeshaUtil.getUUID();
@@ -283,7 +283,7 @@
// this will be set to true in the sandesha2TransportSender.
findBean.setSend(true);
findBean.setReSend(false);
- Collection coll = retransmitterBeanMgr.find(findBean);
+ Collection coll = senderBeanMgr.find(findBean);
Iterator it = coll.iterator();
if (it.hasNext()) {
@@ -293,7 +293,7 @@
// will be sent in
// the old
// timeToSend.
- retransmitterBeanMgr.delete(oldAckBean.getMessageID());
+ senderBeanMgr.delete(oldAckBean.getMessageID());
}
ackBean.setTimeToSend(timeToSend);
@@ -302,7 +302,7 @@
msgContext.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING, Sandesha2Constants.VALUE_FALSE);
// inserting the new ack.
- retransmitterBeanMgr.insert(ackBean);
+ senderBeanMgr.insert(ackBean);
// passing the message through sandesha2sender
@@ -460,9 +460,9 @@
ackRequestBean.setReSend(false);
- SenderBeanMgr retramsmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
- retramsmitterMgr.insert(ackRequestBean);
+ senderBeanMgr.insert(ackRequestBean);
ackRequestRMMsg.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE, Sandesha2Constants.VALUE_TRUE);
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Sun Nov 19 21:26:00 2006
@@ -40,10 +40,10 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+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.AcknowledgementManager;
@@ -127,7 +127,7 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx, configCtx
.getAxisConfiguration());
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
String outSequenceId = sequenceAck.getIdentifier().getIdentifier();
@@ -172,7 +172,7 @@
SenderBean input = new SenderBean();
input.setSend(true);
input.setReSend(true);
- Collection retransmitterEntriesOfSequence = retransmitterMgr.find(input);
+ Collection retransmitterEntriesOfSequence = senderBeanMgr.find(input);
ArrayList ackedMessagesList = new ArrayList();
while (ackRangeIterator.hasNext()) {
@@ -181,9 +181,9 @@
long upper = ackRange.getUpperValue();
for (long messageNo = lower; messageNo <= upper; messageNo++) {
- SenderBean retransmitterBean = getRetransmitterEntry(retransmitterEntriesOfSequence, messageNo);
+ SenderBean retransmitterBean = getSenderEntry(retransmitterEntriesOfSequence, messageNo);
if (retransmitterBean != null) {
- retransmitterMgr.delete(retransmitterBean.getMessageID());
+ senderBeanMgr.delete(retransmitterBean.getMessageID());
// removing the application message from the storage.
String storageKey = retransmitterBean.getMessageContextRefKey();
@@ -206,10 +206,10 @@
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
if (offeredSequenceId!=null) {
- NextMsgBeanMgr nextMsgBeanMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgBeanMgr.retrieve(outSequenceId);
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ RMDBean rmdBean = rmdBeanMgr.retrieve(outSequenceId);
- if (nextMsgBean!=null && nextMsgBean.isPollingMode())
+ if (rmdBean!=null && rmdBean.isPollingMode())
SandeshaUtil.shedulePollingRequest(offeredSequenceId, configCtx);
}
@@ -288,7 +288,7 @@
return returnValue;
}
- private SenderBean getRetransmitterEntry(Collection collection, long msgNo) {
+ private SenderBean getSenderEntry(Collection collection, long msgNo) {
Iterator it = collection.iterator();
while (it.hasNext()) {
SenderBean bean = (SenderBean) it.next();
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Sun Nov 19 21:26:00 2006
@@ -51,14 +51,14 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+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.AcknowledgementManager;
@@ -250,15 +250,15 @@
}
// Pause the messages bean if not the right message to invoke.
- NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean bean = mgr.retrieve(sequenceId);
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ RMDBean rmdBean = rmdBeanMgr.retrieve(sequenceId);
- if (bean == null) {
+ if (rmdBean == null) {
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotFindSequence,
sequenceId));
}
- InvokerBeanMgr storageMapMgr = storageManager.getStorageMapBeanMgr();
+ InvokerBeanMgr invokerBeanMgr = storageManager.getInvokerBeanMgr();
// inorder invocation is still a global property
boolean inOrderInvocation = SandeshaUtil.getPropertyBean(
@@ -300,7 +300,7 @@
// saving the message.
try {
storageManager.storeMessageContext(key, rmMsgCtx.getMessageContext());
- storageMapMgr.insert(new InvokerBean(key, msgNo, sequenceId));
+ invokerBeanMgr.insert(new InvokerBean(key, msgNo, sequenceId));
// This will avoid performing application processing more
// than
@@ -393,7 +393,7 @@
// / Transaction asyncAckTransaction =
// storageManager.getTransaction();
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
String key = SandeshaUtil.getUUID();
@@ -426,7 +426,7 @@
// this will be set to true in the sandesha2TransportSender.
findBean.setSend(true);
findBean.setReSend(false);
- Collection coll = retransmitterBeanMgr.find(findBean);
+ Collection coll = senderBeanMgr.find(findBean);
Iterator it = coll.iterator();
if (it.hasNext()) {
@@ -438,7 +438,7 @@
// timeToSend.
// removing the retransmitted entry for the oldAck
- retransmitterBeanMgr.delete(oldAckBean.getMessageID());
+ senderBeanMgr.delete(oldAckBean.getMessageID());
// removing the message store entry for the old ack
storageManager.removeMessageContext(oldAckBean.getMessageContextRefKey());
@@ -450,7 +450,7 @@
ackMsgCtx.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING, Sandesha2Constants.VALUE_FALSE);
// inserting the new ack.
- retransmitterBeanMgr.insert(ackBean);
+ senderBeanMgr.insert(ackBean);
// / asyncAckTransaction.commit();
// passing the message through sandesha2sender
@@ -858,8 +858,8 @@
.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
SequenceOffer offer = createSequencePart.getSequenceOffer();
if (offer != null) {
@@ -880,16 +880,16 @@
String createSequenceMessageStoreKey = SandeshaUtil.getUUID(); // the key taht will be used to store
//the create sequence message.
- CreateSeqBean createSeqBean = new CreateSeqBean();
- createSeqBean.setInternalSequenceID(internalSequenceId);
- createSeqBean.setCreateSeqMsgID(createSeqMsg.getMessageID());
- createSeqBean.setCreateSequenceMsgStoreKey(createSequenceMessageStoreKey);
+ RMSBean rmsBean = new RMSBean();
+ 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);
- createSeqBean.setReferenceMessageStoreKey(clonedMsgStoreKey);
+ rmsBean.setReferenceMessageStoreKey(clonedMsgStoreKey);
//TODO set the replyTo of CreateSeq (and others) to Anymomous if Application Msgs hv it as Anonymous.
@@ -913,7 +913,7 @@
SecurityToken token = (SecurityToken) createSeqRMMessage.getProperty(Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(token != null) {
SecurityManager secManager = SandeshaUtil.getSecurityManager(configCtx);
- createSeqBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
+ rmsBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
// If we are using token based security, and the 1.1 spec level, then we
// should introduce a UsesSequenceSTR header into the message.
@@ -923,7 +923,7 @@
}
}
- createSeqMgr.insert(createSeqBean);
+ rmsBeanMgr.insert(rmsBean);
String addressingNamespaceURI = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE, storageManager);
@@ -946,7 +946,7 @@
createSeqMsg.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING, Sandesha2Constants.VALUE_FALSE);
storageManager.storeMessageContext(createSequenceMessageStoreKey, createSeqMsg); // storing the message
- retransmitterMgr.insert(createSeqEntry);
+ senderBeanMgr.insert(createSeqEntry);
SandeshaUtil.executeAndStore(createSeqRMMessage, createSequenceMessageStoreKey);
@@ -962,7 +962,7 @@
MessageContext msg = rmMsg.getMessageContext();
SequencePropertyBeanMgr sequencePropertyMgr = storageManager.getSequencePropertyBeanMgr();
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
// again - looks weird in the client side - but consistent
@@ -1082,7 +1082,7 @@
storageManager.storeMessageContext(storageKey, msg);
msg.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING, Sandesha2Constants.VALUE_FALSE);
- retransmitterMgr.insert(appMsgEntry);
+ senderBeanMgr.insert(appMsgEntry);
// increasing the current handler index, so that the message will not be
// going throught the SandeshaOutHandler again.
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java Sun Nov 19 21:26:00 2006
@@ -295,9 +295,9 @@
closeBean.setReSend(false);
- SenderBeanMgr retramsmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
- retramsmitterMgr.insert(closeBean);
+ senderBeanMgr.insert(closeBean);
rmMsgCtx.setProperty(Sandesha2Constants.SET_SEND_TO_TRUE, Sandesha2Constants.VALUE_TRUE);
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Sun Nov 19 21:26:00 2006
@@ -45,9 +45,9 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -162,12 +162,12 @@
if (offerEcepted) {
// Setting the CreateSequence table entry for the outgoing
// side.
- CreateSeqBean createSeqBean = new CreateSeqBean();
- createSeqBean.setSequenceID(offeredSequenceID);
+ RMSBean rmsBean = new RMSBean();
+ rmsBean.setSequenceID(offeredSequenceID);
String outgoingSideInternalSequenceId = SandeshaUtil
.getOutgoingSideInternalSequenceID(newSequenceId);
- createSeqBean.setInternalSequenceID(outgoingSideInternalSequenceId);
- createSeqBean.setCreateSeqMsgID(SandeshaUtil.getUUID()); // this
+ rmsBean.setInternalSequenceID(outgoingSideInternalSequenceId);
+ rmsBean.setCreateSeqMsgID(SandeshaUtil.getUUID()); // this
// is a
// dummy
// value.
@@ -175,8 +175,8 @@
String outgoingSideSequencePropertyKey = outgoingSideInternalSequenceId;
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- createSeqMgr.insert(createSeqBean);
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
+ rmsBeanMgr.insert(rmsBean);
// Setting sequence properties for the outgoing sequence.
// Only will be used by the server side response path. Will
@@ -281,11 +281,11 @@
return false;
}
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
- createSeqFindBean.setSequenceID(sequenceId);
- Collection arr = createSeqMgr.find(createSeqFindBean);
+ RMSBean rmsFindBean = new RMSBean();
+ rmsFindBean.setSequenceID(sequenceId);
+ Collection arr = rmsBeanMgr.find(rmsFindBean);
if (arr.size() > 0) {
if (log.isDebugEnabled())
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Sun Nov 19 21:26:00 2006
@@ -36,12 +36,12 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+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.MsgInitializer;
@@ -96,18 +96,18 @@
}
String createSeqMsgId = relatesTo.getValue();
- SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
- CreateSeqBean createSeqBean = createSeqMgr.retrieve(createSeqMsgId);
- if (createSeqBean == null) {
+ RMSBean rmsBean = rmsBeanMgr.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();
@@ -116,7 +116,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);
@@ -126,15 +126,15 @@
String sequencePropertyKey = SandeshaUtil.getSequencePropertyKey(createSeqResponseRMMsgCtx);
- createSeqBean.setSequenceID(newOutSequenceId);
- createSeqMgr.update(createSeqBean);
+ rmsBean.setSequenceID(newOutSequenceId);
+ rmsBeanMgr.update(rmsBean);
- SenderBean createSequenceSenderBean = retransmitterMgr.retrieve(createSeqMsgId);
+ SenderBean createSequenceSenderBean = senderBeanMgr.retrieve(createSeqMsgId);
if (createSequenceSenderBean == null)
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.createSeqEntryNotFound));
// deleting the create sequence entry.
- retransmitterMgr.delete(createSeqMsgId);
+ senderBeanMgr.delete(createSeqMsgId);
// storing new out sequence id
SequencePropertyBeanMgr sequencePropMgr = storageManager.getSequencePropertyBeanMgr();
@@ -177,9 +177,9 @@
sequencePropMgr.insert(acksToBean);
- NextMsgBean nextMsgBean = new NextMsgBean();
- nextMsgBean.setSequenceID(offeredSequenceId);
- nextMsgBean.setNextMsgNoToProcess(1);
+ RMDBean rmdBean = new RMDBean();
+ rmdBean.setSequenceID(offeredSequenceId);
+ rmdBean.setNextMsgNoToProcess(1);
boolean pollingMode = false;
@@ -200,22 +200,22 @@
//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();
storageManager.storeMessageContext(newMessageStoreKey,referenceMsg);
- nextMsgBean.setReferenceMessageKey(newMessageStoreKey);
+ rmdBean.setReferenceMessageKey(newMessageStoreKey);
- nextMsgBean.setPollingMode(pollingMode);
+ rmdBean.setPollingMode(pollingMode);
//if PollingMode is true, starting the pollingmanager.
if (pollingMode)
SandeshaUtil.startPollingManager(configCtx);
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- nextMsgMgr.insert(nextMsgBean);
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ rmdBeanMgr.insert(rmdBean);
String rmSpecVersion = createSeqResponseRMMsgCtx.getRMSpecVersion();
@@ -252,7 +252,7 @@
target.setSend(false);
target.setReSend(true);
- Iterator iterator = retransmitterMgr.find(target).iterator();
+ Iterator iterator = senderBeanMgr.find(target).iterator();
while (iterator.hasNext()) {
SenderBean tempBean = (SenderBean) iterator.next();
@@ -293,7 +293,7 @@
// asking to send the application msssage
tempBean.setSend(true);
- retransmitterMgr.update(tempBean);
+ senderBeanMgr.update(tempBean);
// updating the message. this will correct the SOAP envelope string.
storageManager.updateMessageContext(key, applicationMsg);
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java Sun Nov 19 21:26:00 2006
@@ -47,7 +47,7 @@
ConfigurationContext configurationContext = rmMsgCtx.getConfigurationContext();
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
- SenderBeanMgr senderBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
//selecting the set of SenderBeans that suit the given criteria.
SenderBean findSenderBean = new SenderBean ();
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Sun Nov 19 21:26:00 2006
@@ -459,9 +459,9 @@
terminateBean.setReSend(false);
- SenderBeanMgr retramsmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
- retramsmitterMgr.insert(terminateBean);
+ senderBeanMgr.insert(terminateBean);
SequencePropertyBean terminateAdded = new SequencePropertyBean();
terminateAdded.setName(Sandesha2Constants.SequenceProperties.TERMINATE_ADDED);
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java Sun Nov 19 21:26:00 2006
@@ -29,9 +29,9 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.TerminateManager;
@@ -79,10 +79,10 @@
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
if (offeredSequenceId!=null) {
- NextMsgBeanMgr nextMsgBeanMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgBeanMgr.retrieve(sequenceId);
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ RMDBean rmdBean = rmdBeanMgr.retrieve(sequenceId);
- if (nextMsgBean!=null && nextMsgBean.isPollingMode())
+ if (rmdBean!=null && rmdBean.isPollingMode())
SandeshaUtil.shedulePollingRequest(offeredSequenceId, configContext);
}
Added: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/UsesSequenceSTRProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/UsesSequenceSTRProcessor.java?view=auto&rev=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/UsesSequenceSTRProcessor.java (added)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/UsesSequenceSTRProcessor.java Sun Nov 19 21:26:00 2006
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.sandesha2.msgprocessors;
+
+import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.sandesha2.RMMsgContext;
+import org.apache.sandesha2.Sandesha2Constants;
+import org.apache.sandesha2.wsrm.UsesSequenceSTR;
+
+/**
+ * Responsible for processing the UsesSequenceSTR header which may be present in a CreateSequence message.
+ */
+public class UsesSequenceSTRProcessor {
+
+ private static final Log log = LogFactory.getLog(UsesSequenceSTRProcessor.class);
+
+ public void processUseSequenceSTRHeader (RMMsgContext rmMsgContext) throws AxisFault {
+
+ if (log.isDebugEnabled())
+ log.debug("Enter: UseSequenceSTRProcessor::processSequenceHeader");
+
+ //mustUnderstand processing
+ UsesSequenceSTR usesSequenceSTR = (UsesSequenceSTR) rmMsgContext.getMessagePart(Sandesha2Constants.MessageParts.USES_SEQUENCE_STR);
+
+ if (usesSequenceSTR!=null) {
+ usesSequenceSTR.setMustUnderstand(false);
+ usesSequenceSTR.toSOAPEnvelope (rmMsgContext.getSOAPEnvelope());
+ }
+
+ if (log.isDebugEnabled())
+ log.debug("Exit: UseSequenceSTRProcessor::processSequenceHeader");
+ }
+}
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/polling/PollingManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/polling/PollingManager.java Sun Nov 19 21:26:00 2006
@@ -31,9 +31,9 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -62,7 +62,7 @@
try {
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
//geting the sequences to be polled.
//if shedule contains any requests, do the earliest one.
@@ -70,39 +70,39 @@
String sequenceId = getNextSheduleEntry ();
- NextMsgBean nextMsgBean = null;
+ RMDBean rmdBean = null;
if (sequenceId==null) {
- NextMsgBean findBean = new NextMsgBean ();
+ RMDBean findBean = new RMDBean ();
findBean.setPollingMode(true);
- List results = nextMsgMgr.find(findBean);
+ List results = rmdBeanMgr.find(findBean);
int size = results.size();
if (size>0) {
Random random = new Random ();
int item = random.nextInt(size);
- nextMsgBean = (NextMsgBean) results.get(item);
+ rmdBean = (RMDBean) results.get(item);
}
} else {
- NextMsgBean findBean = new NextMsgBean ();
+ RMDBean findBean = new RMDBean ();
findBean.setPollingMode(true);
findBean.setSequenceID(sequenceId);
- nextMsgBean = nextMsgMgr.findUnique(findBean);
+ rmdBean = rmdBeanMgr.findUnique(findBean);
}
//If not valid entry is found, try again later.
- if (nextMsgBean==null)
+ if (rmdBean==null)
continue;
- sequenceId = nextMsgBean.getSequenceID();
+ sequenceId = rmdBean.getSequenceID();
//create a MakeConnection message
- String referenceMsgKey = nextMsgBean.getReferenceMessageKey();
+ String referenceMsgKey = rmdBean.getReferenceMessageKey();
String sequencePropertyKey = sequenceId;
String replyTo = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
@@ -138,7 +138,7 @@
if (to!=null)
makeConnectionSenderBean.setToAddress(to.getAddress());
- SenderBeanMgr senderBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
//this message should not be sent until it is qualified. I.e. till it is sent through the Sandesha2TransportSender.
makeConnectionRMMessage.setProperty(Sandesha2Constants.QUALIFIED_FOR_SENDING, Sandesha2Constants.VALUE_FALSE);
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/StorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/StorageManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/StorageManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/StorageManager.java Sun Nov 19 21:26:00 2006
@@ -20,9 +20,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisModule;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
@@ -52,15 +52,15 @@
public abstract Transaction getTransaction();
- public abstract CreateSeqBeanMgr getCreateSeqBeanMgr();
+ public abstract RMSBeanMgr getRMSBeanMgr();
- public abstract NextMsgBeanMgr getNextMsgBeanMgr();
+ public abstract RMDBeanMgr getRMDBeanMgr();
- public abstract SenderBeanMgr getRetransmitterBeanMgr();
+ public abstract SenderBeanMgr getSenderBeanMgr();
public abstract SequencePropertyBeanMgr getSequencePropertyBeanMgr();
- public abstract InvokerBeanMgr getStorageMapBeanMgr();
+ public abstract InvokerBeanMgr getInvokerBeanMgr();
public abstract void storeMessageContext (String storageKey,MessageContext msgContext) throws SandeshaStorageException;
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java Sun Nov 19 21:26:00 2006
@@ -41,4 +41,4 @@
public boolean update(InvokerBean bean) throws SandeshaStorageException;
-}
+}
\ No newline at end of file
Copied: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java Sun Nov 19 21:26:00 2006
@@ -22,25 +22,25 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
/**
* Used to manage NextMsg beans.
*/
-public interface NextMsgBeanMgr extends RMBeanManager {
+public interface RMDBeanMgr extends RMBeanManager {
public boolean delete(String sequenceId) throws SandeshaStorageException;
- public NextMsgBean retrieve(String sequenceId) throws SandeshaStorageException;
+ public RMDBean retrieve(String sequenceId) throws SandeshaStorageException;
- public boolean insert(NextMsgBean bean) throws SandeshaStorageException;
+ public boolean insert(RMDBean bean) throws SandeshaStorageException;
- public List find(NextMsgBean bean) throws SandeshaStorageException;
+ public List find(RMDBean bean) throws SandeshaStorageException;
- public boolean update(NextMsgBean bean) throws SandeshaStorageException;
+ public boolean update(RMDBean bean) throws SandeshaStorageException;
- public NextMsgBean findUnique (NextMsgBean bean) throws SandeshaException;
+ public RMDBean findUnique (RMDBean bean) throws SandeshaException;
public Collection retrieveAll();
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java Sun Nov 19 21:26:00 2006
@@ -21,25 +21,25 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
/**
* This is used to manage CreateSequence beans.
*/
-public interface CreateSeqBeanMgr extends RMBeanManager {
+public interface RMSBeanMgr extends RMBeanManager {
- public boolean insert(CreateSeqBean bean) throws SandeshaStorageException;
+ public boolean insert(RMSBean bean) throws SandeshaStorageException;
public boolean delete(String msgId) throws SandeshaStorageException;
- public CreateSeqBean retrieve(String msgId) throws SandeshaStorageException;
+ public RMSBean retrieve(String msgId) throws SandeshaStorageException;
- public boolean update(CreateSeqBean bean) throws SandeshaStorageException;
+ public boolean update(RMSBean bean) throws SandeshaStorageException;
- public List find(CreateSeqBean bean) throws SandeshaStorageException;
+ public List find(RMSBean bean) throws SandeshaStorageException;
- public CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException;
+ public RMSBean findUnique (RMSBean bean) throws SandeshaException;
}
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java Sun Nov 19 21:26:00 2006
@@ -42,14 +42,5 @@
public boolean update(SequencePropertyBean bean) throws SandeshaStorageException;
- /**
- * @deprecated
- *
- * @param bean
- * @return
- * @throws SandeshaStorageException
- */
- public boolean updateOrInsert(SequencePropertyBean bean) throws SandeshaStorageException;
-
public Collection retrieveAll ();
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMDBean.java (from r473920, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/NextMsgBean.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMDBean.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/NextMsgBean.java&r1=473920&p2=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMDBean.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/NextMsgBean.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMDBean.java Sun Nov 19 21:26:00 2006
@@ -22,7 +22,7 @@
* There is one entry for each sequence.
*/
-public class NextMsgBean extends RMBean {
+public class RMDBean extends RMBean {
private static final long serialVersionUID = -2976123838615087562L;
@@ -51,11 +51,11 @@
private String referenceMessageKey;
- public NextMsgBean() {
+ public RMDBean() {
}
- public NextMsgBean(String sequenceID, long nextNsgNo) {
+ public RMDBean(String sequenceID, long nextNsgNo) {
this.sequenceID = sequenceID;
this.nextMsgNoToProcess = nextNsgNo;
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMSBean.java (from r473920, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMSBean.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java&r1=473920&p2=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMSBean.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/beans/RMSBean.java Sun Nov 19 21:26:00 2006
@@ -22,7 +22,7 @@
* There is on object of this for each sequence.
*/
-public class CreateSeqBean extends RMBean {
+public class RMSBean extends RMBean {
private static final long serialVersionUID = 7051201094510208784L;
@@ -71,7 +71,7 @@
*/
private String referenceMessageStoreKey;
- public CreateSeqBean() {
+ public RMSBean() {
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java Sun Nov 19 21:26:00 2006
@@ -31,15 +31,15 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
-public class InMemoryNextMsgBeanMgr implements NextMsgBeanMgr {
+public class InMemoryRMDBeanMgr implements RMDBeanMgr {
- private static final Log log = LogFactory.getLog(InMemoryNextMsgBeanMgr.class);
+ private static final Log log = LogFactory.getLog(InMemoryRMDBeanMgr.class);
private Hashtable table = null;
- public InMemoryNextMsgBeanMgr(AbstractContext context) {
+ public InMemoryRMDBeanMgr(AbstractContext context) {
Object obj = context.getProperty(Sandesha2Constants.BeanMAPs.NEXT_MESSAGE);
if (obj != null) {
@@ -54,11 +54,11 @@
return table.remove(sequenceId) != null;
}
- public synchronized NextMsgBean retrieve(String sequenceId) {
- return (NextMsgBean) table.get(sequenceId);
+ public synchronized RMDBean retrieve(String sequenceId) {
+ return (RMDBean) table.get(sequenceId);
}
- public synchronized boolean insert(NextMsgBean bean) {
+ public synchronized boolean insert(RMDBean bean) {
table.put(bean.getSequenceID(), bean);
return true;
}
@@ -68,16 +68,16 @@
SandeshaMessageKeys.selectRSNotSupported));
}
- public synchronized List find(NextMsgBean bean) {
+ public synchronized List find(RMDBean bean) {
ArrayList beans = new ArrayList();
Iterator iterator = table.values().iterator();
if (bean == null)
return beans;
- NextMsgBean temp;
+ RMDBean temp;
while (iterator.hasNext()) {
- temp = (NextMsgBean) iterator.next();
+ temp = (RMDBean) iterator.next();
boolean equal = true;
@@ -97,7 +97,7 @@
return beans;
}
- public synchronized boolean update(NextMsgBean bean) {
+ public synchronized boolean update(RMDBean bean) {
if (table.get(bean.getSequenceID())==null)
return false;
@@ -108,7 +108,7 @@
return table.values();
}
- public synchronized NextMsgBean findUnique(NextMsgBean bean) throws SandeshaException {
+ public synchronized RMDBean findUnique(RMDBean bean) throws SandeshaException {
Collection coll = find(bean);
if (coll.size()>1) {
String message = SandeshaMessageHelper.getMessage(
@@ -119,7 +119,7 @@
Iterator iter = coll.iterator();
if (iter.hasNext())
- return (NextMsgBean) iter.next();
+ return (RMDBean) iter.next();
else
return null;
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java Sun Nov 19 21:26:00 2006
@@ -31,16 +31,16 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beans.RMSBean;
-public class InMemoryCreateSeqBeanMgr implements CreateSeqBeanMgr {
+public class InMemoryRMSBeanMgr implements RMSBeanMgr {
- private static final Log log = LogFactory.getLog(InMemoryCreateSeqBeanMgr.class);
+ private static final Log log = LogFactory.getLog(InMemoryRMSBeanMgr.class);
private Hashtable table = null;
- public InMemoryCreateSeqBeanMgr(AbstractContext context) {
+ public InMemoryRMSBeanMgr(AbstractContext context) {
Object obj = context.getProperty(Sandesha2Constants.BeanMAPs.CREATE_SEQUECE);
if (obj != null) {
table = (Hashtable) obj;
@@ -50,7 +50,7 @@
}
}
- public synchronized boolean insert(CreateSeqBean bean) {
+ public synchronized boolean insert(RMSBean bean) {
table.put(bean.getCreateSeqMsgID(), bean);
return true;
}
@@ -59,27 +59,27 @@
return table.remove(msgId) != null;
}
- public synchronized CreateSeqBean retrieve(String msgId) {
- return (CreateSeqBean) table.get(msgId);
+ public synchronized RMSBean retrieve(String msgId) {
+ return (RMSBean) table.get(msgId);
}
- public synchronized boolean update(CreateSeqBean bean) {
+ public synchronized boolean update(RMSBean bean) {
if (table.get(bean.getCreateSeqMsgID())==null)
return false;
return table.put(bean.getCreateSeqMsgID(), bean) != null;
}
- public synchronized List find(CreateSeqBean bean) {
+ public synchronized List find(RMSBean bean) {
ArrayList beans = new ArrayList();
if (bean == null)
return beans;
Iterator iterator = table.values().iterator();
- CreateSeqBean temp;
+ RMSBean temp;
while (iterator.hasNext()) {
- temp = (CreateSeqBean) iterator.next();
+ temp = (RMSBean) iterator.next();
boolean equal = true;
@@ -109,7 +109,7 @@
SandeshaMessageKeys.selectRSNotSupported));
}
- public synchronized CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException {
+ public synchronized RMSBean findUnique (RMSBean bean) throws SandeshaException {
Collection coll = find(bean);
if (coll.size()>1) {
String message = SandeshaMessageHelper.getMessage(
@@ -120,7 +120,7 @@
Iterator iter = coll.iterator();
if (iter.hasNext())
- return (CreateSeqBean) iter.next();
+ return (RMSBean) iter.next();
else
return null;
}
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Sun Nov 19 21:26:00 2006
@@ -28,9 +28,9 @@
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -39,8 +39,8 @@
private static InMemoryStorageManager instance = null;
private final String MESSAGE_MAP_KEY = "Sandesha2MessageMap";
- private CreateSeqBeanMgr createSeqBeanMgr = null;
- private NextMsgBeanMgr nextMsgBeanMgr = null;
+ private RMSBeanMgr rmsBeanMgr = null;
+ private RMDBeanMgr nextMsgBeanMgr = null;
private SequencePropertyBeanMgr sequencePropertyBeanMgr = null;
private SenderBeanMgr senderBeanMgr = null;
private InvokerBeanMgr invokerBeanMgr = null;
@@ -48,8 +48,8 @@
public InMemoryStorageManager(ConfigurationContext context) {
super(context);
- this.createSeqBeanMgr = new InMemoryCreateSeqBeanMgr (context);
- this.nextMsgBeanMgr = new InMemoryNextMsgBeanMgr (context);
+ this.rmsBeanMgr = new InMemoryRMSBeanMgr (context);
+ this.nextMsgBeanMgr = new InMemoryRMDBeanMgr (context);
this.senderBeanMgr = new InMemorySenderBeanMgr (context);
this.invokerBeanMgr = new InMemoryInvokerBeanMgr (context);
this.sequencePropertyBeanMgr = new InMemorySequencePropertyBeanMgr (context);
@@ -59,15 +59,15 @@
return new InMemoryTransaction();
}
- public CreateSeqBeanMgr getCreateSeqBeanMgr() {
- return createSeqBeanMgr;
+ public RMSBeanMgr getRMSBeanMgr() {
+ return rmsBeanMgr;
}
- public NextMsgBeanMgr getNextMsgBeanMgr() {
+ public RMDBeanMgr getRMDBeanMgr() {
return nextMsgBeanMgr;
}
- public SenderBeanMgr getRetransmitterBeanMgr() {
+ public SenderBeanMgr getSenderBeanMgr() {
return senderBeanMgr;
}
@@ -75,7 +75,7 @@
return sequencePropertyBeanMgr;
}
- public InvokerBeanMgr getStorageMapBeanMgr() {
+ public InvokerBeanMgr getInvokerBeanMgr() {
return invokerBeanMgr;
}
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/AcknowledgementManager.java Sun Nov 19 21:26:00 2006
@@ -76,7 +76,7 @@
ConfigurationContext configurationContext = rmMessageContext.getConfigurationContext();
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
SenderBean findBean = new SenderBean();
@@ -86,7 +86,7 @@
String carrietTo = rmMessageContext.getTo().getAddress();
- Collection collection = retransmitterBeanMgr.find(findBean);
+ Collection collection = senderBeanMgr.find(findBean);
Iterator it = collection.iterator();
@@ -110,7 +110,7 @@
if (log.isDebugEnabled()) log.debug("Adding ack headers");
// deleting the ack entry.
- retransmitterBeanMgr.delete(ackBean.getMessageID());
+ senderBeanMgr.delete(ackBean.getMessageID());
// Adding the ack(s) to the application message
boolean acks = false;
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/FaultManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/FaultManager.java Sun Nov 19 21:26:00 2006
@@ -54,11 +54,11 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
import org.apache.sandesha2.wsrm.CreateSequence;
@@ -213,29 +213,28 @@
MessageContext messageContext = rmMessageContext.getMessageContext();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- int type = rmMessageContext.getMessageType();
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
boolean validSequence = false;
// Look for an outbound sequence
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
- createSeqFindBean.setSequenceID(sequenceID);
+ RMSBean rmsFindBean = new RMSBean();
+ rmsFindBean.setSequenceID(sequenceID);
- Collection coll = createSeqMgr.find(createSeqFindBean);
+ Collection coll = rmsBeanMgr.find(rmsFindBean);
if (!coll.isEmpty()) {
validSequence = true;
} else {
// Look for an inbound sequence
- NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
- coll = mgr.retrieveAll();
+ coll = rmdBeanMgr.retrieveAll();
Iterator it = coll.iterator();
while (it.hasNext()) {
- NextMsgBean nextMsgBean = (NextMsgBean) it.next();
- String tempId = nextMsgBean.getSequenceID();
+ RMDBean rmdBean = (RMDBean) it.next();
+ String tempId = rmdBean.getSequenceID();
if (tempId.equals(sequenceID)) {
validSequence = true;
break;
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java Sun Nov 19 21:26:00 2006
@@ -97,11 +97,11 @@
* @param policyBean
* @return
*/
- private static SenderBean adjustNextRetransmissionTime(SenderBean retransmitterBean, SandeshaPolicyBean propertyBean) {
+ private static SenderBean adjustNextRetransmissionTime(SenderBean senderBean, SandeshaPolicyBean propertyBean) {
// long lastSentTime = retransmitterBean.getTimeToSend();
- int count = retransmitterBean.getSentCount();
+ int count = senderBean.getSentCount();
long baseInterval = propertyBean.getRetransmissionInterval();
@@ -115,9 +115,9 @@
long timeNow = System.currentTimeMillis();
newTimeToSend = timeNow + newInterval;
- retransmitterBean.setTimeToSend(newTimeToSend);
+ senderBean.setTimeToSend(newTimeToSend);
- return retransmitterBean;
+ return senderBean;
}
private static void stopRetransmission(SenderBean bean) {
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/SequenceManager.java Sun Nov 19 21:26:00 2006
@@ -34,9 +34,9 @@
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.policy.SandeshaPolicyBean;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.CreateSequence;
@@ -115,8 +115,8 @@
if (toBean != null)
seqPropMgr.insert(toBean);
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- nextMsgMgr.insert(new NextMsgBean(sequenceId, 1)); // 1 will be the
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
+ rmdBeanMgr.insert(new RMDBean(sequenceId, 1)); // 1 will be the
// next
// message to invoke. This will apply for only in-order invocations.
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/TerminateManager.java Sun Nov 19 21:26:00 2006
@@ -37,14 +37,14 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+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.transport.Sandesha2TransportOutDesc;
@@ -109,17 +109,17 @@
*/
public static void cleanReceivingSideAfterInvocation(ConfigurationContext configContext, String sequencePropertyKey ,String sequenceId,
StorageManager storageManager) throws SandeshaException {
- InvokerBeanMgr storageMapBeanMgr = storageManager.getStorageMapBeanMgr();
+ InvokerBeanMgr invokerBeanMgr = storageManager.getInvokerBeanMgr();
// removing storageMap entries
- InvokerBean findStorageMapBean = new InvokerBean();
- findStorageMapBean.setSequenceID(sequenceId);
- findStorageMapBean.setInvoked(true);
- Collection collection = storageMapBeanMgr.find(findStorageMapBean);
+ InvokerBean findInvokerBean = new InvokerBean();
+ findInvokerBean.setSequenceID(sequenceId);
+ findInvokerBean.setInvoked(true);
+ Collection collection = invokerBeanMgr.find(findInvokerBean);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
InvokerBean storageMapBean = (InvokerBean) iterator.next();
- storageMapBeanMgr.delete(storageMapBean.getMessageContextRefKey());
+ invokerBeanMgr.delete(storageMapBean.getMessageContextRefKey());
// removing the respective message context from the message store.
// If this is an in-only message.
@@ -145,17 +145,16 @@
*/
private static void completeTerminationOfReceivingSide(ConfigurationContext configContext, String sequencePropertyKey,String sequenceId,
StorageManager storageManager) throws SandeshaException {
- InvokerBeanMgr storageMapBeanMgr = storageManager.getStorageMapBeanMgr();
- NextMsgBeanMgr nextMsgBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
// removing nextMsgMgr entries
- NextMsgBean findNextMsgBean = new NextMsgBean();
- findNextMsgBean.setSequenceID(sequenceId);
- Collection collection = nextMsgBeanMgr.find(findNextMsgBean);
+ RMDBean findRMDBean = new RMDBean();
+ findRMDBean.setSequenceID(sequenceId);
+ Collection collection = rmdBeanMgr.find(findRMDBean);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
- NextMsgBean nextMsgBean = (NextMsgBean) iterator.next();
- nextMsgBeanMgr.delete(nextMsgBean.getSequenceID());
+ RMDBean nextMsgBean = (RMDBean) iterator.next();
+ rmdBeanMgr.delete(nextMsgBean.getSequenceID());
}
// removing the HighestInMessage entry.
@@ -299,8 +298,8 @@
boolean serverSide, StorageManager storageManager) throws SandeshaException {
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
- SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
- CreateSeqBeanMgr createSeqBeanMgr = storageManager.getCreateSeqBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
+ RMSBeanMgr rmsBeanMgr = storageManager.getRMSBeanMgr();
String outSequenceID = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID, storageManager);
@@ -323,24 +322,24 @@
}
// removing retransmitterMgr entries and corresponding message contexts.
- Collection collection = retransmitterBeanMgr.find(internalSequenceId);
+ Collection collection = senderBeanMgr.find(internalSequenceId);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
- SenderBean retransmitterBean = (SenderBean) iterator.next();
- retransmitterBeanMgr.delete(retransmitterBean.getMessageID());
+ SenderBean senderBean = (SenderBean) iterator.next();
+ senderBeanMgr.delete(senderBean.getMessageID());
- String messageStoreKey = retransmitterBean.getMessageContextRefKey();
+ String messageStoreKey = senderBean.getMessageContextRefKey();
storageManager.removeMessageContext(messageStoreKey);
}
// removing the createSeqMgrEntry
- CreateSeqBean findCreateSequenceBean = new CreateSeqBean();
- findCreateSequenceBean.setInternalSequenceID(internalSequenceId);
- collection = createSeqBeanMgr.find(findCreateSequenceBean);
+ RMSBean findRMSBean = new RMSBean();
+ findRMSBean.setInternalSequenceID(internalSequenceId);
+ collection = rmsBeanMgr.find(findRMSBean);
iterator = collection.iterator();
while (iterator.hasNext()) {
- CreateSeqBean createSeqBean = (CreateSeqBean) iterator.next();
- createSeqBeanMgr.delete(createSeqBean.getCreateSeqMsgID());
+ RMSBean rmsBean = (RMSBean) iterator.next();
+ rmsBeanMgr.delete(rmsBean.getCreateSeqMsgID());
}
// removing sequence properties
@@ -464,9 +463,9 @@
if (to!=null)
terminateBean.setToAddress(to.getAddress());
- SenderBeanMgr retramsmitterMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
- retramsmitterMgr.insert(terminateBean);
+ senderBeanMgr.insert(terminateBean);
SequencePropertyBean terminateAdded = new SequencePropertyBean();
terminateAdded.setName(Sandesha2Constants.SequenceProperties.TERMINATE_ADDED);
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Invoker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Invoker.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Invoker.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Invoker.java Sun Nov 19 21:26:00 2006
@@ -37,10 +37,10 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -185,10 +185,10 @@
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(context, context
.getAxisConfiguration());
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
- InvokerBeanMgr storageMapMgr = storageManager
- .getStorageMapBeanMgr();
+ InvokerBeanMgr invokerBeanMgr = storageManager
+ .getInvokerBeanMgr();
SequencePropertyBeanMgr sequencePropMgr = storageManager
.getSequencePropertyBeanMgr();
@@ -218,8 +218,8 @@
String sequenceId = (String) allSequencesList.get(nextIndex++);
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceId);
- if (nextMsgBean == null) {
+ RMDBean rmdBean = rmdBeanMgr.retrieve(sequenceId);
+ if (rmdBean == null) {
String message = "Next message not set correctly. Removing invalid entry.";
log.debug(message);
@@ -231,7 +231,7 @@
continue;
}
- long nextMsgno = nextMsgBean.getNextMsgNoToProcess();
+ long nextMsgno = rmdBean.getNextMsgNoToProcess();
if (nextMsgno <= 0) {
if (log.isDebugEnabled())
log.debug("Invalid Next Message Number " + nextMsgno);
@@ -241,7 +241,7 @@
throw new SandeshaException(message);
}
- Iterator stMapIt = storageMapMgr.find(
+ Iterator stMapIt = invokerBeanMgr.find(
new InvokerBean(null, nextMsgno, sequenceId))
.iterator();
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/InvokerWorker.java Sun Nov 19 21:26:00 2006
@@ -13,9 +13,9 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.TerminateManager;
@@ -41,8 +41,8 @@
try {
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
- InvokerBeanMgr invokerBeanMgr = storageManager.getStorageMapBeanMgr();
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ InvokerBeanMgr invokerBeanMgr = storageManager.getInvokerBeanMgr();
+ RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
//starting a transaction
transaction = storageManager.getTransaction();
@@ -125,7 +125,7 @@
// updating the next msg to invoke
String s = invokerBean.getSequenceID();
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceId);
+ RMDBean rmdBean = rmdBeanMgr.retrieve(sequenceId);
if (rmMsg.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
@@ -142,7 +142,7 @@
}
}
- long nextMsgNo = nextMsgBean.getNextMsgNoToProcess();
+ long nextMsgNo = rmdBean.getNextMsgNoToProcess();
if (!(messageNo==nextMsgNo)) {
String message = "Operated message number is different from the Next Message Number to invoke";
@@ -151,8 +151,8 @@
if (invoked) {
nextMsgNo++;
- nextMsgBean.setNextMsgNoToProcess(nextMsgNo);
- nextMsgMgr.update(nextMsgBean);
+ rmdBean.setNextMsgNoToProcess(nextMsgNo);
+ rmdBeanMgr.update(rmdBean);
}
} catch (SandeshaStorageException e) {
transaction.rollback();
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org