Author: gatfora
Date: Sat Jan 13 03:06:01 2007
New Revision: 495870
URL: http://svn.apache.org/viewvc?view=rev&rev=495870
Log:
Move OfferedSequence, OfferedEndPoint, SoapVersion and SequenceClosed to
RMS/RMDBeans
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
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/CloseSequenceProcessor.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/storage/beans/RMSBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSequenceBean.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java?view=diff&rev=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
Sat Jan 13 03:06:01 2007
@@ -257,19 +257,10 @@
String INTERNAL_SEQUENCE_ID = "TempSequenceId";
String INCOMING_SEQUENCE_LIST = "IncomingSequenceList";
-
- String OFFERED_SEQUENCE = "OfferedSequence";
-
- String SEQUENCE_CLOSED = "SequenceClosed";
String SEQUENCE_TIMED_OUT = "SequenceTimedOut";
String SECURITY_TOKEN = "SecurityToken";
-
- String SOAP_VERSION = "SOAPVersion";
-
- String OFFERED_ENDPOINT = "OfferedEndpoint";
-
}
public interface SOAPVersion {
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Sat Jan 13 03:06:01 2007
@@ -49,7 +49,6 @@
import org.apache.sandesha2.util.AcknowledgementManager;
import org.apache.sandesha2.util.FaultManager;
import org.apache.sandesha2.util.SandeshaUtil;
-import org.apache.sandesha2.util.SequenceManager;
import org.apache.sandesha2.util.TerminateManager;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
import org.apache.sandesha2.wsrm.Nack;
@@ -180,15 +179,13 @@
}
//adding a MakeConnection for the response sequence if needed.
- String offeredSequenceId =
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
- if (offeredSequenceId!=null) {
+ if (rmsBean.getOfferedSequence() != null) {
RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
RMDBean rMDBean = rMDBeanMgr.retrieve(outSequenceId);
if (rMDBean!=null && rMDBean.isPollingMode())
-
SandeshaUtil.shedulePollingRequest(offeredSequenceId, configCtx);
+
SandeshaUtil.shedulePollingRequest(rmsBean.getOfferedSequence(), configCtx);
}
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Sat Jan 13 03:06:01 2007
@@ -39,7 +39,6 @@
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
-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.RMDBean;
@@ -480,20 +479,13 @@
CreateSequence createSequencePart = (CreateSequence)
createSeqRMMessage
.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
- SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
- RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
SenderBeanMgr retransmitterMgr =
storageManager.getSenderBeanMgr();
SequenceOffer offer = createSequencePart.getSequenceOffer();
if (offer != null) {
String offeredSequenceId =
offer.getIdentifer().getIdentifier();
- SequencePropertyBean offeredSequenceBean = new
SequencePropertyBean();
-
offeredSequenceBean.setName(Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE);
-
offeredSequenceBean.setSequencePropertyKey(sequencePropertyKey);
- offeredSequenceBean.setValue(offeredSequenceId);
-
- seqPropMgr.insert(offeredSequenceBean);
+ rmsBean.setOfferedSequence(offeredSequenceId);
}
MessageContext createSeqMsg =
createSeqRMMessage.getMessageContext();
@@ -538,7 +530,7 @@
rmsBean.setSecurityTokenData(secManager.getTokenRecoveryData(token));
}
- createSeqMgr.insert(rmsBean);
+ storageManager.getRMSBeanMgr().insert(rmsBean);
// if (createSeqMsg.getReplyTo() == null) {
// String anonymousURI =
SpecSpecificConstants.getAddressingAnonymousURI(createSeqMsg);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?view=diff&rev=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
Sat Jan 13 03:06:01 2007
@@ -39,6 +39,7 @@
import org.apache.sandesha2.security.SecurityToken;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+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.FaultManager;
@@ -88,11 +89,9 @@
FaultManager.checkForUnknownSequence(rmMsgCtx, sequenceId,
storageManager);
- SequencePropertyBean sequenceClosedBean = new
SequencePropertyBean();
- sequenceClosedBean.setSequencePropertyKey(sequencePropertyKey);
-
sequenceClosedBean.setName(Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED);
- sequenceClosedBean.setValue(Sandesha2Constants.VALUE_TRUE);
- sequencePropMgr.insert(sequenceClosedBean);
+ RMDBean rmdBean =
SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceId);
+ rmdBean.setClosed(true);
+ storageManager.getRMDBeanMgr().update(rmdBean);
RMMsgContext ackRMMsgCtx =
AcknowledgementManager.generateAckMessage(rmMsgCtx, sequencePropertyKey,
sequenceId, storageManager);
@@ -143,8 +142,6 @@
sequenceId, e.toString());
throw new SandeshaException(message, e);
}
-
-
if (log.isDebugEnabled())
log.debug("Exit:
CloseSequenceProcessor::processInMessage " + Boolean.FALSE);
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Sat Jan 13 03:06:01 2007
@@ -164,14 +164,7 @@
Endpoint endpoint = offer.getEndpoint();
if (endpoint!=null) {
// setting the OfferedEndpoint
- SequencePropertyBean
offeredEndpointBean = new SequencePropertyBean();
-
offeredEndpointBean.setName(Sandesha2Constants.SequenceProperties.OFFERED_ENDPOINT);
-
- //currently we can only serialize the
Address part of the Endpoint.
- //TODO correct this to serialize the
whole EPR.
-
offeredEndpointBean.setValue(endpoint.getEPR().getAddress());
-
offeredEndpointBean.setSequencePropertyKey(outgoingSideSequencePropertyKey);
- seqPropMgr.insert(offeredEndpointBean);
+
rMSBean.setOfferedEndPoint(endpoint.getEPR().getAddress());
}
// Store the inbound token (if any) with the
new sequence
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Sat Jan 13 03:06:01 2007
@@ -175,24 +175,19 @@
// processing for accept (offer has been sent)
Accept accept = createSeqResponsePart.getAccept();
if (accept != null) {
- // Find offered sequence from internal sequence id.
- SequencePropertyBean offeredSequenceBean =
sequencePropMgr.retrieve(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE);
// TODO this should be detected in the Fault manager.
- if (offeredSequenceBean == null) {
+ if (rmsBean.getOfferedSequence() == null) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.accptButNoSequenceOffered);
log.debug(message);
throw new SandeshaException(message);
}
- String offeredSequenceId =
offeredSequenceBean.getValue();
-
RMDBean rMDBean = new RMDBean();
EndpointReference acksToEPR =
accept.getAcksTo().getEPR();
rMDBean.setAcksToEPR(acksToEPR.getAddress());
- rMDBean.setSequenceID(offeredSequenceId);
+ rMDBean.setSequenceID(rmsBean.getOfferedSequence());
rMDBean.setNextMsgNoToProcess(1);
//Storing the referenceMessage of the sending side
sequence as the reference message
@@ -221,7 +216,7 @@
String rmSpecVersion =
createSeqResponseRMMsgCtx.getRMSpecVersion();
- SequencePropertyBean specVersionBean = new
SequencePropertyBean(offeredSequenceId,
+ SequencePropertyBean specVersionBean = new
SequencePropertyBean(rmsBean.getOfferedSequence(),
Sandesha2Constants.SequenceProperties.RM_SPEC_VERSION, rmSpecVersion);
sequencePropMgr.insert(specVersionBean);
@@ -235,7 +230,7 @@
// Store the security token for the offered sequence
if(tokenData != null) {
- SequencePropertyBean newToken = new
SequencePropertyBean(offeredSequenceId,
+ SequencePropertyBean newToken = new
SequencePropertyBean(rmsBean.getOfferedSequence(),
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN, tokenData);
sequencePropMgr.insert(newToken);
}
@@ -256,7 +251,7 @@
}
ArrayList incomingSequenceList =
SandeshaUtil.getArrayListFromString(incomingSequenceListBean.getValue());
- incomingSequenceList.add(offeredSequenceId);
+ incomingSequenceList.add(rmsBean.getOfferedSequence());
incomingSequenceListBean.setValue(incomingSequenceList.toString());
sequencePropMgr.update(incomingSequenceListBean);
}
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/SequenceProcessor.java
Sat Jan 13 03:06:01 2007
@@ -133,8 +133,16 @@
sequence.setMustUnderstand(false);
rmMsgCtx.addSOAPEnvelope();
+ RMDBeanMgr mgr = storageManager.getRMDBeanMgr();
+ RMDBean bean = mgr.retrieve(sequenceId);
+
+ if (bean == null) {
+ throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotFindSequence,
+ sequenceId));
+ }
+
// throwing a fault if the sequence is closed.
- FaultManager.checkForSequenceClosed(rmMsgCtx, sequenceId,
storageManager);
+ FaultManager.checkForSequenceClosed(rmMsgCtx, sequenceId, bean);
FaultManager.checkForLastMsgNumberExceeded(rmMsgCtx,
storageManager);
long msgNo = sequence.getMessageNumber().getMessageNumber();
@@ -146,13 +154,6 @@
}
// Pause the messages bean if not the right message to invoke.
- RMDBeanMgr mgr = storageManager.getRMDBeanMgr();
- RMDBean bean = mgr.retrieve(sequenceId);
-
- if (bean == null) {
- throw new
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotFindSequence,
- sequenceId));
- }
// updating the last activated time of the sequence.
bean.setLastActivatedTime(System.currentTimeMillis());
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
Sat Jan 13 03:06:01 2007
@@ -32,6 +32,7 @@
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
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.SequencePropertyBean;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.TerminateManager;
@@ -75,15 +76,14 @@
ConfigurationContext configContext =
msgContext.getConfigurationContext();
//shedulling a polling request for the response side.
- String offeredSequenceId =
SandeshaUtil.getSequenceProperty(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.OFFERED_SEQUENCE, storageManager);
+ RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromSequenceId(storageManager, sequenceId);
- if (offeredSequenceId!=null) {
+ if (rmsBean.getOfferedSequence()!=null) {
RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
RMDBean rMDBean = rMDBeanMgr.retrieve(sequenceId);
if (rMDBean!=null && rMDBean.isPollingMode())
-
SandeshaUtil.shedulePollingRequest(offeredSequenceId, configContext);
+
SandeshaUtil.shedulePollingRequest(rmsBean.getOfferedSequence(), configContext);
}
TerminateManager.terminateSendingSide (configContext,
sequencePropertyKey,internalSequenceID, msgContext.isServerSide(),
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java?view=diff&rev=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/RMSBean.java
Sat Jan 13 03:06:01 2007
@@ -117,6 +117,10 @@
private boolean sequenceClosedClient = false;
private String transportTo;
+
+ private String offeredEndPoint = null;
+
+ private String offeredSequence = null;
public RMSBean() {
}
@@ -250,6 +254,22 @@
this.transportTo = transportTo;
}
+ public String getOfferedEndPoint() {
+ return offeredEndPoint;
+ }
+
+ public void setOfferedEndPoint(String offeredEndPoint) {
+ this.offeredEndPoint = offeredEndPoint;
+ }
+
+ public String getOfferedSequence() {
+ return offeredSequence;
+ }
+
+ public void setOfferedSequence(String offeredSequence) {
+ this.offeredSequence = offeredSequence;
+ }
+
public String toString() {
StringBuffer result = new StringBuffer();
result.append(this.getClass().getName());
@@ -267,6 +287,8 @@
result.append("\nClosedClient : ");
result.append(sequenceClosedClient);
result.append("\nNumAckedMsgs : ");
result.append(numberOfMessagesAcked);
result.append("\nTransportTo : ");
result.append(transportTo);
+ result.append("\nOfferedEndPoint : ");
result.append(offeredEndPoint);
+ result.append("\nOfferedSequence : ");
result.append(offeredSequence);
return result.toString();
}
}
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=495870&r1=495869&r2=495870
==============================================================================
---
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
Sat Jan 13 03:06:01 2007
@@ -38,11 +38,16 @@
private String acksToEPR;
private long lastActivatedTime;
-
+
+ /**
+ * Indicates that a sequence is closed
+ */
+ private boolean closed = false;
+
/**
* Indicates that a sequence is terminated
*/
- private boolean terminated = false;
+ private boolean terminated = false;
/**
* This tells weather this sequence is in the polling mode or not.
@@ -106,6 +111,14 @@
this.pollingMode = pollingMode;
}
+ public boolean isClosed() {
+ return closed;
+ }
+
+ public void setClosed(boolean closed) {
+ this.closed = closed;
+ }
+
public boolean isTerminated() {
return terminated;
}
@@ -124,11 +137,12 @@
public String toString() {
StringBuffer result = new StringBuffer();
- result.append("\nSequence Id: "); result.append(sequenceID);
+ result.append("\nSequence Id : "); result.append(sequenceID);
result.append("\ntoEPR : "); result.append(toEPR);
result.append("\nreplyToEPR : "); result.append(replyToEPR);
result.append("\nacksToEPR : "); result.append(acksToEPR);
result.append("\nPolling : "); result.append(pollingMode);
+ result.append("\nClosed : "); result.append(closed);
result.append("\nTerminated : ");
result.append(terminated);
result.append("\nLastActivatedTime: ");
result.append(lastActivatedTime);
return result.toString();
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Sat Jan 13 03:06:01 2007
@@ -50,13 +50,10 @@
import org.apache.sandesha2.storage.StorageManager;
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.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;
-import org.apache.sandesha2.wsrm.Sequence;
import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
/**
@@ -111,7 +108,7 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForCreateSequenceRefused, refused sequence");
- getFault(createSequenceRMMsg, data, storageManager);
+ getFault(createSequenceRMMsg, data);
}
if (log.isDebugEnabled())
@@ -256,7 +253,7 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForUnknownSequence, Sequence unknown");
- getFault(rmMessageContext, data, storageManager);
+ getFault(rmMessageContext, data);
}
if (log.isDebugEnabled())
@@ -329,7 +326,7 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForInvalidAcknowledgement, invalid ACK");
- getFault(ackRMMessageContext, data,
storageManager);
+ getFault(ackRMMessageContext, data);
}
}
@@ -339,19 +336,15 @@
}
public static void checkForSequenceClosed(RMMsgContext
referenceRMMessage, String sequenceID,
- StorageManager storageManager) throws AxisFault {
+ RMDBean rmdBean) throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter: FaultManager::checkForSequenceClosed,
" + sequenceID);
MessageContext referenceMessage =
referenceRMMessage.getMessageContext();
- SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
-
boolean sequenceClosed = false;
String reason = null;
- SequencePropertyBean sequenceClosedBean =
seqPropMgr.retrieve(sequenceID,
-
Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED);
- if (sequenceClosedBean != null &&
Sandesha2Constants.VALUE_TRUE.equals(sequenceClosedBean.getValue())) {
+ if (rmdBean.isClosed()) {
sequenceClosed = true;
reason =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotAcceptMsgAsSequenceClosed,
sequenceID);
}
@@ -377,7 +370,7 @@
if (log.isDebugEnabled())
log.debug("Exit:
FaultManager::checkForSequenceClosed, sequence closed");
- getFault(referenceRMMessage, data, storageManager);
+ getFault(referenceRMMessage, data);
}
if (log.isDebugEnabled())
@@ -390,13 +383,11 @@
*
* @param referenceRMMsgContext - Message in reference to which the
fault will be generated.
* @param data - data for the fault
- * @param storageManager
* @return - The dummy fault to be thrown out.
*
* @throws AxisFault
*/
- public static void getFault (RMMsgContext referenceRMMsgContext,
FaultData data,
- StorageManager storageManager) throws AxisFault {
+ public static void getFault (RMMsgContext referenceRMMsgContext,
FaultData data) throws AxisFault {
SOAPFactory factory = (SOAPFactory)
referenceRMMsgContext.getSOAPEnvelope().getOMFactory();
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
Sat Jan 13 03:06:01 2007
@@ -458,8 +458,6 @@
id.setIndentifer(sequenceId);
sequenceAck.setIdentifier(id);
- SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
-
RMDBean rmdBean =
SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceId);
ArrayList ackRangeArrayList =
SandeshaUtil.getAckRangeArrayList(rmdBean.getServerCompletedMessages(),
rmNamespaceValue);
@@ -469,10 +467,7 @@
sequenceAck.addAcknowledgementRanges(ackRange);
}
- SequencePropertyBean sequenceClosedBean =
seqPropMgr.retrieve(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED);
-
- if (sequenceClosedBean != null &&
Sandesha2Constants.VALUE_TRUE.equals(sequenceClosedBean.getValue())) {
+ if (rmdBean.isClosed()) {
// sequence is closed. so add the 'Final' part.
if (SpecSpecificConstants.isAckFinalAllowed(rmVersion))
{
AckFinal ackFinal = new
AckFinal(rmNamespaceValue);
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
Sat Jan 13 03:06:01 2007
@@ -175,13 +175,6 @@
SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
- //setting the SOAPVersion Bean.
- String SOAPVersion =
firstAplicationMsgCtx.getOptions().getSoapVersionURI();
- SequencePropertyBean SOAPVersionBean = new SequencePropertyBean
(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.SOAP_VERSION, SOAPVersion);
-
- seqPropMgr.insert(SOAPVersionBean);
-
EndpointReference toEPR = firstAplicationMsgCtx.getTo();
String acksTo = (String)
firstAplicationMsgCtx.getProperty(SandeshaClientConstants.AcksTo);
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=495870&r1=495869&r2=495870
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Sat Jan 13 03:06:01 2007
@@ -200,10 +200,6 @@
boolean addEntryWithSequenceID = false;
- if
(propertyBean.getName().equals(Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED))
{
- addEntryWithSequenceID = true;
- }
-
if
(propertyBean.getName().equals(Sandesha2Constants.SequenceProperties.SEQUENCE_TIMED_OUT))
{
addEntryWithSequenceID = true;
}
@@ -232,9 +228,6 @@
if
(Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID.equals(name))
deleatable = false;
- if
(Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED.equals(name))
- deleatable = false;
-
if
(Sandesha2Constants.SequenceProperties.SEQUENCE_TIMED_OUT.equals(name))
deleatable = false;
@@ -300,8 +293,6 @@
if(log.isDebugEnabled())
log.debug("Enter:
TerminateManager::addTerminateSequenceMessage " + outSequenceId + ", " +
internalSequenceID);
- SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
-
RMSBean rmsBean =
SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager,
internalSequenceID);
if (rmsBean.isTerminateAdded()) {
@@ -322,11 +313,8 @@
EndpointReference toEPR = null;
- SequencePropertyBean endpointBean =
seqPropMgr.retrieve(sequencePropertyKey,
-
Sandesha2Constants.SequenceProperties.OFFERED_ENDPOINT);
- if (endpointBean!=null) {
- toEPR = new EndpointReference (endpointBean.getValue());
- }
+ if (rmsBean.getOfferedEndPoint() != null)
+ toEPR = new EndpointReference
(rmsBean.getOfferedEndPoint());
if (toEPR==null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
