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 2005/11/24 10:07:32 UTC
svn commit: r348691 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/
msgprocessors/ storage/ storage/beanmanagers/ storage/beans/
storage/inmemory/ storage/persistent/ util/ workers/
Author: chamikara
Date: Thu Nov 24 01:05:29 2005
New Revision: 348691
URL: http://svn.apache.org/viewcvs?rev=348691&view=rev
Log:
Refactored code
RetransmitterBeanMgr -> SenderBeanMgr
RetransmitterBean -> SenderBean
StorageMapBeanMgr -> InvokerBeanMgr
StorageMapBean -> InvokerBean
Removed some unused classes
Added:
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/InvokerBean.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SenderBean.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentInvokerBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentSenderBeanMgr.java
Removed:
webservices/sandesha/trunk/src/org/apache/sandesha2/client/
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/RetransmitterBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/StorageMapBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RetransmitterBean.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/StorageMapBean.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryRetransmitterBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageMapBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentRetransmitterBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentStorageMapBeanMgr.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/StorageManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/AcknowledgementManager.java Thu Nov 24 01:05:29 2005
@@ -23,9 +23,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -44,12 +44,12 @@
.getMessageContext().getSystemContext();
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(configurationContext);
- RetransmitterBeanMgr retransmitterBeanMgr = storageManager
+ SenderBeanMgr retransmitterBeanMgr = storageManager
.getRetransmitterBeanMgr();
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager
.getSequencePropretyBeanMgr();
- RetransmitterBean findBean = new RetransmitterBean();
+ SenderBean findBean = new SenderBean();
Sequence sequence = (Sequence) applicationRMMsgContext
.getMessagePart(Constants.MessageParts.SEQUENCE);
@@ -59,21 +59,21 @@
String sequenceId = sequence.getIdentifier().getIdentifier();
- SequencePropertyBean tempSequenceBean = sequencePropertyBeanMgr
+ SequencePropertyBean internalSequenceBean = sequencePropertyBeanMgr
.retrieve(sequenceId,
- Constants.SequenceProperties.TEMP_SEQUENCE_ID);
- if (tempSequenceBean == null)
+ Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
+ if (internalSequenceBean == null)
throw new SandeshaException("Temp Sequence is not set");
- String tempSequenceId = (String) tempSequenceBean.getValue();
- findBean.setTempSequenceId(tempSequenceId);
+ String internalSequenceId = (String) internalSequenceBean.getValue();
+ findBean.setInternalSequenceId(internalSequenceId);
findBean.setMessagetype(Constants.MessageTypes.ACK);
Collection collection = retransmitterBeanMgr.find(findBean);
Iterator it = collection.iterator();
if (it.hasNext()) {
- RetransmitterBean ackBean = (RetransmitterBean) it.next();
+ SenderBean ackBean = (SenderBean) it.next();
//deleting the ack entry.
retransmitterBeanMgr.delete(ackBean.getMessageId());
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java Thu Nov 24 01:05:29 2005
@@ -185,7 +185,7 @@
//FIXME - rema
//String INCOMING_SEQUENCE_ID = "IncomingSequenceId";
- String TEMP_SEQUENCE_ID = "TempSequenceId";
+ String INTERNAL_SEQUENCE_ID = "TempSequenceId";
String REPLY_TO_EPR = "ReplyToEPR";
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java Thu Nov 24 01:05:29 2005
@@ -25,14 +25,14 @@
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.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
import org.apache.sandesha2.storage.beans.CreateSeqBean;
import org.apache.sandesha2.storage.beans.NextMsgBean;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
-import org.apache.sandesha2.storage.beans.StorageMapBean;
+import org.apache.sandesha2.storage.beans.InvokerBean;
import org.apache.sandesha2.util.SandeshaUtil;
/**
@@ -64,15 +64,15 @@
public static void terminateAfterInvocation (ConfigurationContext configContext, String sequenceID) throws SandeshaException {
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configContext);
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropretyBeanMgr();
- StorageMapBeanMgr storageMapBeanMgr = storageManager.getStorageMapBeanMgr();
+ InvokerBeanMgr storageMapBeanMgr = storageManager.getStorageMapBeanMgr();
//removing storageMap entries
- StorageMapBean findStorageMapBean = new StorageMapBean ();
+ InvokerBean findStorageMapBean = new InvokerBean ();
findStorageMapBean.setSequenceId(sequenceID);
Collection collection = storageMapBeanMgr.find(findStorageMapBean);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
- StorageMapBean storageMapBean = (StorageMapBean) iterator.next();
+ InvokerBean storageMapBean = (InvokerBean) iterator.next();
storageMapBeanMgr.delete(storageMapBean.getKey());
}
@@ -108,28 +108,28 @@
public static void terminateSendingSide (ConfigurationContext configContext, String sequenceID) throws SandeshaException {
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configContext);
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropretyBeanMgr();
- RetransmitterBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
CreateSeqBeanMgr createSeqBeanMgr = storageManager.getCreateSeqBeanMgr();
- SequencePropertyBean tempSequenceBean = sequencePropertyBeanMgr.retrieve(sequenceID,Constants.SequenceProperties.TEMP_SEQUENCE_ID);
- if (tempSequenceBean==null)
+ SequencePropertyBean internalSequenceBean = sequencePropertyBeanMgr.retrieve(sequenceID,Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
+ if (internalSequenceBean==null)
throw new SandeshaException ("TempSequence entry not found");
- String tempSequenceId = (String) tempSequenceBean.getValue();
+ String internalSequenceId = (String) internalSequenceBean.getValue();
//removing retransmitterMgr entries
- RetransmitterBean findRetransmitterBean = new RetransmitterBean ();
- findRetransmitterBean.setTempSequenceId(tempSequenceId);
+ SenderBean findRetransmitterBean = new SenderBean ();
+ findRetransmitterBean.setInternalSequenceId(internalSequenceId);
Collection collection = retransmitterBeanMgr.find(findRetransmitterBean);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
- RetransmitterBean retransmitterBean = (RetransmitterBean) iterator.next();
+ SenderBean retransmitterBean = (SenderBean) iterator.next();
retransmitterBeanMgr.delete(retransmitterBean.getMessageId());
}
//removing the createSeqMgrEntry
CreateSeqBean findCreateSequenceBean = new CreateSeqBean ();
- findCreateSequenceBean.setTempSequenceId(tempSequenceId);
+ findCreateSequenceBean.setInternalSequenceId(internalSequenceId);
collection = createSeqBeanMgr.find(findCreateSequenceBean);
iterator = collection.iterator();
while (iterator.hasNext()) {
@@ -139,7 +139,7 @@
//removing sequence properties
SequencePropertyBean findSequencePropertyBean1 = new SequencePropertyBean ();
- findSequencePropertyBean1.setSequenceId(tempSequenceId);
+ findSequencePropertyBean1.setSequenceId(internalSequenceId);
collection = sequencePropertyBeanMgr.find(findSequencePropertyBean1);
iterator = collection.iterator();
while (iterator.hasNext()) {
@@ -148,7 +148,7 @@
}
SequencePropertyBean findSequencePropertyBean2 = new SequencePropertyBean ();
- findSequencePropertyBean2.setSequenceId(tempSequenceId);
+ findSequencePropertyBean2.setSequenceId(internalSequenceId);
collection = sequencePropertyBeanMgr.find(findSequencePropertyBean2);
iterator = collection.iterator();
while (iterator.hasNext()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java Thu Nov 24 01:05:29 2005
@@ -43,10 +43,10 @@
import org.apache.sandesha2.policy.RMPolicyBean;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+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.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -154,8 +154,8 @@
msgCtx.setMessageID(SandeshaUtil.getUUID());
}
//initial work
- //find temp sequence id
- String tempSequenceId = null;
+ //find internal sequence id
+ String internalSequenceId = null;
//Temp sequence id is the one used to refer to the sequence (since
//actual sequence id is not available when first msg arrives)
@@ -178,31 +178,31 @@
if (incomingSeqId == null || incomingSeqId == "")
throw new SandeshaException("Invalid seqence Id");
- tempSequenceId = incomingSeqId;
+ internalSequenceId = incomingSeqId;
} else {
- //set the temp sequence id for the client side.
+ //set the internal sequence id for the client side.
EndpointReference toEPR = msgCtx.getTo();
if (toEPR == null || toEPR.getAddress() == null
|| "".equals(toEPR.getAddress()))
throw new AxisFault(
"TO End Point Reference is not set correctly. This is a must for the sandesha client side.");
- tempSequenceId = toEPR.getAddress();
+ internalSequenceId = toEPR.getAddress();
String sequenceKey = (String) context
.getProperty(Constants.SEQUENCE_KEY);
if (sequenceKey != null)
- tempSequenceId = tempSequenceId + sequenceKey;
+ internalSequenceId = internalSequenceId + sequenceKey;
}
//check if the fist message
- long messageNumber = getNextMsgNo(context, tempSequenceId);
+ long messageNumber = getNextMsgNo(context, internalSequenceId);
boolean sendCreateSequence = false;
- SequencePropertyBean outSeqBean = seqPropMgr.retrieve(tempSequenceId,
+ SequencePropertyBean outSeqBean = seqPropMgr.retrieve(internalSequenceId,
Constants.SequenceProperties.OUT_SEQUENCE_ID);
if (messageNumber == 1) {
@@ -224,19 +224,19 @@
//if fist message - setup the sequence for the client side
if (!serverSide && sendCreateSequence) {
- SequenceManager.setupNewClientSequence(msgCtx, tempSequenceId);
+ SequenceManager.setupNewClientSequence(msgCtx, internalSequenceId);
}
//if first message - add create sequence
if (sendCreateSequence) {
SequencePropertyBean responseCreateSeqAdded = seqPropMgr.retrieve(
- tempSequenceId,
+ internalSequenceId,
Constants.SequenceProperties.OUT_CREATE_SEQUENCE_SENT);
if (responseCreateSeqAdded == null) {
responseCreateSeqAdded = new SequencePropertyBean(
- tempSequenceId,
+ internalSequenceId,
Constants.SequenceProperties.OUT_CREATE_SEQUENCE_SENT,
"true");
seqPropMgr.insert(responseCreateSeqAdded);
@@ -260,7 +260,7 @@
ListenerManager.makeSureStarted(transportIn, context);
} else if (acksTo == null && serverSide) {
String incomingSequencId = SandeshaUtil
- .getServerSideIncomingSeqIdFromInternalSeqId(tempSequenceId);
+ .getServerSideIncomingSeqIdFromInternalSeqId(internalSequenceId);
SequencePropertyBean bean = seqPropMgr.retrieve(
incomingSequencId,
Constants.SequenceProperties.REPLY_TO_EPR);
@@ -279,7 +279,7 @@
}
}
- addCreateSequenceMessage(rmMsgCtx, tempSequenceId, acksTo);
+ addCreateSequenceMessage(rmMsgCtx, internalSequenceId, acksTo);
}
}
@@ -318,7 +318,7 @@
if (serverSide) {
//processing the response
- processResponseMessage(rmMsgCtx, tempSequenceId,
+ processResponseMessage(rmMsgCtx, internalSequenceId,
messageNumber);
MessageContext reqMsgCtx = msgCtx
@@ -363,7 +363,7 @@
}
//processing the response
- processResponseMessage(rmMsgCtx, tempSequenceId, messageNumber);
+ processResponseMessage(rmMsgCtx, internalSequenceId, messageNumber);
}
@@ -380,13 +380,13 @@
}
public void addCreateSequenceMessage(RMMsgContext applicationRMMsg,
- String tempSequenceId, String acksTo) throws SandeshaException {
+ String internalSequenceId, String acksTo) throws SandeshaException {
MessageContext applicationMsg = applicationRMMsg.getMessageContext();
if (applicationMsg == null)
throw new SandeshaException("Message context is null");
RMMsgContext createSeqRMMessage = RMMsgCreator.createCreateSeqMsg(
- applicationRMMsg, tempSequenceId, acksTo);
+ applicationRMMsg, internalSequenceId, acksTo);
CreateSequence createSequencePart = (CreateSequence) createSeqRMMessage
.getMessagePart(Constants.MessageParts.CREATE_SEQ);
if (createSequencePart == null)
@@ -405,7 +405,7 @@
SequencePropertyBean offeredSequenceBean = new SequencePropertyBean();
offeredSequenceBean
.setName(Constants.SequenceProperties.OFFERED_SEQUENCE);
- offeredSequenceBean.setSequenceId(tempSequenceId);
+ offeredSequenceBean.setSequenceId(internalSequenceId);
offeredSequenceBean.setValue(offeredSequenceId);
StorageManager storageManager = SandeshaUtil
@@ -435,7 +435,7 @@
.getSandeshaStorageManager(applicationMsg.getSystemContext());
CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- CreateSeqBean createSeqBean = new CreateSeqBean(tempSequenceId,
+ CreateSeqBean createSeqBean = new CreateSeqBean(internalSequenceId,
createSeqMsg.getMessageID(), null);
createSeqMgr.insert(createSeqBean);
@@ -443,12 +443,12 @@
createSeqMsg.setReplyTo(new EndpointReference(
Constants.WSA.NS_URI_ANONYMOUS));
- RetransmitterBeanMgr retransmitterMgr = storageManager
+ SenderBeanMgr retransmitterMgr = storageManager
.getRetransmitterBeanMgr();
String key = SandeshaUtil.storeMessageContext(createSeqRMMessage
.getMessageContext());
- RetransmitterBean createSeqEntry = new RetransmitterBean();
+ SenderBean createSeqEntry = new SenderBean();
createSeqEntry.setKey(key);
createSeqEntry.setTimeToSend(System.currentTimeMillis());
createSeqEntry.setMessageId(createSeqRMMessage.getMessageId());
@@ -458,7 +458,7 @@
}
private void processResponseMessage(RMMsgContext rmMsg,
- String tempSequenceId, long messageNumber) throws SandeshaException {
+ String internalSequenceId, long messageNumber) throws SandeshaException {
MessageContext msg = rmMsg.getMessageContext();
@@ -477,17 +477,17 @@
SequencePropertyBeanMgr sequencePropertyMgr = storageManager
.getSequencePropretyBeanMgr();
- RetransmitterBeanMgr retransmitterMgr = storageManager
+ SenderBeanMgr retransmitterMgr = storageManager
.getRetransmitterBeanMgr();
SequencePropertyBean toBean = sequencePropertyMgr.retrieve(
- tempSequenceId, Constants.SequenceProperties.TO_EPR);
+ internalSequenceId, Constants.SequenceProperties.TO_EPR);
SequencePropertyBean replyToBean = sequencePropertyMgr.retrieve(
- tempSequenceId, Constants.SequenceProperties.REPLY_TO_EPR);
+ internalSequenceId, Constants.SequenceProperties.REPLY_TO_EPR);
//again - looks weird in the client side - but consistent
SequencePropertyBean outSequenceBean = sequencePropertyMgr.retrieve(
- tempSequenceId, Constants.SequenceProperties.OUT_SEQUENCE_ID);
+ internalSequenceId, Constants.SequenceProperties.OUT_SEQUENCE_ID);
if (toBean == null)
throw new SandeshaException("To is null");
@@ -545,7 +545,7 @@
//setting last message
if (msg.isServerSide()) {
//server side
- String incomingSeqId = tempSequenceId;
+ String incomingSeqId = internalSequenceId;
MessageContext requestMsg = null;
try {
@@ -570,7 +570,7 @@
//saving the last message no.
SequencePropertyBean lastOutMsgBean = new SequencePropertyBean(
- tempSequenceId,
+ internalSequenceId,
Constants.SequenceProperties.LAST_OUT_MESSAGE,
new Long(messageNumber));
sequencePropertyMgr.insert(lastOutMsgBean);
@@ -587,7 +587,7 @@
sequence.setLastMessage(new LastMessage(factory));
//saving the last message no.
SequencePropertyBean lastOutMsgBean = new SequencePropertyBean(
- tempSequenceId,
+ internalSequenceId,
Constants.SequenceProperties.LAST_OUT_MESSAGE,
new Long(messageNumber));
sequencePropertyMgr.insert(lastOutMsgBean);
@@ -608,7 +608,7 @@
String identifierStr = null;
if (outSequenceBean == null || outSequenceBean.getValue() == null) {
identifierStr = Constants.TEMP_SEQUENCE_ID;
- // identifier.setIndentifer(Constants.TEMP_SEQUENCE_ID);
+ // identifier.setIndentifer(Constants.INTERNAL_SEQUENCE_ID);
// sequence.setIdentifier(identifier);
} else {
@@ -639,7 +639,7 @@
// //in the client case use the normal flow.
// if (msg.isServerSide()) {
//Retransmitter bean entry for the application message
- RetransmitterBean appMsgEntry = new RetransmitterBean();
+ SenderBean appMsgEntry = new SenderBean();
String key = SandeshaUtil
.storeMessageContext(rmMsg.getMessageContext());
appMsgEntry.setKey(key);
@@ -652,13 +652,13 @@
appMsgEntry.setSend(true);
}
- appMsgEntry.setTempSequenceId(tempSequenceId);
+ appMsgEntry.setInternalSequenceId(internalSequenceId);
retransmitterMgr.insert(appMsgEntry);
// }
}
private long getNextMsgNo(ConfigurationContext context,
- String tempSequenceId) throws SandeshaException {
+ String internalSequenceId) throws SandeshaException {
//FIXME set a correct message number.
StorageManager storageManager = SandeshaUtil
@@ -667,7 +667,7 @@
SequencePropertyBeanMgr seqPropMgr = storageManager
.getSequencePropretyBeanMgr();
SequencePropertyBean nextMsgNoBean = seqPropMgr.retrieve(
- tempSequenceId,
+ internalSequenceId,
Constants.SequenceProperties.NEXT_MESSAGE_NUMBER);
long nextMsgNo = 1;
boolean update = false;
@@ -677,7 +677,7 @@
nextMsgNo = nextMsgNoLng.longValue();
} else {
nextMsgNoBean = new SequencePropertyBean();
- nextMsgNoBean.setSequenceId(tempSequenceId);
+ nextMsgNoBean.setSequenceId(internalSequenceId);
nextMsgNoBean
.setName(Constants.SequenceProperties.NEXT_MESSAGE_NUMBER);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Thu Nov 24 01:05:29 2005
@@ -27,9 +27,9 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.RMMsgCreator;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -57,7 +57,7 @@
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(rmMsgCtx.getMessageContext()
.getSystemContext());
- RetransmitterBeanMgr retransmitterMgr = storageManager
+ SenderBeanMgr retransmitterMgr = storageManager
.getRetransmitterBeanMgr();
SequencePropertyBeanMgr seqPropMgr = storageManager
.getSequencePropretyBeanMgr();
@@ -70,13 +70,13 @@
if (outSequenceId == null || "".equals(outSequenceId))
throw new SandeshaException("OutSequenceId is null");
- SequencePropertyBean tempSequenceBean = seqPropMgr.retrieve(
- outSequenceId, Constants.SequenceProperties.TEMP_SEQUENCE_ID);
+ SequencePropertyBean internalSequenceBean = seqPropMgr.retrieve(
+ outSequenceId, Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
- if (tempSequenceBean == null || tempSequenceBean.getValue() == null)
+ if (internalSequenceBean == null || internalSequenceBean.getValue() == null)
throw new SandeshaException("TempSequenceId is not set correctly");
- String tempSequenceId = (String) tempSequenceBean.getValue();
+ String internalSequenceId = (String) internalSequenceBean.getValue();
//Following happens in the SandeshaGlobal handler
rmMsgCtx.getMessageContext()
@@ -91,8 +91,8 @@
if (rmMsgCtx.getMessageType() == Constants.MessageTypes.ACK)
rmMsgCtx.setRelatesTo(null);
- RetransmitterBean input = new RetransmitterBean();
- input.setTempSequenceId(tempSequenceId);
+ SenderBean input = new SenderBean();
+ input.setInternalSequenceId(internalSequenceId);
Collection retransmitterEntriesOfSequence = retransmitterMgr
.find(input);
@@ -104,7 +104,7 @@
long upper = ackRange.getUpperValue();
for (long messageNo = lower; messageNo <= upper; messageNo++) {
- RetransmitterBean retransmitterBean = getRetransmitterEntry(
+ SenderBean retransmitterBean = getRetransmitterEntry(
retransmitterEntriesOfSequence, messageNo);
if (retransmitterBean != null)
retransmitterMgr.delete(retransmitterBean.getMessageId());
@@ -124,7 +124,7 @@
//If all messages up to last message have been acknowledged.
//Add terminate Sequence message.
SequencePropertyBean lastOutMsgBean = seqPropMgr.retrieve(
- tempSequenceId, Constants.SequenceProperties.LAST_OUT_MESSAGE);
+ internalSequenceId, Constants.SequenceProperties.LAST_OUT_MESSAGE);
if (lastOutMsgBean != null) {
Long lastOutMsgNoLng = (Long) lastOutMsgBean.getValue();
if (lastOutMsgNoLng == null)
@@ -142,7 +142,7 @@
if (complete) {
addTerminateSequenceMessage(rmMsgCtx, outSequenceId,
- tempSequenceId);
+ internalSequenceId);
}
//stopping the progress of the message further.
@@ -154,11 +154,11 @@
}
- private RetransmitterBean getRetransmitterEntry(Collection collection,
+ private SenderBean getRetransmitterEntry(Collection collection,
long msgNo) {
Iterator it = collection.iterator();
while (it.hasNext()) {
- RetransmitterBean bean = (RetransmitterBean) it.next();
+ SenderBean bean = (SenderBean) it.next();
if (bean.getMessageNumber() == msgNo)
return bean;
}
@@ -167,7 +167,7 @@
}
public void addTerminateSequenceMessage(RMMsgContext incomingAckRMMsg,
- String outSequenceId, String tempSequenceId)
+ String outSequenceId, String internalSequenceId)
throws SandeshaException {
StorageManager storageManager = SandeshaUtil
@@ -190,8 +190,8 @@
.createTerminateSequenceMessage(incomingAckRMMsg, outSequenceId);
//SequencePropertyBean replyToBean =
- // seqPropMgr.retrieve(tempSequenceId,Constants.SequenceProperties.REPLY_TO_EPR);
- SequencePropertyBean toBean = seqPropMgr.retrieve(tempSequenceId,
+ // seqPropMgr.retrieve(internalSequenceId,Constants.SequenceProperties.REPLY_TO_EPR);
+ SequencePropertyBean toBean = seqPropMgr.retrieve(internalSequenceId,
Constants.SequenceProperties.TO_EPR);
EndpointReference toEPR = (EndpointReference) toBean.getValue();
@@ -218,7 +218,7 @@
String key = SandeshaUtil.storeMessageContext(terminateRMMessage
.getMessageContext());
- RetransmitterBean terminateBean = new RetransmitterBean();
+ SenderBean terminateBean = new SenderBean();
terminateBean.setKey(key);
//Set a retransmitter lastSentTime so that terminate will be send with
@@ -232,7 +232,7 @@
terminateBean.setSend(true);
terminateBean.setReSend(false);
- RetransmitterBeanMgr retramsmitterMgr = storageManager
+ SenderBeanMgr retramsmitterMgr = storageManager
.getRetransmitterBeanMgr();
SequencePropertyBean terminateAdded = new SequencePropertyBean();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Thu Nov 24 01:05:29 2005
@@ -44,13 +44,13 @@
import org.apache.sandesha2.policy.RMPolicyBean;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
import org.apache.sandesha2.storage.beans.NextMsgBean;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
-import org.apache.sandesha2.storage.beans.StorageMapBean;
+import org.apache.sandesha2.storage.beans.InvokerBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -152,7 +152,7 @@
if (bean == null)
throw new SandeshaException("Error- The sequence does not exist");
- StorageMapBeanMgr storageMapMgr = storageManager.getStorageMapBeanMgr();
+ InvokerBeanMgr storageMapMgr = storageManager.getStorageMapBeanMgr();
long nextMsgno = bean.getNextMsgNoToProcess();
@@ -196,7 +196,7 @@
try {
String key = SandeshaUtil.storeMessageContext(rmMsgCtx
.getMessageContext());
- storageMapMgr.insert(new StorageMapBean(key, msgNo,
+ storageMapMgr.insert(new InvokerBean(key, msgNo,
sequenceId));
//This will avoid performing application processing more
@@ -373,21 +373,21 @@
//rmMsgCtx.getMessageContext().getOperationContext().setProperty(
// org.apache.axis2.Constants.RESPONSE_WRITTEN, "false");
- RetransmitterBeanMgr retransmitterBeanMgr = storageManager
+ SenderBeanMgr retransmitterBeanMgr = storageManager
.getRetransmitterBeanMgr();
String key = SandeshaUtil.storeMessageContext(ackMsgCtx);
- RetransmitterBean ackBean = new RetransmitterBean();
+ SenderBean ackBean = new SenderBean();
ackBean.setKey(key);
ackBean.setMessageId(ackMsgCtx.getMessageID());
ackBean.setReSend(false);
ackBean.setSend(true);
ackBean.setMessagetype(Constants.MessageTypes.ACK);
- //the tempSequenceId value of the retransmitter Table for the
+ //the internalSequenceId value of the retransmitter Table for the
// messages related to an incoming
//sequence is the actual sequence ID - TODO document this.
- ackBean.setTempSequenceId(sequenceId);
+ ackBean.setInternalSequenceId(sequenceId);
RMPolicyBean policyBean = (RMPolicyBean) rmMsgCtx
.getProperty(Constants.WSP.RM_POLICY_BEAN);
@@ -402,13 +402,13 @@
ackBean.setTimeToSend(timeToSend);
//removing old acks.
- RetransmitterBean findBean = new RetransmitterBean();
+ SenderBean findBean = new SenderBean();
findBean.setMessagetype(Constants.MessageTypes.ACK);
- findBean.setTempSequenceId(sequenceId);
+ findBean.setInternalSequenceId(sequenceId);
Collection coll = retransmitterBeanMgr.find(findBean);
Iterator it = coll.iterator();
while (it.hasNext()) {
- RetransmitterBean retransmitterBean = (RetransmitterBean) it
+ SenderBean retransmitterBean = (SenderBean) it
.next();
retransmitterBeanMgr.delete(retransmitterBean.getMessageId());
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Thu Nov 24 01:05:29 2005
@@ -93,7 +93,7 @@
String outSequenceId = offer.getIdentifer().getIdentifier();
CreateSeqBean createSeqBean = new CreateSeqBean();
createSeqBean.setSequenceId(outSequenceId);
- createSeqBean.setTempSequenceId(newSequenceId);
+ createSeqBean.setInternalSequenceId(newSequenceId);
createSeqBean.setCreateSeqMsgId(SandeshaUtil.getUUID()); //this
// is a
// dummy
@@ -115,17 +115,17 @@
seqPropMgr.insert(outSequenceBean);
//Temp sequence id should be set for the server side.
- //If temp sequence id is not set. this implies server side.
- SequencePropertyBean tempSeqBean = seqPropMgr.retrieve(
+ //If internal sequence id is not set. this implies server side.
+ SequencePropertyBean internalSeqBean = seqPropMgr.retrieve(
outSequenceId,
- Constants.SequenceProperties.TEMP_SEQUENCE_ID);
- if (tempSeqBean == null) {
- SequencePropertyBean tempSequenceBean = new SequencePropertyBean();
- tempSequenceBean
- .setName(Constants.SequenceProperties.TEMP_SEQUENCE_ID);
- tempSequenceBean.setSequenceId(outSequenceId);
- tempSequenceBean.setValue(newSequenceId);
- seqPropMgr.insert(tempSequenceBean);
+ Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
+ if (internalSeqBean == null) {
+ SequencePropertyBean internalSequenceBean = new SequencePropertyBean();
+ internalSequenceBean
+ .setName(Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
+ internalSequenceBean.setSequenceId(outSequenceId);
+ internalSequenceBean.setValue(newSequenceId);
+ seqPropMgr.insert(internalSequenceBean);
}
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Thu Nov 24 01:05:29 2005
@@ -23,11 +23,11 @@
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.RetransmitterBeanMgr;
+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.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SOAPAbstractFactory;
@@ -85,7 +85,7 @@
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(configCtx);
- RetransmitterBeanMgr retransmitterMgr = storageManager
+ SenderBeanMgr retransmitterMgr = storageManager
.getRetransmitterBeanMgr();
CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
@@ -93,8 +93,8 @@
if (createSeqBean == null)
throw new SandeshaException("Create Sequence entry is not found");
- String tempSequenceId = createSeqBean.getTempSequenceId();
- if (tempSequenceId == null || "".equals(tempSequenceId))
+ String internalSequenceId = createSeqBean.getInternalSequenceId();
+ if (internalSequenceId == null || "".equals(internalSequenceId))
throw new SandeshaException("TempSequenceId has is not set");
//deleting the create sequence entry.
@@ -104,20 +104,20 @@
SequencePropertyBeanMgr sequencePropMgr = storageManager
.getSequencePropretyBeanMgr();
SequencePropertyBean outSequenceBean = new SequencePropertyBean(
- tempSequenceId, Constants.SequenceProperties.OUT_SEQUENCE_ID,
+ internalSequenceId, Constants.SequenceProperties.OUT_SEQUENCE_ID,
newOutSequenceId);
- SequencePropertyBean tempSequenceBean = new SequencePropertyBean(
+ SequencePropertyBean internalSequenceBean = new SequencePropertyBean(
newOutSequenceId,
- Constants.SequenceProperties.TEMP_SEQUENCE_ID, tempSequenceId);
+ Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, internalSequenceId);
sequencePropMgr.insert(outSequenceBean);
- sequencePropMgr.insert(tempSequenceBean);
+ sequencePropMgr.insert(internalSequenceBean);
//processing for accept (offer has been sent)
Accept accept = createSeqResponsePart.getAccept();
if (accept != null) {
- //Find offered sequence from temp sequence id.
+ //Find offered sequence from internal sequence id.
SequencePropertyBean offeredSequenceBean = sequencePropMgr
- .retrieve(tempSequenceId,
+ .retrieve(internalSequenceId,
Constants.SequenceProperties.OFFERED_SEQUENCE);
//TODO this should be detected in the Fault manager.
@@ -144,12 +144,12 @@
nextMsgMgr.insert(nextMsgBean);
}
- RetransmitterBean target = new RetransmitterBean();
- target.setTempSequenceId(tempSequenceId);
+ SenderBean target = new SenderBean();
+ target.setInternalSequenceId(internalSequenceId);
Iterator iterator = retransmitterMgr.find(target).iterator();
while (iterator.hasNext()) {
- RetransmitterBean tempBean = (RetransmitterBean) iterator.next();
+ SenderBean tempBean = (SenderBean) iterator.next();
//updating the application message
String key = tempBean.getKey();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Thu Nov 24 01:05:29 2005
@@ -27,7 +27,7 @@
import org.apache.sandesha2.TerminateManager;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/StorageManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/StorageManager.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/StorageManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/StorageManager.java Thu Nov 24 01:05:29 2005
@@ -20,9 +20,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -52,10 +52,10 @@
public abstract NextMsgBeanMgr getNextMsgBeanMgr();
- public abstract RetransmitterBeanMgr getRetransmitterBeanMgr();
+ public abstract SenderBeanMgr getRetransmitterBeanMgr();
public abstract SequencePropertyBeanMgr getSequencePropretyBeanMgr();
- public abstract StorageMapBeanMgr getStorageMapBeanMgr();
+ public abstract InvokerBeanMgr getStorageMapBeanMgr();
}
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.storage.beanmanagers;
+
+import java.sql.ResultSet;
+import java.util.Collection;
+import org.apache.sandesha2.storage.beans.InvokerBean;
+
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
+public interface InvokerBeanMgr extends RMBeanManager {
+
+ public boolean insert(InvokerBean bean);
+
+ public boolean delete(String key);
+
+ public InvokerBean retrieve(String key);
+
+ public ResultSet find(String query);
+
+ public Collection find(InvokerBean bean);
+
+ public boolean update(InvokerBean bean);
+
+}
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,46 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.storage.beanmanagers;
+
+import java.sql.ResultSet;
+import java.util.Collection;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.storage.beans.SenderBean;
+
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
+public interface SenderBeanMgr extends RMBeanManager {
+
+ public boolean delete(String MessageId);
+
+ public SenderBean retrieve(String MessageId);
+
+ public boolean insert(SenderBean bean) throws SandeshaException;
+
+ public ResultSet find(String query);
+
+ public Collection find(SenderBean bean);
+
+ public Collection findMsgsToSend();
+
+ public boolean update(SenderBean bean);
+
+}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java Thu Nov 24 01:05:29 2005
@@ -23,7 +23,7 @@
*/
public class CreateSeqBean implements RMBean {
- private String tempSequenceId;
+ private String internalSequenceId;
private String CreateSeqMsgId;
@@ -33,9 +33,9 @@
}
- public CreateSeqBean(String tempSeqId, String CreateSeqMsgId,
+ public CreateSeqBean(String internalSeqId, String CreateSeqMsgId,
String sequenceId) {
- this.tempSequenceId = tempSeqId;
+ this.internalSequenceId = internalSeqId;
this.CreateSeqMsgId = CreateSeqMsgId;
this.SequenceId = sequenceId;
}
@@ -70,12 +70,12 @@
SequenceId = sequenceId;
}
- public String getTempSequenceId() {
- return tempSequenceId;
+ public String getInternalSequenceId() {
+ return internalSequenceId;
}
- public void setTempSequenceId(String tempSequenceId) {
- this.tempSequenceId = tempSequenceId;
+ public void setInternalSequenceId(String internalSequenceId) {
+ this.internalSequenceId = internalSequenceId;
}
}
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/InvokerBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/InvokerBean.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/InvokerBean.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/InvokerBean.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.storage.beans;
+
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
+public class InvokerBean implements RMBean {
+
+ private String Key;
+
+ private long MsgNo;
+
+ private String sequenceId;
+
+ private boolean invoked = false;
+
+ public InvokerBean() {
+
+ }
+
+ public InvokerBean(String key, long msgNo, String sequenceId) {
+ this.Key = key;
+ this.MsgNo = msgNo;
+ this.sequenceId = sequenceId;
+ }
+
+ /**
+ * @return Returns the key.
+ */
+ public String getKey() {
+ return Key;
+ }
+
+ /**
+ * @param key
+ * The key to set.
+ */
+ public void setKey(String key) {
+ Key = key;
+ }
+
+ /**
+ * @return Returns the msgNo.
+ */
+ public long getMsgNo() {
+ return MsgNo;
+ }
+
+ /**
+ * @param msgNo
+ * The msgNo to set.
+ */
+ public void setMsgNo(long msgNo) {
+ MsgNo = msgNo;
+ }
+
+ /**
+ * @return Returns the sequenceId.
+ */
+ public String getSequenceId() {
+ return sequenceId;
+ }
+
+ /**
+ * @param sequenceId
+ * The sequenceId to set.
+ */
+ public void setSequenceId(String sequenceId) {
+ this.sequenceId = sequenceId;
+ }
+
+ public boolean isInvoked() {
+ return invoked;
+ }
+
+ public void setInvoked(boolean invoked) {
+ this.invoked = invoked;
+ }
+}
\ No newline at end of file
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SenderBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SenderBean.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SenderBean.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SenderBean.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,142 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.sandesha2.storage.beans;
+
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
+public class SenderBean implements RMBean {
+
+ private String messageId;
+
+ private String key;
+
+// private long LastSentTime;
+
+ private boolean Send;
+
+ private String internalSequenceId;
+
+ private int sentCount = 0;
+
+ private long messageNumber = 0;
+
+ private boolean reSend = true;
+
+ private long timeToSend = 0;
+
+ private int messagetype =0;
+
+ public SenderBean() {
+
+ }
+
+ public SenderBean(String messageId, String key,
+ boolean send,long timeToSend, String internalSequenceId, long messageNumber) {
+ this.messageId = messageId;
+ this.key = key;
+ //this.LastSentTime = lastSentTime;
+ this.timeToSend = timeToSend;
+ this.Send = send;
+ this.internalSequenceId = internalSequenceId;
+ this.messageNumber = messageNumber;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+// public long getLastSentTime() {
+// return LastSentTime;
+// }
+//
+// public void setLastSentTime(long lastSentTime) {
+// LastSentTime = lastSentTime;
+// }
+
+ public String getMessageId() {
+ return messageId;
+ }
+
+ public void setMessageId(String messageId) {
+ this.messageId = messageId;
+ }
+
+ public boolean isSend() {
+ return Send;
+ }
+
+ public void setSend(boolean send) {
+ this.Send = send;
+ }
+
+ public String getInternalSequenceId() {
+ return internalSequenceId;
+ }
+
+ public void setInternalSequenceId(String internalSequenceId) {
+ this.internalSequenceId = internalSequenceId;
+ }
+
+ public int getSentCount() {
+ return sentCount;
+ }
+
+ public void setSentCount(int sentCount) {
+ this.sentCount = sentCount;
+ }
+
+ public long getMessageNumber() {
+ return messageNumber;
+ }
+
+ public void setMessageNumber(long messageNumber) {
+ this.messageNumber = messageNumber;
+ }
+
+ public boolean isReSend() {
+ return reSend;
+ }
+
+ public void setReSend(boolean reSend) {
+ this.reSend = reSend;
+ }
+
+ public long getTimeToSend() {
+ return timeToSend;
+ }
+
+ public void setTimeToSend(long timeToSend) {
+ this.timeToSend = timeToSend;
+ }
+
+
+ public int getMessagetype() {
+ return messagetype;
+ }
+
+ public void setMessagetype(int messagetype) {
+ this.messagetype = messagetype;
+ }
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -100,9 +100,9 @@
&& !bean.getSequenceId().equals(temp.getSequenceId()))
equal = false;
- if (bean.getTempSequenceId() != null
- && !bean.getTempSequenceId().equals(
- temp.getTempSequenceId()))
+ if (bean.getInternalSequenceId() != null
+ && !bean.getInternalSequenceId().equals(
+ temp.getInternalSequenceId()))
equal = false;
if (equal)
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2004,2005 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.storage.inmemory;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Iterator;
+import org.apache.axis2.context.AbstractContext;
+import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
+import org.apache.sandesha2.storage.beans.InvokerBean;
+
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
+public class InMemoryInvokerBeanMgr implements InvokerBeanMgr {
+ private Hashtable table = null;
+
+ /**
+ *
+ */
+ public InMemoryInvokerBeanMgr(AbstractContext context) {
+ Object obj = context.getProperty(Constants.BeanMAPs.STORAGE_MAP);
+ if (obj != null) {
+ table = (Hashtable) obj;
+ } else {
+ table = new Hashtable();
+ context.setProperty(Constants.BeanMAPs.STORAGE_MAP, table);
+ }
+ }
+
+ public boolean insert(InvokerBean bean) {
+ table.put(bean.getKey(), bean);
+ return true;
+ }
+
+ public boolean delete(String key) {
+ return table.remove(key) != null;
+ }
+
+ public InvokerBean retrieve(String key) {
+ return (InvokerBean) table.get(key);
+ }
+
+ public ResultSet find(String query) {
+ throw new UnsupportedOperationException("selectRS() is not implemented");
+ }
+
+ public Collection find(InvokerBean bean) {
+ ArrayList beans = new ArrayList();
+ Iterator iterator = table.values().iterator();
+
+ InvokerBean temp = new InvokerBean();
+ while (iterator.hasNext()) {
+ temp = (InvokerBean) iterator.next();
+ boolean select = true;
+ /*
+ * if ((temp.getKey() != null &&
+ * bean.getKey().equals(temp.getKey())) && (bean.getMsgNo() != -1 &&
+ * bean.getMsgNo() == temp.getMsgNo()) && (bean.getSequenceId() !=
+ * null && bean.getSequenceId().equals(temp.getSequenceId()))) {
+ */
+
+ //}
+ if (bean.getKey() != null && !bean.getKey().equals(temp.getKey()))
+ select = false;
+
+ if (bean.getMsgNo() != 0 && bean.getMsgNo() != temp.getMsgNo())
+ select = false;
+
+ if (bean.getSequenceId() != null
+ && !bean.getSequenceId().equals(temp.getSequenceId()))
+ select = false;
+
+ if (select)
+ beans.add(temp);
+ }
+ return beans;
+ }
+
+ public boolean update(InvokerBean bean) {
+ if (!table.contains(bean))
+ return false;
+
+ return table.put(bean.getKey(), bean) != null;
+ }
+
+}
\ No newline at end of file
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2004,2005 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.storage.inmemory;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.apache.axis2.context.AbstractContext;
+import org.apache.sandesha2.Constants;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
+import org.apache.sandesha2.storage.beans.SenderBean;
+
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
+public class InMemorySenderBeanMgr implements SenderBeanMgr {
+ private Hashtable table = null;
+
+ public InMemorySenderBeanMgr(AbstractContext context) {
+ Object obj = context.getProperty(Constants.BeanMAPs.RETRANSMITTER);
+ if (obj != null) {
+ table = (Hashtable) obj;
+ } else {
+ table = new Hashtable();
+ context.setProperty(Constants.BeanMAPs.RETRANSMITTER, table);
+ }
+ }
+
+ public boolean delete(String MessageId) {
+ return table.remove(MessageId) != null;
+ }
+
+ public SenderBean retrieve(String MessageId) {
+ return (SenderBean) table.get(MessageId);
+ }
+
+ public boolean insert(SenderBean bean) throws SandeshaException {
+ if (bean.getMessageId() == null)
+ throw new SandeshaException("Key (MessageId) is null. Cant insert.");
+ table.put(bean.getMessageId(), bean);
+ return true;
+ }
+
+ public ResultSet find(String query) {
+ throw new UnsupportedOperationException("selectRS() is not supported");
+ }
+
+ public Collection find(SenderBean bean) {
+ ArrayList beans = new ArrayList();
+ Iterator iterator = table.values().iterator();
+
+ SenderBean temp;
+ while (iterator.hasNext()) {
+
+ temp = (SenderBean) iterator.next();
+
+ boolean add = true;
+
+ if (bean.getKey() != null && !bean.getKey().equals(temp.getKey()))
+ add = false;
+
+ if (bean.getTimeToSend() > 0
+ && bean.getTimeToSend() != temp.getTimeToSend())
+ add = false;
+
+ if (bean.getMessageId() != null
+ && !bean.getMessageId().equals(temp.getMessageId()))
+ add = false;
+
+ if (bean.getInternalSequenceId() != null
+ && !bean.getInternalSequenceId().equals(
+ temp.getInternalSequenceId()))
+ add = false;
+
+ if (bean.getMessageNumber() > 0
+ && bean.getMessageNumber() != temp.getMessageNumber())
+ add = false;
+
+ if (bean.getMessagetype() != Constants.MessageTypes.UNKNOWN
+ && bean.getMessagetype() != temp.getMessagetype())
+ add = false;
+
+ if (add)
+ beans.add(temp);
+ }
+
+ return beans;
+ }
+
+ public Collection findMsgsToSend() {
+ ArrayList beans = new ArrayList();
+ Iterator iterator = table.values().iterator();
+
+ SenderBean temp;
+
+ while (iterator.hasNext()) {
+ temp = (SenderBean) iterator.next();
+
+ if (temp.isSend()) {
+
+ long timeToSend = temp.getTimeToSend();
+ long timeNow = System.currentTimeMillis();
+ if ((timeNow >= timeToSend)) {
+ beans.add(temp);
+ }
+ }
+ }
+
+ // beans = sort (beans);
+ // beans = reverse (beans);
+
+ return beans;
+ }
+
+ private ArrayList reverse(ArrayList beans) {
+ ArrayList newBeans = new ArrayList();
+ int count = beans.size();
+
+ for (int i = count; i > 0; i--) {
+ newBeans.add(beans.get((i - 1)));
+ }
+
+ return newBeans;
+ }
+
+ //FIXME - not complete
+ //SENDER SORTING
+ //--------------
+ //Sender Sorting is used to arrange the messages that get sent.
+ //This sending order may get dsturbed due to network latencies.
+ //But doing the sort here, could improve the server preformance when
+ // network latencies are low (this is the common case).
+ //Sender sorting will be enabled, when invocation type is InOrder.
+ private ArrayList sort(ArrayList beans) {
+ ArrayList newBeans = new ArrayList();
+ HashMap tempHash = new HashMap();
+
+ Iterator iter1 = beans.iterator();
+ while (iter1.hasNext()) {
+ SenderBean bean = (SenderBean) iter1.next();
+ if (!(bean.getMessageNumber() > 0)) {
+ newBeans.add(bean);
+ }
+ }
+
+ Iterator iter2 = beans.iterator();
+ long maxMsgNo = 0;
+ long minMsgNo = 0;
+ while (iter2.hasNext()) {
+ SenderBean bean = (SenderBean) iter2.next();
+
+ if (bean.getMessageNumber() > 0) {
+ maxMsgNo = bean.getMessageNumber();
+ minMsgNo = bean.getMessageNumber();
+ break;
+ }
+ }
+
+ //finding Max and Min msg numbers present in the current list.
+ while (iter2.hasNext()) {
+ SenderBean bean = (SenderBean) iter2.next();
+ long msgNo = bean.getMessageNumber();
+ if (msgNo > 0) {
+ //tempHash.put(new Long (bean.getMessageNumber()),bean);
+ if (msgNo > maxMsgNo)
+ maxMsgNo = msgNo;
+
+ if (msgNo < minMsgNo)
+ minMsgNo = msgNo;
+ }
+ }
+
+ for (long msgNo = minMsgNo; msgNo <= maxMsgNo; msgNo++) {
+ ArrayList beansOfMsgNo = findBeansWithMsgNo(beans, msgNo);
+ Iterator iter = beansOfMsgNo.iterator();
+ while (iter.hasNext()) {
+
+ }
+ }
+
+ return newBeans;
+ }
+
+ private ArrayList findBeansWithMsgNo(ArrayList list, long msgNo) {
+ ArrayList beans = new ArrayList();
+
+ Iterator it = list.iterator();
+ while (it.hasNext()) {
+ SenderBean bean = (SenderBean) it.next();
+ if (bean.getMessageNumber() == msgNo)
+ beans.add(bean);
+ }
+
+ return beans;
+ }
+
+ public boolean update(SenderBean bean) {
+ if (!table.contains(bean))
+ return false;
+
+ return true; //No need to update. Being a reference does the job:)
+ // //table.put(bean.getMessageId(), bean) != null;
+ }
+
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Thu Nov 24 01:05:29 2005
@@ -22,9 +22,9 @@
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.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -51,16 +51,16 @@
return new InMemoryNextMsgBeanMgr(getContext());
}
- public RetransmitterBeanMgr getRetransmitterBeanMgr() {
- return new InMemoryRetransmitterBeanMgr(getContext());
+ public SenderBeanMgr getRetransmitterBeanMgr() {
+ return new InMemorySenderBeanMgr(getContext());
}
public SequencePropertyBeanMgr getSequencePropretyBeanMgr() {
return new InMemorySequencePropertyBeanMgr(getContext());
}
- public StorageMapBeanMgr getStorageMapBeanMgr() {
- return new InMemoryStorageMapBeanMgr(getContext());
+ public InvokerBeanMgr getStorageMapBeanMgr() {
+ return new InMemoryInvokerBeanMgr(getContext());
}
// public static StorageManager getBeanMgrFactory (int storageType)
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentInvokerBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentInvokerBeanMgr.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentInvokerBeanMgr.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentInvokerBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,22 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.storage.persistent;
+
+public class PersistentInvokerBeanMgr {
+
+}
Added: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentSenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentSenderBeanMgr.java?rev=348691&view=auto
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentSenderBeanMgr.java (added)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/persistent/PersistentSenderBeanMgr.java Thu Nov 24 01:05:29 2005
@@ -0,0 +1,22 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.sandesha2.storage.persistent;
+
+public class PersistentSenderBeanMgr {
+
+}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java Thu Nov 24 01:05:29 2005
@@ -21,7 +21,7 @@
import org.apache.sandesha2.Constants;
import org.apache.sandesha2.SandeshaDynamicProperties;
import org.apache.sandesha2.policy.RMPolicyBean;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SenderBean;
/**
* @author Chamikara Jayalath <ch...@gmail.com>
@@ -29,8 +29,8 @@
public class MessageRetransmissionAdjuster {
- public RetransmitterBean adjustRetransmittion(
- RetransmitterBean retransmitterBean) {
+ public SenderBean adjustRetransmittion(
+ SenderBean retransmitterBean) {
String storedKey = (String) retransmitterBean.getKey();
if (storedKey == null)
@@ -58,8 +58,8 @@
return retransmitterBean;
}
- private RetransmitterBean adjustNextRetransmissionTime(
- RetransmitterBean retransmitterBean, RMPolicyBean policyBean) {
+ private SenderBean adjustNextRetransmissionTime(
+ SenderBean retransmitterBean, RMPolicyBean policyBean) {
long lastSentTime = retransmitterBean.getTimeToSend();
@@ -78,7 +78,7 @@
return retransmitterBean;
}
- private void stopRetransmission(RetransmitterBean bean) {
+ private void stopRetransmission(SenderBean bean) {
bean.setReSend(false);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java Thu Nov 24 01:05:29 2005
@@ -66,7 +66,7 @@
}
public static RMMsgContext createCreateSeqMsg(
- RMMsgContext applicationRMMsg, String tempSequenceId, String acksTo)
+ RMMsgContext applicationRMMsg, String internalSequenceId, String acksTo)
throws SandeshaException {
MessageContext applicationMsgContext = applicationRMMsg
@@ -147,9 +147,9 @@
}
//TODO decide - where to send create seq. Acksto or replyTo
- SequencePropertyBean replyToBean = seqPropMgr.retrieve(tempSequenceId,
+ SequencePropertyBean replyToBean = seqPropMgr.retrieve(internalSequenceId,
Constants.SequenceProperties.REPLY_TO_EPR);
- SequencePropertyBean toBean = seqPropMgr.retrieve(tempSequenceId,
+ SequencePropertyBean toBean = seqPropMgr.retrieve(internalSequenceId,
Constants.SequenceProperties.TO_EPR);
if (toBean == null || toBean.getValue() == null)
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java Thu Nov 24 01:05:29 2005
@@ -100,7 +100,7 @@
}
public static void setupNewClientSequence(
- MessageContext firstAplicationMsgCtx, String tempSequenceId)
+ MessageContext firstAplicationMsgCtx, String iternalSequenceId)
throws SandeshaException {
AbstractContext context = firstAplicationMsgCtx.getSystemContext();
@@ -120,7 +120,7 @@
if (toEPR == null)
throw new SandeshaException("WS-Addressing To is null");
- SequencePropertyBean toBean = new SequencePropertyBean(tempSequenceId,
+ SequencePropertyBean toBean = new SequencePropertyBean(iternalSequenceId,
Constants.SequenceProperties.TO_EPR, toEPR);
//Default value for acksTo is anonymous
@@ -129,7 +129,7 @@
EndpointReference acksToEPR = new EndpointReference(acksTo);
SequencePropertyBean acksToBean = new SequencePropertyBean(
- tempSequenceId, Constants.SequenceProperties.ACKS_TO_EPR,
+ iternalSequenceId, Constants.SequenceProperties.ACKS_TO_EPR,
acksToEPR);
// //TODO - make default for replyTo anonymous
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java Thu Nov 24 01:05:29 2005
@@ -31,10 +31,10 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
import org.apache.sandesha2.storage.beans.NextMsgBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
-import org.apache.sandesha2.storage.beans.StorageMapBean;
+import org.apache.sandesha2.storage.beans.InvokerBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.Sequence;
@@ -84,7 +84,7 @@
.getSandeshaStorageManager(context);
NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- StorageMapBeanMgr storageMapMgr = storageManager
+ InvokerBeanMgr storageMapMgr = storageManager
.getStorageMapBeanMgr();
SequencePropertyBeanMgr sequencePropMgr = storageManager
@@ -117,12 +117,12 @@
"Invalid messaage number for the nextMsgNo");
Iterator stMapIt = storageMapMgr.find(
- new StorageMapBean(null, nextMsgno, sequenceId))
+ new InvokerBean(null, nextMsgno, sequenceId))
.iterator();
while (stMapIt.hasNext()) {
- StorageMapBean stMapBean = (StorageMapBean) stMapIt
+ InvokerBean stMapBean = (InvokerBean) stMapIt
.next();
String key = stMapBean.getKey();
@@ -167,7 +167,7 @@
nextMsgno++;
stMapIt = storageMapMgr
.find(
- new StorageMapBean(null, nextMsgno,
+ new InvokerBean(null, nextMsgno,
sequenceId)).iterator();
//terminate (AfterInvocation)
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=348691&r1=348690&r2=348691&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Thu Nov 24 01:05:29 2005
@@ -30,8 +30,8 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.TerminateManager;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
-import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
+import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.util.MessageRetransmissionAdjuster;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -66,14 +66,14 @@
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(context);
- RetransmitterBeanMgr mgr = storageManager
+ SenderBeanMgr mgr = storageManager
.getRetransmitterBeanMgr();
Collection coll = mgr.findMsgsToSend();
Iterator iter = coll.iterator();
while (iter.hasNext()) {
- RetransmitterBean bean = (RetransmitterBean) iter.next();
+ SenderBean bean = (SenderBean) iter.next();
String key = (String) bean.getKey();
MessageContext msgCtx = SandeshaUtil
.getStoredMessageContext(key);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org
Re: svn commit: r348691 - in /webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/ msgprocessors/ storage/ storage/beanmanagers/ storage/beans/ storage/inmemory/ storage/persistent/ util/ workers/
Posted by Chamikara Jayalath <ch...@gmail.com>.
Hi,
Currently we are using following shorted formes for parts of some class and
method names because some names become quite long otherwise.
Manager -> Mgr
Context -> Ctx
Message -> Msg
Sequence -> Seq
Shall we rename them to the longer form?
Thanks,
Chamikara
On 11/24/05, Sanjiva Weerawarana <sa...@opensource.lk> wrote:
>
> On Thu, 2005-11-24 at 09:07 +0000, chamikara@apache.org wrote:
> > Author: chamikara
> > Date: Thu Nov 24 01:05:29 2005
> > New Revision: 348691
> >
> > URL: http://svn.apache.org/viewcvs?rev=348691&view=rev
> > Log:
> > Refactored code
> > RetransmitterBeanMgr -> SenderBeanMgr
> > RetransmitterBean -> SenderBean
> > StorageMapBeanMgr -> InvokerBeanMgr
> > StorageMapBean -> InvokerBean
>
> s/Mgr/Manager/ ??
>
> Sanjiva.
>
>
>
Re: svn commit: r348691 - in /webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/ msgprocessors/ storage/ storage/beanmanagers/ storage/beans/ storage/inmemory/ storage/persistent/ util/ workers/
Posted by Chamikara Jayalath <ch...@gmail.com>.
Hi,
Currently we are using following shorted formes for parts of some class and
method names because some names become quite long otherwise.
Manager -> Mgr
Context -> Ctx
Message -> Msg
Sequence -> Seq
Shall we rename them to the longer form?
Thanks,
Chamikara
On 11/24/05, Sanjiva Weerawarana <sa...@opensource.lk> wrote:
>
> On Thu, 2005-11-24 at 09:07 +0000, chamikara@apache.org wrote:
> > Author: chamikara
> > Date: Thu Nov 24 01:05:29 2005
> > New Revision: 348691
> >
> > URL: http://svn.apache.org/viewcvs?rev=348691&view=rev
> > Log:
> > Refactored code
> > RetransmitterBeanMgr -> SenderBeanMgr
> > RetransmitterBean -> SenderBean
> > StorageMapBeanMgr -> InvokerBeanMgr
> > StorageMapBean -> InvokerBean
>
> s/Mgr/Manager/ ??
>
> Sanjiva.
>
>
>
Re: svn commit: r348691 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/
msgprocessors/ storage/ storage/beanmanagers/ storage/beans/
storage/inmemory/ storage/persistent/ util/ workers/
Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
On Thu, 2005-11-24 at 09:07 +0000, chamikara@apache.org wrote:
> Author: chamikara
> Date: Thu Nov 24 01:05:29 2005
> New Revision: 348691
>
> URL: http://svn.apache.org/viewcvs?rev=348691&view=rev
> Log:
> Refactored code
> RetransmitterBeanMgr -> SenderBeanMgr
> RetransmitterBean -> SenderBean
> StorageMapBeanMgr -> InvokerBeanMgr
> StorageMapBean -> InvokerBean
s/Mgr/Manager/ ??
Sanjiva.
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org
Re: svn commit: r348691 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/
msgprocessors/ storage/ storage/beanmanagers/ storage/beans/
storage/inmemory/ storage/persistent/ util/ workers/
Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
On Thu, 2005-11-24 at 09:07 +0000, chamikara@apache.org wrote:
> Author: chamikara
> Date: Thu Nov 24 01:05:29 2005
> New Revision: 348691
>
> URL: http://svn.apache.org/viewcvs?rev=348691&view=rev
> Log:
> Refactored code
> RetransmitterBeanMgr -> SenderBeanMgr
> RetransmitterBean -> SenderBean
> StorageMapBeanMgr -> InvokerBeanMgr
> StorageMapBean -> InvokerBean
s/Mgr/Manager/ ??
Sanjiva.
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org