Author: gatfora
Date: Mon Jan 15 01:31:28 2007
New Revision: 496257
URL: http://svn.apache.org/viewvc?view=rev&rev=496257
Log:
Remove InternalSequenceId property
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
Mon Jan 15 01:31:28 2007
@@ -254,8 +254,6 @@
// sequenceId to share data b/w
// sequences
- String INTERNAL_SEQUENCE_ID = "TempSequenceId";
-
String INCOMING_SEQUENCE_LIST = "IncomingSequenceList";
String SECURITY_TOKEN = "SecurityToken";
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
Mon Jan 15 01:31:28 2007
@@ -245,25 +245,23 @@
public static SandeshaReport getSandeshaReport(ConfigurationContext
configurationContext) throws SandeshaException {
StorageManager storageManager =
SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
- SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
SandeshaReport sandeshaReport = new SandeshaReport();
- SequencePropertyBean internalSequenceFindBean = new
SequencePropertyBean();
Transaction reportTransaction = null;
try {
reportTransaction = storageManager.getTransaction();
-
internalSequenceFindBean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
- Collection collection =
seqPropMgr.find(internalSequenceFindBean);
- Iterator iterator = collection.iterator();
+ RMSBean findBean = new RMSBean();
+ List rmsBeans =
storageManager.getRMSBeanMgr().find(findBean);
+ Iterator iterator = rmsBeans.iterator();
while (iterator.hasNext()) {
- SequencePropertyBean bean =
(SequencePropertyBean) iterator.next();
- String sequenceID =
bean.getSequencePropertyKey();
+ RMSBean bean = (RMSBean) iterator.next();
+ String sequenceID = bean.getSequenceID();
sandeshaReport.addToOutgoingSequenceList(sequenceID);
-
sandeshaReport.addToOutgoingInternalSequenceMap(sequenceID, bean.getValue());
+
sandeshaReport.addToOutgoingInternalSequenceMap(sequenceID,
bean.getInternalSequenceID());
- SequenceReport report =
getOutgoingSequenceReport(bean.getValue(), configurationContext);
+ SequenceReport report =
getOutgoingSequenceReport(bean.getInternalSequenceID(), configurationContext);
sandeshaReport.addToNoOfCompletedMessagesMap(sequenceID,
report.getCompletedMessages().size());
sandeshaReport.addToSequenceStatusMap(sequenceID, report.getSequenceStatus());
@@ -407,19 +405,9 @@
}
if (terminatedSequence) {
- // We need to find out the original sequence id
for this sequence by doing a backwards lookup
- SequencePropertyBean bean = new
SequencePropertyBean();
-
bean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
- bean.setValue(internalSequenceId);
- bean = seqPropMgr.findUnique(bean);
-
- String sequenceId = null;
- if (bean != null)
- sequenceId = bean.getSequencePropertyKey();
-
// Find all properties which have a matching
internal sequence id
- removeBeans(sequenceId, seqPropMgr);
- removeBeans(internalSequenceId, seqPropMgr);
+ removeBeans(rmsBean.getSequenceID(),
seqPropMgr);
+ removeBeans(rmsBean.getInternalSequenceID(),
seqPropMgr);
// Delete the rmsBean
storageManager.getRMSBeanMgr().delete(rmsBean.getCreateSeqMsgID());
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Mon Jan 15 01:31:28 2007
@@ -120,8 +120,8 @@
}
// Check that the sender of this Ack holds the correct token
- String sequencePropertyKey =
SandeshaUtil.getSequenceProperty(outSequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
+ RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, outSequenceId);
+ String sequencePropertyKey = rmsBean.getInternalSequenceID();
SequencePropertyBean tokenBean =
seqPropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(tokenBean != null) {
SecurityManager secManager =
SandeshaUtil.getSecurityManager(configCtx);
@@ -167,7 +167,6 @@
}
}
- RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, outSequenceId);
// updating the last activated time of the sequence.
rmsBean.setLastActivatedTime(System.currentTimeMillis());
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Mon Jan 15 01:31:28 2007
@@ -147,26 +147,19 @@
String outgoingSideSequencePropertyKey =
outgoingSideInternalSequenceId;
- 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
// be wasted properties for the client side.
-
- // setting the internal_sequence_id
- SequencePropertyBean internalSequenceBean = new
SequencePropertyBean();
-
internalSequenceBean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
-
internalSequenceBean.setSequencePropertyKey(offeredSequenceID);
-
internalSequenceBean.setValue(outgoingSideInternalSequenceId);
- seqPropMgr.insert(internalSequenceBean);
Endpoint endpoint = offer.getEndpoint();
if (endpoint!=null) {
// setting the OfferedEndpoint
rMSBean.setOfferedEndPoint(endpoint.getEPR().getAddress());
}
-
+
+ RMSBeanMgr rmsBeanMgr =
storageManager.getRMSBeanMgr();
+ rmsBeanMgr.insert(rMSBean);
+
// Store the inbound token (if any) with the
new sequence
if(token != null) {
String tokenData =
secManager.getTokenRecoveryData(token);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Mon Jan 15 01:31:28 2007
@@ -158,12 +158,7 @@
// deleting the create sequence entry.
retransmitterMgr.delete(createSeqMsgId);
- // storing new out sequence id
SequencePropertyBeanMgr sequencePropMgr =
storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean internalSequenceBean = new
SequencePropertyBean(newOutSequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID,
sequencePropertyKey);
-
- sequencePropMgr.insert(internalSequenceBean);
// Store the security token under the new sequence id
if(tokenData != null) {
@@ -371,7 +366,7 @@
return true;
}
- public boolean processOutMessage(RMMsgContext rmMsgCtx) throws
SandeshaException {
+ public boolean processOutMessage(RMMsgContext rmMsgCtx) {
if (log.isDebugEnabled()) {
log.debug("Enter:
CreateSeqResponseMsgProcessor::processOutMessage");
log.debug("Exit:
CreateSeqResponseMsgProcessor::processOutMessage " + Boolean.FALSE);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Mon Jan 15 01:31:28 2007
@@ -209,10 +209,9 @@
if (allAcked)
{
- String internalSequenceID =
SandeshaUtil.getSequenceProperty(outgoingSequnceID,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
+ RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, outgoingSequnceID);
-
TerminateManager.addTerminateSequenceMessage(terminateRMMsg,
internalSequenceID, outgoingSequnceID,
+
TerminateManager.addTerminateSequenceMessage(terminateRMMsg,
rmsBean.getInternalSequenceID(), outgoingSequnceID,
responseSideSequencePropertyKey, storageManager);
}
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
Mon Jan 15 01:31:28 2007
@@ -25,7 +25,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
@@ -59,9 +58,8 @@
terminateResRMMsg.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ_RESPONSE);
String sequenceId = tsResponse.getIdentifier().getIdentifier();
- String internalSequenceID =
SandeshaUtil.getSequenceProperty(sequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
-
msgContext.setProperty(Sandesha2Constants.MessageContextProperties.INTERNAL_SEQUENCE_ID,internalSequenceID);
+ RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, sequenceId);
+
msgContext.setProperty(Sandesha2Constants.MessageContextProperties.INTERNAL_SEQUENCE_ID,rmsBean.getInternalSequenceID());
String sequencePropertyKey =
SandeshaUtil.getSequencePropertyKey(terminateResRMMsg);
// Check that the sender of this TerminateSequence holds the
correct token
@@ -76,7 +74,6 @@
ConfigurationContext configContext =
msgContext.getConfigurationContext();
//shedulling a polling request for the response side.
- RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, sequenceId);
if (rmsBean.getOfferedSequence()!=null) {
RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
@@ -86,8 +83,7 @@
SandeshaUtil.shedulePollingRequest(rmsBean.getOfferedSequence(), configContext);
}
- TerminateManager.terminateSendingSide (configContext,
sequencePropertyKey,internalSequenceID, msgContext.isServerSide(),
- storageManager);
+ TerminateManager.terminateSendingSide (rmsBean,
msgContext.isServerSide(), storageManager);
// Stop this message travelling further through the Axis runtime
terminateResRMMsg.pause();
@@ -96,7 +92,7 @@
return true;
}
- public boolean processOutMessage(RMMsgContext rmMsgCtx) throws
SandeshaException {
+ public boolean processOutMessage(RMMsgContext rmMsgCtx) {
if(log.isDebugEnabled()) log.debug("Enter:
TerminateSeqResponseMsgProcessor::processOutMessage");
if(log.isDebugEnabled()) log.debug("Exit:
TerminateSeqResponseMsgProcessor::processOutMessage " + Boolean.FALSE);
return false;
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
Mon Jan 15 01:31:28 2007
@@ -80,8 +80,8 @@
Sequence sequence = (Sequence)
rmMessageContext.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
if(sequence != null) {
String outboundSequenceId =
sequence.getIdentifier().getIdentifier();
- String outboundInternalSeq =
SandeshaUtil.getSequenceProperty(outboundSequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
+ RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, outboundSequenceId);
+ String outboundInternalSeq =
rmsBean.getInternalSequenceID();
String inboundSequenceId =
SandeshaUtil.getServerSideIncomingSeqIdFromInternalSeqId(outboundInternalSeq);
if(log.isDebugEnabled())
log.debug("Piggybacking ack for " + inboundSequenceId);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
Mon Jan 15 01:31:28 2007
@@ -142,7 +142,7 @@
// Already an active transaction, so don't want a new one
SequenceReport report =
SandeshaClient.getOutgoingSequenceReport(internalSequenceID,
configurationContext, false);
-
TerminateManager.timeOutSendingSideSequence(configurationContext,sequencePropertyKey
,internalSequenceID, false, storageManager);
+ TerminateManager.timeOutSendingSideSequence(sequencePropertyKey
,internalSequenceID, false, storageManager);
SandeshaListener listener = (SandeshaListener) messageContext
.getProperty(SandeshaClientConstants.SANDESHA_LISTENER);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Mon Jan 15 01:31:28 2007
@@ -184,36 +184,26 @@
* @param sequenceID
* @throws SandeshaException
*/
- public static void terminateSendingSide(ConfigurationContext
configContext, String sequencePropertyKey, String internalSequenceID,
+ public static void terminateSendingSide(RMSBean rmsBean,
boolean serverSide, StorageManager storageManager)
throws SandeshaException {
- RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager,
internalSequenceID);
// Indicate that the sequence is terminated
rmsBean.setTerminated(true);
storageManager.getRMSBeanMgr().update(rmsBean);
- cleanSendingSideData (configContext, sequencePropertyKey ,
internalSequenceID, serverSide, storageManager);
+ cleanSendingSideData (rmsBean.getSequenceID(),
rmsBean.getInternalSequenceID(), serverSide, storageManager);
}
- private static boolean isPropertyDeletable(String name) {
- boolean deleatable = true;
-
- if
(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID.equals(name))
- deleatable = false;
-
- return deleatable;
- }
-
- public static void timeOutSendingSideSequence(ConfigurationContext
context, String sequencePropertyKey,String internalSequenceId,
+ public static void timeOutSendingSideSequence(String
sequencePropertyKey,String internalSequenceId,
boolean serverside, StorageManager storageManager)
throws SandeshaException {
RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager,
internalSequenceId);
rmsBean.setTimedOut(true);
- cleanSendingSideData(context,
sequencePropertyKey,internalSequenceId, serverside, storageManager);
+ cleanSendingSideData(sequencePropertyKey,internalSequenceId,
serverside, storageManager);
}
- private static void cleanSendingSideData(ConfigurationContext
configContext, String sequencePropertyKey,String internalSequenceId,
+ private static void cleanSendingSideData(String
sequencePropertyKey,String internalSequenceId,
boolean serverSide, StorageManager storageManager)
throws SandeshaException {
SequencePropertyBeanMgr sequencePropertyBeanMgr =
storageManager.getSequencePropertyBeanMgr();
@@ -229,10 +219,6 @@
String messageStoreKey =
retransmitterBean.getMessageContextRefKey();
storageManager.removeMessageContext(messageStoreKey);
}
-
- // removing the createSeqMgrEntry
- RMSBean createSeqFindBean = new RMSBean();
- createSeqFindBean.setInternalSequenceID(internalSequenceId);
// removing sequence properties
SequencePropertyBean findSequencePropertyBean1 = new
SequencePropertyBean();
@@ -244,9 +230,7 @@
// TODO all properties which hv the temm:Seq:id as the
key should be
// deletable.
- if
(isPropertyDeletable(sequencePropertyBean.getName())) {
-
sequencePropertyBeanMgr.delete(sequencePropertyBean.getSequencePropertyKey(),
sequencePropertyBean.getName());
- }
+
sequencePropertyBeanMgr.delete(sequencePropertyBean.getSequencePropertyKey(),
sequencePropertyBean.getName());
}
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=496257&r1=496256&r2=496257
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Mon Jan 15 01:31:28 2007
@@ -296,12 +296,9 @@
TerminateSequence terminateSequence =
(TerminateSequence) rmMsgCtx
.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ);
String sequenceID =
terminateSequence.getIdentifier().getIdentifier();
- ConfigurationContext configContext =
msgCtx.getConfigurationContext();
- String internalSequenceID =
SandeshaUtil.getSequenceProperty(sequenceID,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, storageManager);
- String sequencePropertyKey =
internalSequenceID; //property key of the sending side is the internal sequence
Id.
-
TerminateManager.terminateSendingSide(configContext, sequencePropertyKey
,internalSequenceID, msgCtx.isServerSide(),
+ RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, sequenceID);
+ TerminateManager.terminateSendingSide(rmsBean,
msgCtx.isServerSide(),
storageManager);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
