Author: gatfora
Date: Mon Jan 15 04:28:17 2007
New Revision: 496292
URL: http://svn.apache.org/viewvc?view=rev&rev=496292
Log:
Remove allSequences property
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.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/util/TerminateManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SandeshaThread.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=496292&r1=496291&r2=496292
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/Sandesha2Constants.java
Mon Jan 15 04:28:17 2007
@@ -245,16 +245,6 @@
int MAX_MSG_PART_ID = 18;
}
- public interface SequenceProperties {
-
- String ALL_SEQUENCES = "AllSequences"; //this is not a sequence
-
// property. This is used as the
-
// sequenceId to share data b/w
-
// sequences
-
- String INCOMING_SEQUENCE_LIST = "IncomingSequenceList";
- }
-
public interface SOAPVersion {
int v1_1 = 1;
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=496292&r1=496291&r2=496292
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Mon Jan 15 04:28:17 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2.msgprocessors;
-import java.util.ArrayList;
import java.util.Collection;
import org.apache.axiom.om.OMElement;
@@ -40,10 +39,8 @@
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.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.FaultManager;
import org.apache.sandesha2.util.RMMsgCreator;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -97,7 +94,6 @@
}
MessageContext outMessage = null;
- SequencePropertyBeanMgr seqPropMgr =
storageManager.getSequencePropertyBeanMgr();
// Create the new sequence id, as well as establishing the
beans that handle the
// sequence state.
@@ -168,27 +164,7 @@
createSeqResponse.addSOAPEnvelope();
}
}
-
- // Add this sequence to the list of inbound sequences
- SequencePropertyBean incomingSequenceListBean =
seqPropMgr.retrieve(
-
Sandesha2Constants.SequenceProperties.ALL_SEQUENCES,
-
Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
-
- if (incomingSequenceListBean == null) {
- incomingSequenceListBean = new SequencePropertyBean();
-
incomingSequenceListBean.setSequencePropertyKey(Sandesha2Constants.SequenceProperties.ALL_SEQUENCES);
-
incomingSequenceListBean.setName(Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
- incomingSequenceListBean.setValue(null);
-
- // this get inserted before
- seqPropMgr.insert(incomingSequenceListBean);
- }
-
- ArrayList incomingSequenceList =
SandeshaUtil.getArrayListFromString(incomingSequenceListBean.getValue());
- incomingSequenceList.add(rmdBean.getSequenceID());
-
incomingSequenceListBean.setValue(incomingSequenceList.toString());
- seqPropMgr.update(incomingSequenceListBean);
-
+
//TODO add createSequenceResponse message as the
referenceMessage to the RMDBean.
outMessage.setResponseWritten(true);
@@ -257,7 +233,7 @@
return true;
}
- public boolean processOutMessage(RMMsgContext rmMsgCtx) throws
SandeshaException {
+ public boolean processOutMessage(RMMsgContext rmMsgCtx) {
if (log.isDebugEnabled())
log.debug("Enter:
CreateSeqMsgProcessor::processOutMessage");
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=496292&r1=496291&r2=496292
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Mon Jan 15 04:28:17 2007
@@ -41,11 +41,9 @@
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.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;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.util.SpecSpecificConstants;
@@ -155,8 +153,6 @@
// deleting the create sequence entry.
retransmitterMgr.delete(createSeqMsgId);
-
- SequencePropertyBeanMgr sequencePropMgr =
storageManager.getSequencePropertyBeanMgr();
// processing for accept (offer has been sent)
Accept accept = createSeqResponsePart.getAccept();
@@ -214,26 +210,6 @@
rMDBean.setSecurityTokenData(rmsBean.getSecurityTokenData());
rmdBeanMgr.insert(rMDBean);
-
- // Add the offered sequence into the inbound sequences
list
- SequencePropertyBean incomingSequenceListBean =
sequencePropMgr.retrieve(
-
Sandesha2Constants.SequenceProperties.ALL_SEQUENCES,
-
Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
-
- if (incomingSequenceListBean == null) {
- incomingSequenceListBean = new
SequencePropertyBean();
-
incomingSequenceListBean.setSequencePropertyKey(Sandesha2Constants.SequenceProperties.ALL_SEQUENCES);
-
incomingSequenceListBean.setName(Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
- incomingSequenceListBean.setValue(null);
-
- // this get inserted before
-
sequencePropMgr.insert(incomingSequenceListBean);
- }
-
- ArrayList incomingSequenceList =
SandeshaUtil.getArrayListFromString(incomingSequenceListBean.getValue());
- incomingSequenceList.add(rmsBean.getOfferedSequence());
-
incomingSequenceListBean.setValue(incomingSequenceList.toString());
- sequencePropMgr.update(incomingSequenceListBean);
}
SenderBean target = new SenderBean();
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=496292&r1=496291&r2=496292
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
Mon Jan 15 04:28:17 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2.util;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -141,8 +140,6 @@
*/
private static void
completeTerminationOfReceivingSide(ConfigurationContext configContext, String
sequencePropertyKey,String sequenceId,
StorageManager storageManager) throws SandeshaException
{
-
- removeReceivingSideProperties(configContext,
sequencePropertyKey, sequenceId, storageManager);
// removing nextMsgMgr entries
RMDBeanMgr rMDBeanMgr = storageManager.getRMDBeanMgr();
@@ -155,25 +152,6 @@
rMDBeanMgr.delete(rMDBean.getSequenceID());
}
- }
-
- private static void removeReceivingSideProperties(ConfigurationContext
configContext, String sequencePropertyKey,
- String sequenceId, StorageManager storageManager)
throws SandeshaException {
- SequencePropertyBeanMgr sequencePropertyBeanMgr =
storageManager.getSequencePropertyBeanMgr();
- SequencePropertyBean allSequenceBean =
sequencePropertyBeanMgr.retrieve(
-
Sandesha2Constants.SequenceProperties.ALL_SEQUENCES,
-
Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
-
- if (allSequenceBean != null) {
- log.debug("AllSequence bean is null");
-
- ArrayList allSequenceList =
SandeshaUtil.getArrayListFromString(allSequenceBean.getValue());
- allSequenceList.remove(sequenceId);
-
- // updating
- allSequenceBean.setValue(allSequenceList.toString());
- sequencePropertyBeanMgr.update(allSequenceBean);
- }
}
/**
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=496292&r1=496291&r2=496292
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
Mon Jan 15 04:28:17 2007
@@ -32,10 +32,8 @@
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
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.RMDBean;
-import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.util.Range;
import org.apache.sandesha2.util.RangeString;
import org.apache.sandesha2.util.SandeshaUtil;
@@ -240,27 +238,10 @@
InvokerBeanMgr storageMapMgr = storageManager
.getInvokerBeanMgr();
- SequencePropertyBeanMgr sequencePropMgr =
storageManager
- .getSequencePropertyBeanMgr();
-
transaction = storageManager.getTransaction();
-
- // Getting the incomingSequenceIdList
- SequencePropertyBean allSequencesBean =
sequencePropMgr
- .retrieve(
-
Sandesha2Constants.SequenceProperties.ALL_SEQUENCES,
-
Sandesha2Constants.SequenceProperties.INCOMING_SEQUENCE_LIST);
-
- if (allSequencesBean == null) {
- if (log.isDebugEnabled())
- log.debug("AllSequencesBean not
found");
- sleep = true;
- continue;
- }
// Pick a sequence using a round-robin approach
- ArrayList allSequencesList = SandeshaUtil
-
.getArrayListFromString(allSequencesBean.getValue());
+ ArrayList allSequencesList = getSequences();
int size = allSequencesList.size();
log.debug("Choosing one from " + size + "
sequences");
if(nextIndex >= size) {
@@ -282,11 +263,8 @@
String message = "Next message not set
correctly. Removing invalid entry.";
log.debug(message);
- allSequencesList.remove(nextIndex - 1);
-
- // cleaning the invalid data of the all
sequences.
-
allSequencesBean.setValue(allSequencesList.toString());
-
sequencePropMgr.update(allSequencesBean);
+ stopThreadForSequence(sequenceId);
+ allSequencesList = getSequences();
if (allSequencesList.size() == 0)
sleep = true;
continue;
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SandeshaThread.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SandeshaThread.java?view=diff&rev=496292&r1=496291&r2=496292
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SandeshaThread.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SandeshaThread.java
Mon Jan 15 04:28:17 2007
@@ -148,6 +148,10 @@
super.start();
}
}
+
+ public synchronized ArrayList getSequences() {
+ return workingSequences;
+ }
protected synchronized boolean hasStoppedRunning() {
return hasStoppedRunning;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
