You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ga...@apache.org on 2007/01/15 11:52:44 UTC
svn commit: r496273 - in /webservices/sandesha/trunk/java:
src/org/apache/sandesha2/ src/org/apache/sandesha2/msgprocessors/
src/org/apache/sandesha2/storage/beans/ src/org/apache/sandesha2/util/
test/src/org/apache/sandesha2/
Author: gatfora
Date: Mon Jan 15 02:52:42 2007
New Revision: 496273
URL: http://svn.apache.org/viewvc?view=rev&rev=496273
Log:
Move rmSpecVersion property to RMSequenceBean
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/MessageValidator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/MessageValidator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/MessageValidator.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/MessageValidator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/MessageValidator.java Mon Jan 15 02:52:42 2007
@@ -20,6 +20,8 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
+import org.apache.sandesha2.storage.beans.RMDBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.SpecSpecificConstants;
@@ -37,8 +39,16 @@
String sequenceID = SandeshaUtil.getSequenceIDFromRMMessage(rmMsg);
if (sequenceID != null) {
- String rmVersionOfSequence = SandeshaUtil.getSequenceProperty(sequenceID,
- Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION, storageManager);
+ String rmVersionOfSequence = null;
+
+ RMSBean rmsBean = SandeshaUtil.getRMSBeanFromSequenceId(storageManager, sequenceID);
+ if (rmsBean != null)
+ rmVersionOfSequence = rmsBean.getRMVersion();
+ else {
+ RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceID);
+ if (rmdBean != null)
+ rmVersionOfSequence = rmdBean.getRMVersion();
+ }
String rmNamespaceOfMsg = rmMsg.getRMNamespaceValue();
String rmNamespaceOfSequence = null;
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=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java Mon Jan 15 02:52:42 2007
@@ -246,8 +246,6 @@
}
public interface SequenceProperties {
-
- String RM_SPEC_VERSION = "WSRMSpecVersion";
String ALL_SEQUENCES = "AllSequences"; //this is not a sequence
// property. This is used as the
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Mon Jan 15 02:52:42 2007
@@ -138,8 +138,6 @@
// Setting the ack depending on AcksTo.
RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceId);
- SequencePropertyBean versionBean = seqPropMgr.retrieve(sequencePropertyKey,
- Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
EndpointReference acksTo = new EndpointReference(rmdBean.getAcksToEPR());
String acksToStr = acksTo.getAddress();
@@ -149,7 +147,7 @@
AxisOperation ackOperation = SpecSpecificConstants.getWSRMOperation(
Sandesha2Constants.MessageTypes.ACK,
- versionBean.getValue(),
+ rmdBean.getRMVersion(),
msgContext.getAxisService());
MessageContext ackMsgCtx = SandeshaUtil.createNewRelatedMessageContext(rmMsgCtx, ackOperation);
@@ -172,7 +170,7 @@
ackMsgCtx.setTo(acksTo);
ackMsgCtx.setReplyTo(msgContext.getTo());
- RMMsgCreator.addAckMessage(ackRMMsgCtx,sequencePropertyKey,sequenceId, storageManager);
+ RMMsgCreator.addAckMessage(ackRMMsgCtx,rmdBean,sequencePropertyKey,sequenceId, storageManager);
ackRMMsgCtx.getMessageContext().setServerSide(true);
if (acksTo.hasAnonymousAddress()) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Mon Jan 15 02:52:42 2007
@@ -40,11 +40,9 @@
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
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;
import org.apache.sandesha2.util.SOAPAbstractFactory;
@@ -104,7 +102,6 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configContext, configContext
.getAxisConfiguration());
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
boolean serverSide = msgContext.isServerSide();
@@ -234,16 +231,9 @@
Sequence sequence = (Sequence) requestRMMsgCtx.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
String requestSequenceID = sequence.getIdentifier().getIdentifier();
- String requestSideSequencePropertyKey = SandeshaUtil.getSequencePropertyKey(requestRMMsgCtx);
-
- SequencePropertyBean specVersionBean = seqPropMgr.retrieve(requestSideSequencePropertyKey,
- Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
- if (specVersionBean == null) {
- throw new SandeshaException(SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.specVersionPropertyNotAvailable, requestSequenceID));
- }
+ RMDBean bean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, requestSequenceID);
- specVersion = specVersionBean.getValue();
+ specVersion = bean.getRMVersion();
} else {
// in the client side, user will set the RM version.
specVersion = (String) msgContext.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
@@ -567,7 +557,6 @@
MessageContext msg = rmMsg.getMessageContext();
- SequencePropertyBeanMgr sequencePropertyMgr = storageManager.getSequencePropertyBeanMgr();
SenderBeanMgr retransmitterMgr = storageManager.getSenderBeanMgr();
EndpointReference toEPR = new EndpointReference(rmsBean.getToEPR());
@@ -587,10 +576,7 @@
else
rmMsg.setTo(toEPR);
- String rmVersion = SandeshaUtil.getRMVersion(internalSequenceId, storageManager);
- if (rmVersion == null)
- throw new SandeshaException(SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.specVersionPropertyNotAvailable, internalSequenceId));
+ String rmVersion = rmsBean.getRMVersion();
String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
@@ -626,14 +612,7 @@
Object obj = msg.getProperty(SandeshaClientConstants.LAST_MESSAGE);
if (obj != null && "true".equals(obj)) {
- SequencePropertyBean specVersionBean = sequencePropertyMgr.retrieve(internalSequenceId,
- Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
- if (specVersionBean == null)
- throw new SandeshaException(SandeshaMessageHelper
- .getMessage(SandeshaMessageKeys.specVersionNotSet));
-
- String specVersion = specVersionBean.getValue();
- if (SpecSpecificConstants.isLastMessageIndicatorRequired(specVersion))
+ if (SpecSpecificConstants.isLastMessageIndicatorRequired(rmVersion))
sequence.setLastMessage(new LastMessage(rmNamespaceValue));
}
}
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=496273&r1=496272&r2=496273
==============================================================================
--- 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 02:52:42 2007
@@ -144,6 +144,7 @@
rMSBean.setAcksToEPR(rmdBean.getAcksToEPR());
rMSBean.setReplyToEPR(rmdBean.getReplyToEPR());
rMSBean.setLastActivatedTime(System.currentTimeMillis());
+ rMSBean.setRMVersion(rmdBean.getRMVersion());
String outgoingSideSequencePropertyKey = outgoingSideInternalSequenceId;
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=496273&r1=496272&r2=496273
==============================================================================
--- 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 02:52:42 2007
@@ -210,11 +210,8 @@
}
String rmSpecVersion = createSeqResponseRMMsgCtx.getRMSpecVersion();
-
- SequencePropertyBean specVersionBean = new SequencePropertyBean(rmsBean.getOfferedSequence(),
- Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION, rmSpecVersion);
- sequencePropMgr.insert(specVersionBean);
-
+ rMDBean.setRMVersion(rmSpecVersion);
+
rMDBean.setServerCompletedMessages(new ArrayList());
RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
@@ -268,11 +265,7 @@
if (applicationMsg == null)
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.unavailableAppMsg));
- String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
- if (rmVersion == null)
- throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
-
- String assumedRMNamespace = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
+ String assumedRMNamespace = SpecSpecificConstants.getRMNamespaceValue(rmsBean.getRMVersion());
RMMsgContext applicaionRMMsg = MsgInitializer.initializeMessage(applicationMsg);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java Mon Jan 15 02:52:42 2007
@@ -55,6 +55,8 @@
* polling and will do MakeConnections on them.
*/
private boolean pollingMode=false;
+
+ private String rMVersion;
public RMSequenceBean() {
@@ -135,6 +137,14 @@
this.lastActivatedTime = lastActivatedTime;
}
+ public String getRMVersion() {
+ return rMVersion;
+ }
+
+ public void setRMVersion(String rmVersion) {
+ this.rMVersion = rmVersion;
+ }
+
public String toString() {
StringBuffer result = new StringBuffer();
result.append("\nSequence Id : "); result.append(sequenceID);
@@ -144,7 +154,8 @@
result.append("\nPolling : "); result.append(pollingMode);
result.append("\nClosed : "); result.append(closed);
result.append("\nTerminated : "); result.append(terminated);
- result.append("\nLastActivatedTime: "); result.append(lastActivatedTime);
+ result.append("\nLastActivatedTime: "); result.append(lastActivatedTime);
+ result.append("\nRMVersion : "); result.append(rMVersion);
return result.toString();
}
}
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=496273&r1=496272&r2=496273
==============================================================================
--- 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 02:52:42 2007
@@ -85,7 +85,7 @@
String inboundSequenceId = SandeshaUtil.getServerSideIncomingSeqIdFromInternalSeqId(outboundInternalSeq);
if(log.isDebugEnabled()) log.debug("Piggybacking ack for " + inboundSequenceId);
- RMMsgCreator.addAckMessage(rmMessageContext, inboundSequenceId, inboundSequenceId, storageManager);
+ RMMsgCreator.addAckMessage(rmMessageContext, rmsBean, inboundSequenceId, inboundSequenceId, storageManager);
}
if(log.isDebugEnabled()) log.debug("Exit: AcknowledgementManager::piggybackAcksIfPresent, anon");
return;
@@ -240,7 +240,7 @@
ackMsgCtx.setTo(acksTo);
// adding the SequenceAcknowledgement part.
- RMMsgCreator.addAckMessage(ackRMMsgCtx, sequencePropertyKey ,sequenceId, storageManager);
+ RMMsgCreator.addAckMessage(ackRMMsgCtx, rmdBean, sequencePropertyKey ,sequenceId, storageManager);
if (log.isDebugEnabled())
log.debug("Exit: AcknowledgementManager::generateAckMessage");
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java Mon Jan 15 02:52:42 2007
@@ -45,6 +45,7 @@
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMSequenceBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.Accept;
import org.apache.sandesha2.wsrm.AckFinal;
@@ -98,7 +99,7 @@
// except for configCtx).
AxisOperation createSequenceOperation = SpecSpecificConstants.getWSRMOperation(
Sandesha2Constants.MessageTypes.CREATE_SEQ,
- SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager),
+ rmsBean.getRMVersion(),
applicationMsgContext.getAxisService());
createSeqmsgContext = SandeshaUtil
@@ -115,11 +116,7 @@
RMMsgContext createSeqRMMsg = new RMMsgContext(createSeqmsgContext);
- String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
- if (rmVersion == null)
- throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
-
- String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
+ String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmsBean.getRMVersion());
// Decide which addressing version to use. We copy the version that the application
// is already using (if set), and fall back to the level in the spec if that isn't
@@ -219,10 +216,8 @@
secMgr.applySecurityToken(token, createSeqRMMsg.getMessageContext());
}
- createSeqRMMsg.setAction(SpecSpecificConstants.getCreateSequenceAction(SandeshaUtil.getRMVersion(
- sequencePropertyKey, storageManager)));
- createSeqRMMsg.setSOAPAction(SpecSpecificConstants.getCreateSequenceSOAPAction(SandeshaUtil.getRMVersion(
- sequencePropertyKey, storageManager)));
+ createSeqRMMsg.setAction(SpecSpecificConstants.getCreateSequenceAction(rmsBean.getRMVersion()));
+ createSeqRMMsg.setSOAPAction(SpecSpecificConstants.getCreateSequenceSOAPAction(rmsBean.getRMVersion()));
createSeqRMMsg.addSOAPEnvelope();
@@ -237,7 +232,7 @@
* @return
* @throws SandeshaException
*/
- public static RMMsgContext createTerminateSequenceMessage(RMMsgContext referenceRMMessage, String sequenceId,
+ public static RMMsgContext createTerminateSequenceMessage(RMMsgContext referenceRMMessage, RMSBean rmsBean, String sequenceId,
String sequencePropertyKey, StorageManager storageManager) throws AxisFault {
MessageContext referenceMessage = referenceRMMessage.getMessageContext();
if (referenceMessage == null)
@@ -245,7 +240,7 @@
AxisOperation terminateOperation = SpecSpecificConstants.getWSRMOperation(
Sandesha2Constants.MessageTypes.TERMINATE_SEQ,
- SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager),
+ rmsBean.getRMVersion(),
referenceMessage.getAxisService());
ConfigurationContext configCtx = referenceMessage.getConfigurationContext();
@@ -264,13 +259,9 @@
// messages
// correctly.
- String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
- if (rmVersion == null)
- throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
-
- String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
+ String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmsBean.getRMVersion());
- if (!SpecSpecificConstants.isTerminateSequenceResponseRequired(rmVersion)) {
+ if (!SpecSpecificConstants.isTerminateSequenceResponseRequired(rmsBean.getRMVersion())) {
terminateMessage.setProperty(MessageContext.TRANSPORT_IN, null);
}
@@ -440,18 +431,15 @@
* @param sequenceId
* @throws SandeshaException
*/
- public static void addAckMessage(RMMsgContext applicationMsg, String sequencePropertyKey ,String sequenceId, StorageManager storageManager)
+ public static void addAckMessage(RMMsgContext applicationMsg, RMSequenceBean rmBean, String sequencePropertyKey ,
+ String sequenceId, StorageManager storageManager)
throws SandeshaException {
if(log.isDebugEnabled())
log.debug("Entry: RMMsgCreator::addAckMessage " + sequenceId);
SOAPEnvelope envelope = applicationMsg.getSOAPEnvelope();
- String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
- if (rmVersion == null)
- throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
-
- String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
+ String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmBean.getRMVersion());
SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement(rmNamespaceValue);
Identifier id = new Identifier(rmNamespaceValue);
@@ -469,7 +457,7 @@
if (rmdBean.isClosed()) {
// sequence is closed. so add the 'Final' part.
- if (SpecSpecificConstants.isAckFinalAllowed(rmVersion)) {
+ if (SpecSpecificConstants.isAckFinalAllowed(rmBean.getRMVersion())) {
AckFinal ackFinal = new AckFinal(rmNamespaceValue);
sequenceAck.setAckFinal(ackFinal);
}
@@ -480,10 +468,8 @@
sequenceAck.toOMElement(envelope.getHeader());
if (applicationMsg.getWSAAction()==null) {
- applicationMsg.setAction(SpecSpecificConstants.getSequenceAcknowledgementAction(SandeshaUtil.getRMVersion(
- sequenceId, storageManager)));
- applicationMsg.setSOAPAction(SpecSpecificConstants.getSequenceAcknowledgementSOAPAction(SandeshaUtil
- .getRMVersion(sequenceId, storageManager)));
+ applicationMsg.setAction(SpecSpecificConstants.getSequenceAcknowledgementAction(rmBean.getRMVersion()));
+ applicationMsg.setSOAPAction(SpecSpecificConstants.getSequenceAcknowledgementSOAPAction(rmBean.getRMVersion()));
}
applicationMsg.setMessageId(SandeshaUtil.getUUID());
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Mon Jan 15 02:52:42 2007
@@ -854,28 +854,6 @@
}
}
- /**
- *
- * @param propertyKey
- * for the client side - internalSequenceID, for the server side -
- * sequenceID
- * @param configurationContext
- * @return
- * @throws SandeshaException
- */
- public static String getRMVersion(String propertyKey, StorageManager storageManager)
- throws SandeshaException {
-
- SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean specVersionBean = sequencePropertyBeanMgr.retrieve(propertyKey,
- Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
-
- if (specVersionBean == null)
- return null;
-
- return specVersionBean.getValue();
- }
-
public static String getSequenceProperty(String id, String name, StorageManager storageManager)
throws SandeshaException {
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Mon Jan 15 02:52:42 2007
@@ -125,8 +125,6 @@
storageManager.storeMessageContext(newKey, createSeqContext);
}
- nextMsgMgr.insert(rmdBean);
-
// message to invoke. This will apply for only in-order invocations.
SandeshaUtil.startSenderForTheSequence(configurationContext, sequenceId);
@@ -147,12 +145,9 @@
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
}
- SequencePropertyBean specVerionBean = new SequencePropertyBean();
- specVerionBean.setSequencePropertyKey(sequenceId);
- specVerionBean.setName(Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
- specVerionBean.setValue(specVersion);
+ rmdBean.setRMVersion(specVersion);
- seqPropMgr.insert(specVerionBean);
+ nextMsgMgr.insert(rmdBean);
// TODO get the SOAP version from the create seq message.
@@ -173,8 +168,6 @@
RMSBean rmsBean = new RMSBean();
ConfigurationContext configurationContext = firstAplicationMsgCtx.getConfigurationContext();
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
-
EndpointReference toEPR = firstAplicationMsgCtx.getTo();
String acksTo = (String) firstAplicationMsgCtx.getProperty(SandeshaClientConstants.AcksTo);
@@ -266,11 +259,7 @@
}
// setting the spec version for the client side.
- SequencePropertyBean specVerionBean = new SequencePropertyBean();
- specVerionBean.setSequencePropertyKey(sequencePropertyKey);
- specVerionBean.setName(Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION);
- specVerionBean.setValue(specVersion);
- seqPropMgr.insert(specVerionBean);
+ rmsBean.setRMVersion(specVersion);
// updating the last activated time.
rmsBean.setLastActivatedTime(System.currentTimeMillis());
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=496273&r1=496272&r2=496273
==============================================================================
--- 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 02:52:42 2007
@@ -247,7 +247,7 @@
return;
}
- RMMsgContext terminateRMMessage = RMMsgCreator.createTerminateSequenceMessage(referenceMessage, outSequenceId,
+ RMMsgContext terminateRMMessage = RMMsgCreator.createTerminateSequenceMessage(referenceMessage, rmsBean, outSequenceId,
sequencePropertyKey, storageManager);
terminateRMMessage.setFlow(MessageContext.OUT_FLOW);
terminateRMMessage.setProperty(Sandesha2Constants.APPLICATION_PROCESSING_DONE, "true");
@@ -280,9 +280,7 @@
terminateRMMessage.setReplyTo(new EndpointReference (rmsBean.getReplyToEPR()));
}
- String rmVersion = SandeshaUtil.getRMVersion(sequencePropertyKey, storageManager);
- if (rmVersion == null)
- throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
+ String rmVersion = rmsBean.getRMVersion();
terminateRMMessage.setWSAAction(SpecSpecificConstants.getTerminateSequenceAction(rmVersion));
terminateRMMessage.setSOAPAction(SpecSpecificConstants.getTerminateSequenceSOAPAction(rmVersion));
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java Mon Jan 15 02:52:42 2007
@@ -97,7 +97,7 @@
else
outSequenceID = Sandesha2Constants.TEMP_SEQUENCE_ID;
- rmVersion = SandeshaUtil.getRMVersion(getInternalSequenceID(), getStorageManager());
+ rmVersion = rmsBean.getRMVersion();
if (rmVersion == null)
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SandeshaUtilTest.java Mon Jan 15 02:52:42 2007
@@ -20,8 +20,6 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java?view=diff&rev=496273&r1=496272&r2=496273
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/SquenceOfferTest.java Mon Jan 15 02:52:42 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2;
import java.io.File;
-import java.util.ArrayList;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -27,7 +26,6 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.client.SandeshaClientConstants;
-import org.apache.sandesha2.client.SandeshaReport;
import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.util.SandeshaUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org