Author: chamikara
Date: Wed Sep 13 03:23:52 2006
New Revision: 442928
URL: http://svn.apache.org/viewvc?view=rev&rev=442928
Log:
Moved some more classes to the correct pattern in handling sequence properties.
Modified:
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/TerminateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
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=442928&r1=442927&r2=442928
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Wed Sep 13 03:23:52 2006
@@ -164,13 +164,15 @@
// side.
CreateSeqBean createSeqBean = new
CreateSeqBean();
createSeqBean.setSequenceID(offeredSequenceID);
- String outgoingSideInternalSequenceID =
SandeshaUtil
+ String outgoingSideInternalSequenceId =
SandeshaUtil
.getOutgoingSideInternalSequenceID(newSequenceId);
-
createSeqBean.setInternalSequenceID(outgoingSideInternalSequenceID);
+
createSeqBean.setInternalSequenceID(outgoingSideInternalSequenceId);
createSeqBean.setCreateSeqMsgID(SandeshaUtil.getUUID()); // this
// is a
// dummy
// value.
+
+ String outgoingSideSequencePropertyKey
= outgoingSideInternalSequenceId;
CreateSeqBeanMgr createSeqMgr =
storageManager.getCreateSeqBeanMgr();
createSeqMgr.insert(createSeqBean);
@@ -183,14 +185,14 @@
SequencePropertyBean outSequenceBean =
new SequencePropertyBean();
outSequenceBean.setName(Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID);
outSequenceBean.setValue(offeredSequenceID);
-
outSequenceBean.setSequencePropertyKey(outgoingSideInternalSequenceID);
+
outSequenceBean.setSequencePropertyKey(outgoingSideSequencePropertyKey);
seqPropMgr.insert(outSequenceBean);
// setting the internal_sequence_id
SequencePropertyBean
internalSequenceBean = new SequencePropertyBean();
internalSequenceBean.setName(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
internalSequenceBean.setSequencePropertyKey(offeredSequenceID);
-
internalSequenceBean.setValue(outgoingSideInternalSequenceID);
+
internalSequenceBean.setValue(outgoingSideInternalSequenceId);
seqPropMgr.insert(internalSequenceBean);
} else {
// removing the accept part.
@@ -250,12 +252,12 @@
log.debug("Exit:
CreateSeqMsgProcessor::processInMessage");
}
- private boolean offerAccepted(String sequenceID, ConfigurationContext
configCtx, RMMsgContext createSeqRMMsg,
+ private boolean offerAccepted(String sequenceId, ConfigurationContext
configCtx, RMMsgContext createSeqRMMsg,
StorageManager storageManager) throws SandeshaException
{
if (log.isDebugEnabled())
- log.debug("Enter: CreateSeqMsgProcessor::offerAccepted,
" + sequenceID);
+ log.debug("Enter: CreateSeqMsgProcessor::offerAccepted,
" + sequenceId);
- if ("".equals(sequenceID)) {
+ if ("".equals(sequenceId)) {
if (log.isDebugEnabled())
log.debug("Exit:
CreateSeqMsgProcessor::offerAccepted, " + false);
return false;
@@ -264,7 +266,7 @@
CreateSeqBeanMgr createSeqMgr =
storageManager.getCreateSeqBeanMgr();
CreateSeqBean createSeqFindBean = new CreateSeqBean();
- createSeqFindBean.setSequenceID(sequenceID);
+ createSeqFindBean.setSequenceID(sequenceId);
Collection arr = createSeqMgr.find(createSeqFindBean);
if (arr.size() > 0) {
@@ -272,7 +274,7 @@
log.debug("Exit:
CreateSeqMsgProcessor::offerAccepted, " + false);
return false;
}
- if (sequenceID.length() <= 1) {
+ if (sequenceId.length() <= 1) {
if (log.isDebugEnabled())
log.debug("Exit:
CreateSeqMsgProcessor::offerAccepted, " + false);
return false; // Single character offers are NOT
accepted.
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=442928&r1=442927&r2=442928
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Wed Sep 13 03:23:52 2006
@@ -128,7 +128,10 @@
log.debug(message);
throw new SandeshaException(message);
}
-
+
createSeqResponseRMMsgCtx.setProperty(Sandesha2Constants.MessageContextProperties.INTERNAL_SEQUENCE_ID,internalSequenceId);
+
+ String sequencePropertyKey =
SandeshaUtil.getSequencePropertyKey(createSeqResponseRMMsgCtx);
+
createSeqBean.setSequenceID(newOutSequenceId);
createSeqMgr.update(createSeqBean);
@@ -145,10 +148,10 @@
// storing new out sequence id
SequencePropertyBeanMgr sequencePropMgr =
storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean outSequenceBean = new
SequencePropertyBean(internalSequenceId,
+ SequencePropertyBean outSequenceBean = new
SequencePropertyBean(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID, newOutSequenceId);
SequencePropertyBean internalSequenceBean = new
SequencePropertyBean(newOutSequenceId,
-
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID, internalSequenceId);
+
Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID,
sequencePropertyKey);
sequencePropMgr.insert(outSequenceBean);
sequencePropMgr.insert(internalSequenceBean);
@@ -164,7 +167,7 @@
Accept accept = createSeqResponsePart.getAccept();
if (accept != null) {
// Find offered sequence from internal sequence id.
- SequencePropertyBean offeredSequenceBean =
sequencePropMgr.retrieve(internalSequenceId,
+ SequencePropertyBean offeredSequenceBean =
sequencePropMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE);
// TODO this should be detected in the Fault manager.
@@ -239,7 +242,7 @@
if (applicationMsg == null)
throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.unavailableAppMsg));
- String rmVersion =
SandeshaUtil.getRMVersion(internalSequenceId, storageManager);
+ String rmVersion =
SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
if (rmVersion == null)
throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
@@ -281,7 +284,7 @@
storageManager.updateMessageContext(key,
applicationMsg);
}
- SequenceManager.updateLastActivatedTime(internalSequenceId,
storageManager);
+ SequenceManager.updateLastActivatedTime(sequencePropertyKey,
storageManager);
createSeqResponseRMMsgCtx.getMessageContext().getOperationContext().setProperty(
org.apache.axis2.Constants.RESPONSE_WRITTEN,
"false");
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=442928&r1=442927&r2=442928
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
Wed Sep 13 03:23:52 2006
@@ -53,9 +53,10 @@
TerminateSequenceResponse tsResponse =
(TerminateSequenceResponse)
terminateResRMMsg.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ_RESPONSE);
String sequenceId = tsResponse.getIdentifier().getIdentifier();
+ String sequencePropertyKey =
SandeshaUtil.getSequencePropertyKey(terminateResRMMsg);
// Check that the sender of this TerminateSequence holds the
correct token
- SequencePropertyBean tokenBean =
sequencePropertyBeanMgr.retrieve(sequenceId,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
+ SequencePropertyBean tokenBean =
sequencePropertyBeanMgr.retrieve(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(tokenBean != null) {
SecurityManager secManager =
SandeshaUtil.getSecurityManager(context);
OMElement body =
terminateResRMMsg.getSOAPEnvelope().getBody();
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=442928&r1=442927&r2=442928
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Wed Sep 13 03:23:52 2006
@@ -68,10 +68,6 @@
return;
}
-// if (msgCtx == null) {
-// String message = "Message context is not
present in the storage";
-// }
-
// sender will not send the message if following
property is
// set and not true.
// But it will set if it is not set (null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
