You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/12/10 13:46:54 UTC
svn commit: r485167 [1/2] - in /webservices/sandesha/trunk/java: ./ config/
src/org/apache/sandesha2/ src/org/apache/sandesha2/client/
src/org/apache/sandesha2/i18n/ src/org/apache/sandesha2/msgprocessors/
src/org/apache/sandesha2/polling/ src/org/apac...
Author: chamikara
Date: Sun Dec 10 04:46:51 2006
New Revision: 485167
URL: http://svn.apache.org/viewvc?view=rev&rev=485167
Log:
Some changes from 1.1
- Refactoring of the StorageManager classes
- Change to the module.xml policy prefix.
Added:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java
- copied, changed from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java
- copied, changed from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java
- copied, changed from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/NextMsgBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
- copied, changed from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java
- copied, changed from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java
- copied, changed from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
- copied, changed from r485157, webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java
- copied, changed from r485157, webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java
- copied, changed from r485157, webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java
- copied, changed from r485157, webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
Removed:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/NextMsgBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
Modified:
webservices/sandesha/trunk/java/config/module.xml
webservices/sandesha/trunk/java/project.properties
webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.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/msgprocessors/SequenceProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SenderBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.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/src/org/apache/sandesha2/workers/Invoker.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
Modified: webservices/sandesha/trunk/java/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/module.xml?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/config/module.xml (original)
+++ webservices/sandesha/trunk/java/config/module.xml Sun Dec 10 04:46:51 2006
@@ -74,43 +74,44 @@
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
- xmlns:wsrm="http://ws.apache.org/sandesha2/policy" wsu:Id="RMPolicy">
- <wsrm:RMAssertion>
+ xmlns:sandesha2="http://ws.apache.org/sandesha2/policy" wsu:Id="RMPolicy">
+ <sandesha2:RMAssertion>
<wsp:Policy>
- <wsrm:AcknowledgementInterval>3000</wsrm:AcknowledgementInterval>
+ <sandesha2:AcknowledgementInterval>3000</sandesha2:AcknowledgementInterval>
- <wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>
+ <sandesha2:RetransmissionInterval>6000</sandesha2:RetransmissionInterval>
<!-- '-1' conveys that there is no limit to the max. number of retransmissions.-->
- <wsrm:MaximumRetransmissionCount>10</wsrm:MaximumRetransmissionCount>
+ <sandesha2:MaximumRetransmissionCount>10</sandesha2:MaximumRetransmissionCount>
- <wsrm:ExponentialBackoff>false</wsrm:ExponentialBackoff>
+ <sandesha2:ExponentialBackoff>false</sandesha2:ExponentialBackoff>
- <wsrm:InactivityTimeout>60</wsrm:InactivityTimeout>
+ <sandesha2:InactivityTimeout>60</sandesha2:InactivityTimeout>
- <wsrm:InactivityTimeoutMeasure>seconds</wsrm:InactivityTimeoutMeasure>
+ <sandesha2:InactivityTimeoutMeasure>seconds</sandesha2:InactivityTimeoutMeasure>
- <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>
+ <sandesha2:InvokeInOrder>true</sandesha2:InvokeInOrder>
<!-- These will not be overriden by service level policies -->
- <wsrm:MessageTypesToDrop>none</wsrm:MessageTypesToDrop>
+ <sandesha2:MessageTypesToDrop>none</sandesha2:MessageTypesToDrop>
<!-- This will not be overriden by service level policies -->
- <wsrm:StorageManagers>
+ <sandesha2:StorageManagers>
- <wsrm:InMemoryStorageManager>
+ <sandesha2:InMemoryStorageManager>
org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
- </wsrm:InMemoryStorageManager>
+ </sandesha2:InMemoryStorageManager>
- <wsrm:PermanentStorageManager>
+ <sandesha2:PermanentStorageManager>
org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
- </wsrm:PermanentStorageManager>
+ </sandesha2:PermanentStorageManager>
- </wsrm:StorageManagers>
+ </sandesha2:StorageManagers>
<!-- This will not be overriden by service level policies -->
- <wsrm:SecurityManager>org.apache.sandesha2.security.dummy.DummySecurityManager</wsrm:SecurityManager>
+ <sandesha2:SecurityManager>org.apache.sandesha2.security.dummy.DummySecurityManager</sandesha2:SecurityManager>
</wsp:Policy>
- </wsrm:RMAssertion>
+ </sandesha2:RMAssertion>
</wsp:Policy>
+
</module>
Modified: webservices/sandesha/trunk/java/project.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.properties?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/project.properties (original)
+++ webservices/sandesha/trunk/java/project.properties Sun Dec 10 04:46:51 2006
@@ -7,10 +7,11 @@
# MAVEN CORE
##############
# comma-spearated list of remote JAR repository URLs
-maven.repo.remote=http://www.ibiblio.org/maven/,\
- http://people.apache.org/repository/,\
+maven.repo.remote=http://repo1.maven.org/maven/,\
+ http://people.apache.org/repository/,\
http://dist.codehaus.org/,\
- http://ws.zones.apache.org/repository/
+ http://ws.zones.apache.org/repository/,\
+ http://people.apache.org/repo/m1-ibiblio-rsync-repository/
# XDOC PLUGIN
###############
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/SandeshaModule.java Sun Dec 10 04:46:51 2006
@@ -63,11 +63,15 @@
SandeshaPolicyBean propertyBean = PropertyManager.loadPropertiesFromModuleDescPolicy(module,constantPropertyBean);
if (propertyBean==null) {
- String message = SandeshaMessageHelper.getMessage(
- SandeshaMessageKeys.cannotFindModulePolicies);
- log.debug(message);
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotLoadModulePolicies);
+ log.error (message);
propertyBean = PropertyManager.loadPropertiesFromDefaultValues();
+ } else {
+ if (log.isDebugEnabled()) {
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.modulePoliciesLoaded);
+ log.info (message);
+ }
}
Parameter parameter = new Parameter ();
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Sun Dec 10 04:46:51 2006
@@ -49,11 +49,11 @@
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.AcknowledgementManager;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -110,7 +110,7 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
String withinTransactionStr = (String) configurationContext.getProperty(Sandesha2Constants.WITHIN_TRANSACTION);
boolean withinTransaction = false;
@@ -129,14 +129,14 @@
sequenceReport.setInternalSequenceID(internalSequenceID);
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
+ RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceID);
- CreateSeqBean createSeqBean = createSeqMgr.findUnique(createSeqFindBean);
+ RMSBean rMSBean = createSeqMgr.findUnique(createSeqFindBean);
// if data not is available sequence has to be terminated or
// timedOut.
- if (createSeqBean == null) {
+ if (rMSBean == null) {
// check weather this is an terminated sequence.
if (isSequenceTerminated(internalSequenceID, seqPropMgr)) {
@@ -165,12 +165,12 @@
return sequenceReport;
}
- String outSequenceID = createSeqBean.getSequenceID();
+ String outSequenceID = rMSBean.getSequenceID();
if (outSequenceID == null) {
sequenceReport.setInternalSequenceID(internalSequenceID);
sequenceReport.setSequenceStatus(SequenceReport.SEQUENCE_STATUS_INITIAL);
sequenceReport.setSequenceDirection(SequenceReport.SEQUENCE_DIRECTION_OUT);
- if(createSeqBean.getSecurityTokenData() != null) sequenceReport.setSecureSequence(true);
+ if(rMSBean.getSecurityTokenData() != null) sequenceReport.setSecureSequence(true);
return sequenceReport;
}
@@ -1044,10 +1044,10 @@
return SequenceReport.SEQUENCE_STATUS_TIMED_OUT;
}
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceID);
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBean rMDBean = nextMsgMgr.retrieve(sequenceID);
- if (nextMsgBean != null) {
+ if (rMDBean != null) {
return SequenceReport.SEQUENCE_STATUS_ESTABLISHED;
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java Sun Dec 10 04:46:51 2006
@@ -264,5 +264,7 @@
public final static String couldNotSendAckRequestSeqNotFound="couldNotSendAckRequestSeqNotFound";
public final static String couldNotSendCloseResponse="couldNotSendCloseResponse";
public final static String couldNotSendCloseSeqNotFound="couldNotSendCloseSeqNotFound";
-
+
+ public final static String couldNotLoadModulePolicies = "couldNotLoadModulePolicies";
+ public final static String modulePoliciesLoaded = "modulePoliciesLoaded";
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/i18n/resource.properties Sun Dec 10 04:46:51 2006
@@ -290,3 +290,6 @@
noSecurityResults = No Security results
noSecConvTokenInPolicy = No SecureConversationToken in policy
noServicePolicy=Service policy missing
+
+couldNotLoadModulePolicies=Could not load module policies. Using default values.
+modulePoliciesLoaded=Module policies were successfully loaded
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Sun Dec 10 04:46:51 2006
@@ -39,10 +39,10 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.AcknowledgementManager;
@@ -180,10 +180,10 @@
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
if (offeredSequenceId!=null) {
- NextMsgBeanMgr nextMsgBeanMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgBeanMgr.retrieve(outSequenceId);
+ RMDBeanMgr rMDBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBean rMDBean = rMDBeanMgr.retrieve(outSequenceId);
- if (nextMsgBean!=null && nextMsgBean.isPollingMode())
+ if (rMDBean!=null && rMDBean.isPollingMode())
SandeshaUtil.shedulePollingRequest(offeredSequenceId, configCtx);
}
@@ -241,8 +241,8 @@
if (complete) {
//using create sequence message as the reference message.
-// CreateSeqBeanMgr createSeqBeanMgr = storageManager.getCreateSeqBeanMgr();
-// CreateSeqBean createSeqBean = createSeqBeanMgr.retrieve(msgId);
+// RMSBeanMgr createSeqBeanMgr = storageManager.getCreateSeqBeanMgr();
+// RMSBean createSeqBean = createSeqBeanMgr.retrieve(msgId);
//
TerminateManager.addTerminateSequenceMessage(rmMsgCtx, sequencePropertyKey, outSequenceId, sequencePropertyKey,
storageManager);
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Sun Dec 10 04:46:51 2006
@@ -39,10 +39,10 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.MsgInitializer;
@@ -503,7 +503,7 @@
.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
SequenceOffer offer = createSequencePart.getSequenceOffer();
@@ -528,16 +528,16 @@
String createSequenceMessageStoreKey = SandeshaUtil.getUUID(); // the key that will be used to store
//the create sequence message.
- CreateSeqBean createSeqBean = new CreateSeqBean();
- createSeqBean.setInternalSequenceID(internalSequenceId);
- createSeqBean.setCreateSeqMsgID(createSeqMsg.getMessageID());
- createSeqBean.setCreateSequenceMsgStoreKey(createSequenceMessageStoreKey);
+ RMSBean rMSBean = new RMSBean();
+ rMSBean.setInternalSequenceID(internalSequenceId);
+ rMSBean.setCreateSeqMsgID(createSeqMsg.getMessageID());
+ rMSBean.setCreateSequenceMsgStoreKey(createSequenceMessageStoreKey);
//cloning the message and storing it as a reference.
MessageContext clonedMessage = SandeshaUtil.cloneMessageContext(createSeqMsg);
String clonedMsgStoreKey = SandeshaUtil.getUUID();
storageManager.storeMessageContext(clonedMsgStoreKey, clonedMessage);
- createSeqBean.setReferenceMessageStoreKey(clonedMsgStoreKey);
+ rMSBean.setReferenceMessageStoreKey(clonedMsgStoreKey);
//TODO set the replyTo of CreateSeq (and others) to Anymomous if Application Msgs hv it as Anonymous.
@@ -561,10 +561,10 @@
SecurityToken token = (SecurityToken) createSeqRMMessage.getProperty(Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(token != null) {
SecurityManager secManager = SandeshaUtil.getSecurityManager(configCtx);
- createSeqBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
+ rMSBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
}
- createSeqMgr.insert(createSeqBean);
+ createSeqMgr.insert(rMSBean);
String addressingNamespaceURI = SandeshaUtil.getSequenceProperty(sequencePropertyKey,
Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE, storageManager);
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Sun Dec 10 04:46:51 2006
@@ -40,9 +40,9 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -150,12 +150,12 @@
if (offerEcepted) {
// Setting the CreateSequence table entry for the outgoing
// side.
- CreateSeqBean createSeqBean = new CreateSeqBean();
- createSeqBean.setSequenceID(offeredSequenceID);
+ RMSBean rMSBean = new RMSBean();
+ rMSBean.setSequenceID(offeredSequenceID);
String outgoingSideInternalSequenceId = SandeshaUtil
.getOutgoingSideInternalSequenceID(newSequenceId);
- createSeqBean.setInternalSequenceID(outgoingSideInternalSequenceId);
- createSeqBean.setCreateSeqMsgID(SandeshaUtil.getUUID()); // this
+ rMSBean.setInternalSequenceID(outgoingSideInternalSequenceId);
+ rMSBean.setCreateSeqMsgID(SandeshaUtil.getUUID()); // this
// is a
// dummy
// value.
@@ -163,8 +163,8 @@
String outgoingSideSequencePropertyKey = outgoingSideInternalSequenceId;
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- createSeqMgr.insert(createSeqBean);
+ RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ createSeqMgr.insert(rMSBean);
// Setting sequence properties for the outgoing sequence.
// Only will be used by the server side response path. Will
@@ -234,7 +234,7 @@
seqPropMgr.update(incomingSequenceListBean);
- //TODO add createSequenceResponse message as the referenceMessage to the NextMsgBean.
+ //TODO add createSequenceResponse message as the referenceMessage to the RMDBean.
SequencePropertyBean acksToBean = new SequencePropertyBean(newSequenceId,
@@ -300,9 +300,9 @@
return false;
}
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
+ RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setSequenceID(sequenceId);
Collection arr = createSeqMgr.find(createSeqFindBean);
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Sun Dec 10 04:46:51 2006
@@ -37,12 +37,12 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.MsgInitializer;
@@ -101,9 +101,9 @@
String createSeqMsgId = relatesTo.getValue();
SenderBeanMgr retransmitterMgr = storageManager.getRetransmitterBeanMgr();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
- CreateSeqBean createSeqBean = createSeqMgr.retrieve(createSeqMsgId);
+ RMSBean createSeqBean = createSeqMgr.retrieve(createSeqMsgId);
if (createSeqBean == null) {
String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.createSeqEntryNotFound);
log.debug(message);
@@ -178,9 +178,9 @@
sequencePropMgr.insert(acksToBean);
- NextMsgBean nextMsgBean = new NextMsgBean();
- nextMsgBean.setSequenceID(offeredSequenceId);
- nextMsgBean.setNextMsgNoToProcess(1);
+ RMDBean rMDBean = new RMDBean();
+ rMDBean.setSequenceID(offeredSequenceId);
+ rMDBean.setNextMsgNoToProcess(1);
boolean pollingMode = false;
@@ -207,16 +207,16 @@
String newMessageStoreKey = SandeshaUtil.getUUID();
storageManager.storeMessageContext(newMessageStoreKey,referenceMsg);
- nextMsgBean.setReferenceMessageKey(newMessageStoreKey);
+ rMDBean.setReferenceMessageKey(newMessageStoreKey);
- nextMsgBean.setPollingMode(pollingMode);
+ rMDBean.setPollingMode(pollingMode);
//if PollingMode is true, starting the pollingmanager.
if (pollingMode)
SandeshaUtil.startPollingManager(configCtx);
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- nextMsgMgr.insert(nextMsgBean);
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ nextMsgMgr.insert(rMDBean);
String rmSpecVersion = createSeqResponseRMMsgCtx.getRMSpecVersion();
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java Sun Dec 10 04:46:51 2006
@@ -43,11 +43,11 @@
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.AcknowledgementManager;
@@ -217,8 +217,8 @@
}
// Pause the messages bean if not the right message to invoke.
- NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean bean = mgr.retrieve(sequenceId);
+ RMDBeanMgr mgr = storageManager.getNextMsgBeanMgr();
+ RMDBean bean = mgr.retrieve(sequenceId);
if (bean == null) {
throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotFindSequence,
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java Sun Dec 10 04:46:51 2006
@@ -29,9 +29,9 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.TerminateManager;
@@ -79,10 +79,10 @@
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
if (offeredSequenceId!=null) {
- NextMsgBeanMgr nextMsgBeanMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgBeanMgr.retrieve(sequenceId);
+ RMDBeanMgr rMDBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBean rMDBean = rMDBeanMgr.retrieve(sequenceId);
- if (nextMsgBean!=null && nextMsgBean.isPollingMode())
+ if (rMDBean!=null && rMDBean.isPollingMode())
SandeshaUtil.shedulePollingRequest(offeredSequenceId, configContext);
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/polling/PollingManager.java Sun Dec 10 04:46:51 2006
@@ -33,11 +33,11 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.RMMsgCreator;
@@ -66,7 +66,7 @@
try {
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
//geting the sequences to be polled.
//if shedule contains any requests, do the earliest one.
@@ -74,11 +74,11 @@
String sequenceId = getNextSheduleEntry ();
- NextMsgBean nextMsgBean = null;
+ RMDBean nextMsgBean = null;
if (sequenceId==null) {
- NextMsgBean findBean = new NextMsgBean ();
+ RMDBean findBean = new RMDBean ();
findBean.setPollingMode(true);
List results = nextMsgMgr.find(findBean);
@@ -86,13 +86,13 @@
if (size>0) {
Random random = new Random ();
int item = random.nextInt(size);
- nextMsgBean = (NextMsgBean) results.get(item);
+ nextMsgBean = (RMDBean) results.get(item);
}
} else {
- NextMsgBean findBean = new NextMsgBean ();
+ RMDBean findBean = new RMDBean ();
findBean.setPollingMode(true);
findBean.setSequenceID(sequenceId);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java Sun Dec 10 04:46:51 2006
@@ -20,9 +20,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisModule;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.workers.SandeshaThread;
@@ -57,9 +57,9 @@
public abstract SandeshaThread getInvoker();
- public abstract CreateSeqBeanMgr getCreateSeqBeanMgr();
+ public abstract RMSBeanMgr getCreateSeqBeanMgr();
- public abstract NextMsgBeanMgr getNextMsgBeanMgr();
+ public abstract RMDBeanMgr getNextMsgBeanMgr();
public abstract SenderBeanMgr getRetransmitterBeanMgr();
Copied: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java (from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java&r1=485157&p2=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java Sun Dec 10 04:46:51 2006
@@ -22,25 +22,25 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
/**
* Used to manage NextMsg beans.
*/
-public interface NextMsgBeanMgr extends RMBeanManager {
+public interface RMDBeanMgr extends RMBeanManager {
public boolean delete(String sequenceId) throws SandeshaStorageException;
- public NextMsgBean retrieve(String sequenceId) throws SandeshaStorageException;
+ public RMDBean retrieve(String sequenceId) throws SandeshaStorageException;
- public boolean insert(NextMsgBean bean) throws SandeshaStorageException;
+ public boolean insert(RMDBean bean) throws SandeshaStorageException;
- public List find(NextMsgBean bean) throws SandeshaStorageException;
+ public List find(RMDBean bean) throws SandeshaStorageException;
- public boolean update(NextMsgBean bean) throws SandeshaStorageException;
+ public boolean update(RMDBean bean) throws SandeshaStorageException;
- public NextMsgBean findUnique (NextMsgBean bean) throws SandeshaException;
+ public RMDBean findUnique (RMDBean bean) throws SandeshaException;
public Collection retrieveAll() throws SandeshaStorageException;
}
Copied: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java (from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java&r1=485157&p2=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java Sun Dec 10 04:46:51 2006
@@ -21,25 +21,25 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
/**
* This is used to manage CreateSequence beans.
*/
-public interface CreateSeqBeanMgr extends RMBeanManager {
+public interface RMSBeanMgr extends RMBeanManager {
- public boolean insert(CreateSeqBean bean) throws SandeshaStorageException;
+ public boolean insert(RMSBean bean) throws SandeshaStorageException;
public boolean delete(String msgId) throws SandeshaStorageException;
- public CreateSeqBean retrieve(String msgId) throws SandeshaStorageException;
+ public RMSBean retrieve(String msgId) throws SandeshaStorageException;
- public boolean update(CreateSeqBean bean) throws SandeshaStorageException;
+ public boolean update(RMSBean bean) throws SandeshaStorageException;
- public List find(CreateSeqBean bean) throws SandeshaStorageException;
+ public List find(RMSBean bean) throws SandeshaStorageException;
- public CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException;
+ public RMSBean findUnique (RMSBean bean) throws SandeshaException;
}
Copied: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java (from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/NextMsgBean.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/NextMsgBean.java&r1=485157&p2=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/NextMsgBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMDBean.java Sun Dec 10 04:46:51 2006
@@ -22,7 +22,7 @@
* There is one entry for each sequence.
*/
-public class NextMsgBean extends RMBean {
+public class RMDBean extends RMBean {
private static final long serialVersionUID = -2976123838615087562L;
@@ -51,11 +51,11 @@
private String referenceMessageKey;
- public NextMsgBean() {
+ public RMDBean() {
}
- public NextMsgBean(String sequenceID, long nextNsgNo) {
+ public RMDBean(String sequenceID, long nextNsgNo) {
this.sequenceID = sequenceID;
this.nextMsgNoToProcess = nextNsgNo;
}
Copied: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java (from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java&r1=485157&p2=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java Sun Dec 10 04:46:51 2006
@@ -22,7 +22,7 @@
* There is on object of this for each sequence.
*/
-public class CreateSeqBean extends RMBean {
+public class RMSBean extends RMBean {
private static final long serialVersionUID = 7051201094510208784L;
@@ -71,7 +71,7 @@
*/
private String referenceMessageStoreKey;
- public CreateSeqBean() {
+ public RMSBean() {
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SenderBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SenderBean.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SenderBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SenderBean.java Sun Dec 10 04:46:51 2006
@@ -47,7 +47,7 @@
/**
* Comment for <code>internalSequenceID</code>
- * Please see the comment of CreateSeqBean.
+ * Please see the comment of RMSBean.
*/
private String internalSequenceID;
Copied: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java (from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java&r1=485157&p2=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java Sun Dec 10 04:46:51 2006
@@ -26,15 +26,15 @@
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.RMBean;
-public class InMemoryNextMsgBeanMgr extends InMemoryBeanMgr implements NextMsgBeanMgr {
+public class InMemoryRMDBeanMgr extends InMemoryBeanMgr implements RMDBeanMgr {
- private static final Log log = LogFactory.getLog(InMemoryNextMsgBeanMgr.class);
+ private static final Log log = LogFactory.getLog(InMemoryRMDBeanMgr.class);
- public InMemoryNextMsgBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
+ public InMemoryRMDBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.NEXT_MESSAGE);
}
@@ -42,21 +42,21 @@
return super.delete(sequenceId);
}
- public NextMsgBean retrieve(String sequenceId) throws SandeshaStorageException {
- return (NextMsgBean) super.retrieve(sequenceId);
+ public RMDBean retrieve(String sequenceId) throws SandeshaStorageException {
+ return (RMDBean) super.retrieve(sequenceId);
}
- public boolean insert(NextMsgBean bean) throws SandeshaStorageException {
+ public boolean insert(RMDBean bean) throws SandeshaStorageException {
return super.insert(bean.getSequenceID(), bean);
}
- public List find(NextMsgBean bean) throws SandeshaStorageException {
+ public List find(RMDBean bean) throws SandeshaStorageException {
return super.find(bean);
}
protected boolean match(RMBean matchInfo, RMBean candidate) {
- NextMsgBean bean = (NextMsgBean) matchInfo;
- NextMsgBean temp = (NextMsgBean) candidate;
+ RMDBean bean = (RMDBean) matchInfo;
+ RMDBean temp = (RMDBean) candidate;
boolean equal = true;
@@ -72,7 +72,7 @@
return equal;
}
- public boolean update(NextMsgBean bean) throws SandeshaStorageException {
+ public boolean update(RMDBean bean) throws SandeshaStorageException {
return super.update(bean.getSequenceID(), bean);
}
@@ -80,7 +80,7 @@
return super.find(null);
}
- public NextMsgBean findUnique(NextMsgBean bean) throws SandeshaException {
- return (NextMsgBean) super.findUnique(bean);
+ public RMDBean findUnique(RMDBean bean) throws SandeshaException {
+ return (RMDBean) super.findUnique(bean);
}
}
Copied: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java (from r485157, webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java&r1=485157&p2=webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java Sun Dec 10 04:46:51 2006
@@ -25,19 +25,19 @@
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.RMBean;
-public class InMemoryCreateSeqBeanMgr extends InMemoryBeanMgr implements CreateSeqBeanMgr {
+public class InMemoryRMSBeanMgr extends InMemoryBeanMgr implements RMSBeanMgr {
- private static final Log log = LogFactory.getLog(InMemoryCreateSeqBeanMgr.class);
+ private static final Log log = LogFactory.getLog(InMemoryRMSBeanMgr.class);
- public InMemoryCreateSeqBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
+ public InMemoryRMSBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.CREATE_SEQUECE);
}
- public boolean insert(CreateSeqBean bean) throws SandeshaStorageException {
+ public boolean insert(RMSBean bean) throws SandeshaStorageException {
return super.insert(bean.getCreateSeqMsgID(), bean);
}
@@ -45,23 +45,23 @@
return super.delete(msgId);
}
- public CreateSeqBean retrieve(String msgId) throws SandeshaStorageException {
- return (CreateSeqBean) super.retrieve(msgId);
+ public RMSBean retrieve(String msgId) throws SandeshaStorageException {
+ return (RMSBean) super.retrieve(msgId);
}
- public boolean update(CreateSeqBean bean) throws SandeshaStorageException {
+ public boolean update(RMSBean bean) throws SandeshaStorageException {
return super.update(bean.getCreateSeqMsgID(), bean);
}
- public List find(CreateSeqBean bean) throws SandeshaStorageException {
+ public List find(RMSBean bean) throws SandeshaStorageException {
return super.find(bean);
}
protected boolean match(RMBean matchInfo, RMBean candidate) {
boolean equal = true;
- CreateSeqBean bean = (CreateSeqBean) matchInfo;
- CreateSeqBean temp = (CreateSeqBean) candidate;
+ RMSBean bean = (RMSBean) matchInfo;
+ RMSBean temp = (RMSBean) candidate;
if (bean.getCreateSeqMsgID() != null
&& !bean.getCreateSeqMsgID().equals(
@@ -80,8 +80,8 @@
return equal;
}
- public CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException {
- return (CreateSeqBean) super.findUnique(bean);
+ public RMSBean findUnique (RMSBean bean) throws SandeshaException {
+ return (RMSBean) super.findUnique(bean);
}
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Sun Dec 10 04:46:51 2006
@@ -31,9 +31,9 @@
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.RMBean;
@@ -48,8 +48,8 @@
private static InMemoryStorageManager instance = null;
private final String MESSAGE_MAP_KEY = "Sandesha2MessageMap";
- private CreateSeqBeanMgr createSeqBeanMgr = null;
- private NextMsgBeanMgr nextMsgBeanMgr = null;
+ private RMSBeanMgr rMSBeanMgr = null;
+ private RMDBeanMgr rMDBeanMgr = null;
private SequencePropertyBeanMgr sequencePropertyBeanMgr = null;
private SenderBeanMgr senderBeanMgr = null;
private InvokerBeanMgr invokerBeanMgr = null;
@@ -60,8 +60,8 @@
public InMemoryStorageManager(ConfigurationContext context) {
super(context);
- this.createSeqBeanMgr = new InMemoryCreateSeqBeanMgr (this, context);
- this.nextMsgBeanMgr = new InMemoryNextMsgBeanMgr (this, context);
+ this.rMSBeanMgr = new InMemoryRMSBeanMgr (this, context);
+ this.rMDBeanMgr = new InMemoryRMDBeanMgr (this, context);
this.senderBeanMgr = new InMemorySenderBeanMgr (this, context);
this.invokerBeanMgr = new InMemoryInvokerBeanMgr (this, context);
this.sequencePropertyBeanMgr = new InMemorySequencePropertyBeanMgr (this, context);
@@ -128,12 +128,12 @@
t.enlist(bean);
}
- public CreateSeqBeanMgr getCreateSeqBeanMgr() {
- return createSeqBeanMgr;
+ public RMSBeanMgr getCreateSeqBeanMgr() {
+ return rMSBeanMgr;
}
- public NextMsgBeanMgr getNextMsgBeanMgr() {
- return nextMsgBeanMgr;
+ public RMDBeanMgr getNextMsgBeanMgr() {
+ return rMDBeanMgr;
}
public SenderBeanMgr getRetransmitterBeanMgr() {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java Sun Dec 10 04:46:51 2006
@@ -44,11 +44,11 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
import org.apache.sandesha2.wsrm.CreateSequence;
@@ -195,12 +195,12 @@
MessageContext messageContext = rmMessageContext.getMessageContext();
- CreateSeqBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr createSeqMgr = storageManager.getCreateSeqBeanMgr();
boolean validSequence = false;
// Look for an outbound sequence
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
+ RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setSequenceID(sequenceID);
Collection coll = createSeqMgr.find(createSeqFindBean);
@@ -209,14 +209,14 @@
} else {
// Look for an inbound sequence
- NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr mgr = storageManager.getNextMsgBeanMgr();
coll = mgr.retrieveAll();
Iterator it = coll.iterator();
while (it.hasNext()) {
- NextMsgBean nextMsgBean = (NextMsgBean) it.next();
- String tempId = nextMsgBean.getSequenceID();
+ RMDBean rMDBean = (RMDBean) it.next();
+ String tempId = rMDBean.getSequenceID();
if (tempId.equals(sequenceID)) {
validSequence = true;
break;
Modified: webservices/sandesha/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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Sun Dec 10 04:46:51 2006
@@ -75,7 +75,7 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
import org.apache.sandesha2.workers.SandeshaThread;
@@ -704,16 +704,16 @@
public static String getSequenceIDFromInternalSequenceID(String internalSequenceID,
StorageManager storageManager) throws SandeshaException {
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
+ RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceID);
- CreateSeqBean createSeqBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+ RMSBean rMSBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
String sequeunceID = null;
- if (createSeqBean != null &&
- createSeqBean.getSequenceID() != null &&
- !createSeqBean.getSequenceID().equals(Sandesha2Constants.TEMP_SEQUENCE_ID))
- sequeunceID = createSeqBean.getSequenceID();
+ if (rMSBean != null &&
+ rMSBean.getSequenceID() != null &&
+ !rMSBean.getSequenceID().equals(Sandesha2Constants.TEMP_SEQUENCE_ID))
+ sequeunceID = rMSBean.getSequenceID();
return sequeunceID;
}
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java Sun Dec 10 04:46:51 2006
@@ -36,9 +36,9 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.wsrm.CreateSequence;
@@ -129,8 +129,8 @@
seqPropMgr.insert(tokenBean);
}
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- nextMsgMgr.insert(new NextMsgBean(sequenceId, 1)); // 1 will be the
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ nextMsgMgr.insert(new RMDBean(sequenceId, 1)); // 1 will be the
// next
// message to invoke. This will apply for only in-order invocations.
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java Sun Dec 10 04:46:51 2006
@@ -35,14 +35,14 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
@@ -146,14 +146,14 @@
removeReceivingSideProperties(configContext, sequencePropertyKey, sequenceId, storageManager);
// removing nextMsgMgr entries
- NextMsgBeanMgr nextMsgBeanMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean findNextMsgBean = new NextMsgBean();
+ RMDBeanMgr rMDBeanMgr = storageManager.getNextMsgBeanMgr();
+ RMDBean findNextMsgBean = new RMDBean();
findNextMsgBean.setSequenceID(sequenceId);
- Collection collection = nextMsgBeanMgr.find(findNextMsgBean);
+ Collection collection = rMDBeanMgr.find(findNextMsgBean);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
- NextMsgBean nextMsgBean = (NextMsgBean) iterator.next();
- nextMsgBeanMgr.delete(nextMsgBean.getSequenceID());
+ RMDBean rMDBean = (RMDBean) iterator.next();
+ rMDBeanMgr.delete(rMDBean.getSequenceID());
}
}
@@ -280,7 +280,7 @@
SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
SenderBeanMgr retransmitterBeanMgr = storageManager.getRetransmitterBeanMgr();
- CreateSeqBeanMgr createSeqBeanMgr = storageManager.getCreateSeqBeanMgr();
+ RMSBeanMgr rMSBeanMgr = storageManager.getCreateSeqBeanMgr();
// removing retransmitterMgr entries and corresponding message contexts.
Collection collection = retransmitterBeanMgr.find(internalSequenceId);
@@ -294,13 +294,13 @@
}
// removing the createSeqMgrEntry
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
+ RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceId);
- CreateSeqBean createSeqBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
- createSeqBeanMgr.delete(createSeqBean.getCreateSeqMsgID());
+ RMSBean rMSBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+ rMSBeanMgr.delete(rMSBean.getCreateSeqMsgID());
- String outSequenceID = createSeqBean.getSequenceID();
+ String outSequenceID = rMSBean.getSequenceID();
// removing sequence properties
SequencePropertyBean findSequencePropertyBean1 = new SequencePropertyBean();
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=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/WSRMMessageSender.java Sun Dec 10 04:46:51 2006
@@ -34,7 +34,7 @@
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.SenderBean;
public class WSRMMessageSender {
@@ -77,12 +77,12 @@
outSequenceID = null;
// Get the Create sequence bean with the matching internal sequenceid
- CreateSeqBean createSeqFindBean = new CreateSeqBean();
+ RMSBean createSeqFindBean = new RMSBean();
createSeqFindBean.setInternalSequenceID(internalSequenceID);
- CreateSeqBean createSeqBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
+ RMSBean rMSBean = storageManager.getCreateSeqBeanMgr().findUnique(createSeqFindBean);
- if (createSeqBean == null)
+ if (rMSBean == null)
{
if (log.isDebugEnabled())
log.debug("Exit: WSRMParentProcessor::setupOutMessage Sequence doesn't exist");
@@ -91,10 +91,10 @@
SandeshaMessageKeys.couldNotSendTerminateSeqNotFound, internalSequenceID));
}
- if (createSeqBean.getSequenceID() != null)
+ if (rMSBean.getSequenceID() != null)
{
sequenceExists = true;
- outSequenceID = createSeqBean.getSequenceID();
+ outSequenceID = rMSBean.getSequenceID();
}
else
outSequenceID = Sandesha2Constants.TEMP_SEQUENCE_ID;
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java Sun Dec 10 04:46:51 2006
@@ -31,10 +31,10 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.Range;
import org.apache.sandesha2.util.RangeString;
@@ -76,14 +76,14 @@
InvokerBeanMgr storageMapMgr = storageManager
.getStorageMapBeanMgr();
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceID);
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBean rMDBean = nextMsgMgr.retrieve(sequenceID);
- if (nextMsgBean != null) {
+ if (rMDBean != null) {
//The outOfOrder window is the set of known sequence messages (including those
//that are missing) at the time the button is pressed.
- long firstMessageInOutOfOrderWindow = nextMsgBean.getNextMsgNoToProcess();
+ long firstMessageInOutOfOrderWindow = rMDBean.getNextMsgNoToProcess();
Iterator stMapIt =
storageMapMgr.find(new InvokerBean(null, 0, sequenceID)).iterator();
@@ -123,8 +123,8 @@
//if necessary, update the "next message number" bean under this transaction
if(msgNumber>highestMsgNumberInvoked){
highestMsgNumberInvoked = invoker.getMsgNo();
- nextMsgBean.setNextMsgNoToProcess(highestMsgNumberInvoked+1);
- nextMsgMgr.update(nextMsgBean);
+ rMDBean.setNextMsgNoToProcess(highestMsgNumberInvoked+1);
+ nextMsgMgr.update(rMDBean);
if(allowLaterDeliveryOfMissingMessages){
//we also need to update the sequence OUT_OF_ORDER_RANGES property
@@ -234,7 +234,7 @@
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(context, context
.getAxisConfiguration());
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
InvokerBeanMgr storageMapMgr = storageManager
.getStorageMapBeanMgr();
@@ -268,7 +268,7 @@
String sequenceId = (String) allSequencesList.get(nextIndex++);
log.debug("Chose sequence " + sequenceId);
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceId);
+ RMDBean nextMsgBean = nextMsgMgr.retrieve(sequenceId);
if (nextMsgBean == null) {
String message = "Next message not set correctly. Removing invalid entry.";
log.debug(message);
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/InvokerWorker.java Sun Dec 10 04:46:51 2006
@@ -13,9 +13,9 @@
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.TerminateManager;
@@ -45,7 +45,7 @@
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext,configurationContext.getAxisConfiguration());
InvokerBeanMgr invokerBeanMgr = storageManager.getStorageMapBeanMgr();
- NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
+ RMDBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
//starting a transaction
transaction = storageManager.getTransaction();
@@ -140,8 +140,8 @@
// updating the next msg to invoke
String s = invokerBean.getSequenceID();
- NextMsgBean nextMsgBean = nextMsgMgr.retrieve(sequenceId);
- long nextMsgNo = nextMsgBean.getNextMsgNoToProcess();
+ RMDBean rMDBean = nextMsgMgr.retrieve(sequenceId);
+ long nextMsgNo = rMDBean.getNextMsgNoToProcess();
if (!(messageNo==nextMsgNo)) {
String message = "Operated message number is different from the Next Message Number to invoke";
@@ -150,8 +150,8 @@
if (invoked) {
nextMsgNo++;
- nextMsgBean.setNextMsgNoToProcess(nextMsgNo);
- nextMsgMgr.update(nextMsgBean);
+ rMDBean.setNextMsgNoToProcess(nextMsgNo);
+ nextMsgMgr.update(rMDBean);
}
}
} catch (SandeshaStorageException e) {
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/AckRequested.java Sun Dec 10 04:46:51 2006
@@ -26,6 +26,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
@@ -116,6 +117,12 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
toOMElement(header);
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/MessagePending.java Sun Dec 10 04:46:51 2006
@@ -24,6 +24,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.Constants;
@@ -48,6 +49,11 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new QName(namespaceValue,
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/Sequence.java Sun Dec 10 04:46:51 2006
@@ -147,6 +147,11 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
+ if (header==null) {
+ SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new QName(namespaceValue,
Sandesha2Constants.WSRM_COMMON.SEQUENCE));
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Sun Dec 10 04:46:51 2006
@@ -28,6 +28,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Sandesha2Constants;
@@ -243,6 +244,12 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
SOAPHeader header = envelope.getHeader();
+
+ if (header==null) {
+ SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
toOMElement(header);
}
Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java?view=diff&rev=485167&r1=485166&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java Sun Dec 10 04:46:51 2006
@@ -93,6 +93,11 @@
public void toSOAPEnvelope(SOAPEnvelope envelope) throws SandeshaException {
SOAPHeader header = envelope.getHeader();
+ if (header==null) {
+ SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
+ header = factory.createSOAPHeader(envelope);
+ }
+
//detach if already exist.
OMElement elem = header.getFirstChildWithName(new QName(
namespaceValue, Sandesha2Constants.WSRM_COMMON.USES_SEQUENCE_STR));
Copied: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java (from r485157, webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java&r1=485157&p2=webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java Sun Dec 10 04:46:51 2006
@@ -29,13 +29,13 @@
import java.util.Iterator;
-public class StorageMapBeanMgrTest extends SandeshaTestCase {
+public class InvokerBeanMgrTest extends SandeshaTestCase {
InvokerBeanMgr mgr;
Transaction transaction;
- public StorageMapBeanMgrTest() {
- super ("StorageMapBeanMgrTest");
+ public InvokerBeanMgrTest() {
+ super ("InvokerBeanMgrTest");
}
public void setUp() throws Exception {
Copied: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java (from r485157, webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java?view=diff&rev=485167&p1=webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java&r1=485157&p2=webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java&r2=485167
==============================================================================
--- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java Sun Dec 10 04:46:51 2006
@@ -17,8 +17,8 @@
package org.apache.sandesha2.storage;
import org.apache.sandesha2.policy.SandeshaPolicyBean;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.Sandesha2Constants;
@@ -29,12 +29,12 @@
import java.util.Iterator;
-public class NextMsgBeanMgrTest extends SandeshaTestCase {
+public class RMDBeanMgrTest extends SandeshaTestCase {
- private NextMsgBeanMgr mgr;
+ private RMDBeanMgr mgr;
Transaction transaction;
- public NextMsgBeanMgrTest(String name) {
+ public RMDBeanMgrTest(String name) {
super(name);
}
@@ -63,52 +63,52 @@
}
public void testDelete() throws SandeshaStorageException{
- mgr.insert(new NextMsgBean("SeqId1", 1001));
+ mgr.insert(new RMDBean("SeqId1", 1001));
mgr.delete("SeqId1");
assertNull(mgr.retrieve("SeqId1"));
}
public void testFind() throws SandeshaStorageException {
- mgr.insert(new NextMsgBean("SeqId2", 1002));
- mgr.insert(new NextMsgBean("SeqId3", 1002));
+ mgr.insert(new RMDBean("SeqId2", 1002));
+ mgr.insert(new RMDBean("SeqId3", 1002));
- NextMsgBean target = new NextMsgBean();
+ RMDBean target = new RMDBean();
target.setNextMsgNoToProcess(1002);
Iterator iterator = mgr.find(target).iterator();
- NextMsgBean tmp = (NextMsgBean) iterator.next();
+ RMDBean tmp = (RMDBean) iterator.next();
if (tmp.getSequenceID().equals("SeqId2")) {
- tmp = (NextMsgBean) iterator.next();
+ tmp = (RMDBean) iterator.next();
tmp.getSequenceID().equals("SeqId3");
} else {
- tmp = (NextMsgBean) iterator.next();
+ tmp = (RMDBean) iterator.next();
tmp.getSequenceID().equals("SeqId2");
}
}
public void testInsert() throws SandeshaStorageException {
- NextMsgBean bean = new NextMsgBean("SeqId4", 1004);
+ RMDBean bean = new RMDBean("SeqId4", 1004);
mgr.insert(bean);
- NextMsgBean tmp = mgr.retrieve("SeqId4");
+ RMDBean tmp = mgr.retrieve("SeqId4");
assertTrue(tmp.getNextMsgNoToProcess() == 1004);
}
public void testRetrieve() throws SandeshaStorageException {
assertNull(mgr.retrieve("SeqId5"));
- mgr.insert(new NextMsgBean("SeqId5", 1005));
+ mgr.insert(new RMDBean("SeqId5", 1005));
- NextMsgBean tmp = mgr.retrieve("SeqId5");
+ RMDBean tmp = mgr.retrieve("SeqId5");
assertTrue(tmp.getNextMsgNoToProcess() == 1005);
}
public void testUpdate() throws SandeshaStorageException {
- NextMsgBean bean = new NextMsgBean("SeqId6", 1006);
+ RMDBean bean = new RMDBean("SeqId6", 1006);
mgr.insert(bean);
bean.setNextMsgNoToProcess(1007);
mgr.update(bean);
- NextMsgBean tmp = mgr.retrieve("SeqId6");
+ RMDBean tmp = mgr.retrieve("SeqId6");
assertTrue(tmp.getNextMsgNoToProcess() ==1007);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org