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 ja...@apache.org on 2005/05/11 15:04:27 UTC
cvs commit: ws-fx/sandesha/test/org/apache/sandesha/storage TCClientStorageManager.java
jaliya 2005/05/11 06:04:27
Modified: sandesha/interop/org/apache/sandesha/samples/interop/testclient
InteropStub.java
sandesha/interop server-config.wsdd
sandesha/src/org/apache/sandesha/client
ClientStorageManager.java
sandesha/src/org/apache/sandesha/server
ServerStorageManager.java
sandesha/src/org/apache/sandesha/storage/dao
SandeshaDAOFactory.java SandeshaDatabaseDAO.java
SandeshaQueueDAO.java
sandesha/src/org/apache/sandesha/storage/queue
SandeshaQueue.java
sandesha/test/org/apache/sandesha/storage
TCClientStorageManager.java
Log:
Added the capabiliy to run both Client and Server from same VM. SandeshaQueue now has two instances of it which correspond to the two end points
Revision Changes Path
1.2 +2 -2 ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropStub.java
Index: InteropStub.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropStub.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InteropStub.java 10 May 2005 16:16:57 -0000 1.1
+++ InteropStub.java 11 May 2005 13:04:26 -0000 1.2
@@ -56,7 +56,7 @@
//call.setProperty("replyTo","http://10.10.0.4:8080/axis/services/MyService");
//http://schemas.xmlsoap.org/ws/2003/03/addressing/role/anonymous
- call.setProperty(Constants.ClientProperties.FROM,org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS);
+ call.setProperty(Constants.ClientProperties.FROM,Constants.WSA.NS_ADDRESSING_ANONYMOUS);
call.setTargetEndpointAddress(target);
call.setOperationName(new QName("RMInteropService", operation));
@@ -172,7 +172,7 @@
call.setProperty(Constants.ClientProperties.ACTION, "sandesha:echo");
//These two are additional, We need them since we need to monitor the messages using TCPMonitor.
- call.setProperty(Constants.ClientProperties.FROM,org.apache.axis.message.addressing.Constants.NS_URI_ANONYMOUS);
+ call.setProperty(Constants.ClientProperties.FROM,Constants.WSA.NS_ADDRESSING_ANONYMOUS);
call.setProperty(Constants.ClientProperties.REPLY_TO,"http://127.0.0.1:" + "9070" + "/axis/services/RMService");
1.9 +2 -2 ws-fx/sandesha/interop/server-config.wsdd
Index: server-config.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/server-config.wsdd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- server-config.wsdd 11 Apr 2005 02:58:55 -0000 1.8
+++ server-config.wsdd 11 May 2005 13:04:26 -0000 1.9
@@ -3,9 +3,9 @@
<globalConfiguration>
<parameter name="adminPassword" value="admin"/>
<parameter name="disablePrettyXML" value="true"/>
- <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
- <parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
<parameter name="sendXMLDeclaration" value="true"/>
<requestFlow>
<handler type="java:org.apache.axis.handlers.JWSHandler">
1.33 +1 -2 ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java
Index: ClientStorageManager.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/client/ClientStorageManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ClientStorageManager.java 9 May 2005 04:51:50 -0000 1.32
+++ ClientStorageManager.java 11 May 2005 13:04:26 -0000 1.33
@@ -42,7 +42,7 @@
}
public ClientStorageManager() {
- accessor = SandeshaDAOFactory.getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
+ accessor = SandeshaDAOFactory.getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR,Constants.CLIENT);
}
public boolean isSequenceExist(String sequenceID) {
@@ -212,7 +212,6 @@
sequenceId = accessor.searchForSequenceId(messageId);
- SandeshaQueue sq = SandeshaQueue.getInstance();
boolean exists = accessor.isIncomingSequenceExists(sequenceId);
if (!exists) {
1.29 +1 -1 ws-fx/sandesha/src/org/apache/sandesha/server/ServerStorageManager.java
Index: ServerStorageManager.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/ServerStorageManager.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ServerStorageManager.java 9 May 2005 04:51:50 -0000 1.28
+++ ServerStorageManager.java 11 May 2005 13:04:26 -0000 1.29
@@ -53,7 +53,7 @@
private static Callback callBack = null;
public ServerStorageManager() {
- accessor = SandeshaDAOFactory.getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
+ accessor = SandeshaDAOFactory.getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR,Constants.SERVER);
}
/**
1.4 +3 -3 ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaDAOFactory.java
Index: SandeshaDAOFactory.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaDAOFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SandeshaDAOFactory.java 28 Feb 2005 13:26:06 -0000 1.3
+++ SandeshaDAOFactory.java 11 May 2005 13:04:27 -0000 1.4
@@ -29,12 +29,12 @@
private static final Log log = LogFactory.getLog(SandeshaDAOFactory.class.getName());
- public static ISandeshaDAO getStorageAccessor(int accessor) {
+ public static ISandeshaDAO getStorageAccessor(int accessor, byte endPoint) {
if (accessor == Constants.SERVER_QUEUE_ACCESSOR)
- return new SandeshaQueueDAO();
+ return new SandeshaQueueDAO(endPoint);
else if (accessor == Constants.SERVER_DATABASE_ACCESSOR)
- return new SandeshaDatabaseDAO();
+ return new SandeshaDatabaseDAO(endPoint);
else
return null;
1.11 +4 -0 ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaDatabaseDAO.java
Index: SandeshaDatabaseDAO.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaDatabaseDAO.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SandeshaDatabaseDAO.java 7 May 2005 08:14:44 -0000 1.10
+++ SandeshaDatabaseDAO.java 11 May 2005 13:04:27 -0000 1.11
@@ -29,6 +29,10 @@
*/
public class SandeshaDatabaseDAO implements ISandeshaDAO {
+ private byte endPoint;
+ SandeshaDatabaseDAO(byte endPoint){
+ this.endPoint= endPoint;
+ }
/* (non-Javadoc)
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getAcksTo(java.lang.String)
1.12 +56 -49 ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java
Index: SandeshaQueueDAO.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/SandeshaQueueDAO.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SandeshaQueueDAO.java 7 May 2005 08:14:44 -0000 1.11
+++ SandeshaQueueDAO.java 11 May 2005 13:04:27 -0000 1.12
@@ -19,6 +19,7 @@
import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.sandesha.RMMessageContext;
+import org.apache.sandesha.Constants;
import org.apache.sandesha.storage.queue.IncomingSequence;
import org.apache.sandesha.storage.queue.QueueException;
import org.apache.sandesha.storage.queue.SandeshaQueue;
@@ -36,11 +37,17 @@
public class SandeshaQueueDAO implements ISandeshaDAO {
private static final Log log = LogFactory.getLog(SandeshaQueueDAO.class.getName());
+ private byte endPoint;
+
+ public SandeshaQueueDAO(byte endPoint){
+ this.endPoint=endPoint;
+ }
+
public boolean addIncomingSequence(String sequenceId) {
boolean result = false;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.createNewIncomingSequence(sequenceId);
result = true;
} catch (QueueException e) {
@@ -52,7 +59,7 @@
public boolean addPriorityMessage(RMMessageContext msg) {
boolean result = false;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.addPriorityMessage(msg);
} catch (QueueException e) {
log.error(e);
@@ -63,7 +70,7 @@
public RMMessageContext getNextPriorityMessageContextToSend() {
RMMessageContext msg = null;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
msg = sq.nextPriorityMessageToSend();
} catch (QueueException e) {
log.error(e);
@@ -82,7 +89,7 @@
RMMessageContext rmMessageContext) {
boolean result = false;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.addMessageToIncomingSequence(sequenceId, msgNo,
rmMessageContext);
result = true;
@@ -99,7 +106,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#isSequenceExists(java.lang.String)
*/
public boolean isIncomingSequenceExists(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
boolean exists = sq.isIncomingSequenceExists(sequenceId);
return exists;
}
@@ -110,7 +117,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getNextMsgContextToProcess(java.lang.String)
*/
public RMMessageContext getNextMsgContextToProcess(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
RMMessageContext msg = null;
try {
msg = sq.nextIncomingMessageToProcess(sequenceId);
@@ -138,7 +145,7 @@
*/
public String getRandomSeqIdToProcess() {
// TODO Auto-generated method stub
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
Vector ids = sq.nextAllSeqIdsToProcess();
int size = ids.size();
if (size <= 0)
@@ -157,7 +164,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getAllReceivedMsgNumsOfSeq(java.lang.String)
*/
public Set getAllReceivedMsgNumsOfIncomingSeq(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getAllReceivedMsgNumsOfIncomingSeq(sequenceId);
}
@@ -168,7 +175,7 @@
* java.lang.String)
*/
public boolean isIncomingMessageExists(String sequenceId, Long msgNo) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.isIncomingMessageExists(sequenceId, msgNo);
}
@@ -182,7 +189,7 @@
RMMessageContext rmMessageContext) {
boolean result = false;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.addMessageToOutgoingSequence(sequenceId, rmMessageContext);
result = true;
} catch (QueueException e) {
@@ -200,7 +207,7 @@
public boolean addOutgoingSequence(String sequenceId) {
boolean result = false;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.createNewOutgoingSequence(sequenceId);
result = true;
} catch (QueueException e) {
@@ -215,7 +222,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#isResponseSequenceExists(java.lang.String)
*/
public boolean isOutgoingSequenceExists(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
boolean exists = sq.isOutgoingSequenceExists(sequenceId);
return exists;
}
@@ -226,7 +233,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getAllReceivedMsgNumsOfResponseSeq(java.lang.String)
*/
public Set getAllReceivedMsgNumsOfOutgoingSeq(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getAllReceivedMsgNumsOfOutgoingSeq(sequenceId);
}
@@ -238,7 +245,7 @@
public RMMessageContext getNextOutgoingMsgContextToSend() {
RMMessageContext msg = null;
try {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
msg = sq.nextOutgoingMessageToSend();
} catch (QueueException e) {
log.error(e);
@@ -247,12 +254,12 @@
}
public void setOutSequence(String seqId, String outSeqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setOutSequence(seqId, outSeqId);
}
public void setOutSequenceApproved(String seqId, boolean approved) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setOutSequenceApproved(seqId, approved);
}
@@ -263,7 +270,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getSequenceOfOutSequence(java.lang.String)
*/
public String getSequenceOfOutSequence(String outsequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getSequenceOfOutSequence(outsequenceId);
}
@@ -275,7 +282,7 @@
*/
public void moveOutgoingMessageToBin(String sequenceId, Long msgNo) {
// TODO Auto-generated method stub
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.moveOutgoingMsgToBin(sequenceId, msgNo);
}
@@ -286,7 +293,7 @@
*/
public void removeCreateSequenceMsg(String messageId) {
// TODO Auto-generated method stub
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.movePriorityMsgToBin(messageId);
}
@@ -297,27 +304,27 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getNextOutgoingMessageNumber(java.lang.String)
*/
public long getNextOutgoingMessageNumber(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getNextOutgoingMessageNumber(sequenceId);
}
//Only for client.
public RMMessageContext checkForResponseMessage(String requestId, String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
RMMessageContext msg = sq.checkForResponseMessage(requestId, seqId);
return msg;
}
public boolean isRequestMessagePresent(String sequenceId, String msgId) {
// TODO Auto-generated method stub
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
boolean p = sq.isRequestMsgPresent(sequenceId, msgId);
return p;
}
public String searchForSequenceId(String messageId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
String seqId = sq.searchForSequenceId(messageId);
return seqId;
}
@@ -327,7 +334,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#markOutgoingMessageToDelete(java.lang.String, java.lang.Long)
*/
public void markOutgoingMessageToDelete(String seqId, Long msgNo) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.markOutgoingMessageToDelete(seqId, msgNo);
}
@@ -336,7 +343,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#isAckComplete(java.lang.String)
*/
public boolean compareAcksWithSequence(String sequenceId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
Vector acks = sq.getAllAckedMsgNumbers(sequenceId);
Vector outGoingMsgs = sq.getAllOutgoingMsgNumbers(sequenceId);
@@ -354,7 +361,7 @@
}
public void setResponseReceived(RMMessageContext msg) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setResponseReceived(msg);
}
@@ -362,7 +369,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#addLowPriorityMessage(org.apache.sandesha.RMMessageContext)
*/
public void addLowPriorityMessage(RMMessageContext msg) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
try {
sq.addLowPriorityMessage(msg);
} catch (QueueException e) {
@@ -376,7 +383,7 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getNextLowPriorityMessageContextToSend()
*/
public RMMessageContext getNextLowPriorityMessageContextToSend() {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
try {
return sq.getLowPriorityMessageIfAcked();
} catch (Exception e) {
@@ -387,47 +394,47 @@
}
public void setAckReceived(String seqId, long msgNo) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setAckReceived(seqId, msgNo);
}
public void addSendMsgNo(String seqId, long msgNo) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.addSendMsgNo(seqId, msgNo);
}
public boolean isSentMsg(String seqId, long msgNo) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.isSentMsg(seqId, msgNo);
}
public boolean hasLastOutgoingMsgReceived(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.hasLastOutgoingMsgReceived(seqId);
}
public long getLastOutgoingMsgNo(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getLastOutgoingMsgNo(seqId);
}
public boolean hasLastIncomingMsgReceived(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.hasLastIncomingMsgReceived(seqId);
}
public long getLastIncomingMsgNo(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getLastIncomingMsgNo(seqId);
}
public void addRequestedSequence(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.addRequestedSequence(seqId);
}
public boolean isRequestedSeqPresent(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.isRequestedSeqPresent(seqId);
}
@@ -436,66 +443,66 @@
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getKeyFromIncomingSequenceId(java.lang.String)
*/
public String getKeyFromIncomingSequenceId(String seqID) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getKeyFromIncomingSequenceId(seqID);
}
public String getKeyFromOutgoingSequenceId(String seqID) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getKeyFromOutgoingSequenceId(seqID);
}
public Iterator getAllOutgoingSequences() {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getAllOutgoingSequences();
}
public boolean isAllOutgoingTerminateSent() {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.isAllOutgoingTerminateSent();
}
public boolean isAllIncommingTerminateReceived() {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.isAllIncommingTerminateReceived();
}
public void setTerminateSend(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setTerminateSend(seqId);
}
public void setTerminateReceived(String seqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setTerminateReceived(seqId);
}
public String getFirstCreateSequenceMsgId(String createSeqId) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getFirstCreateSequenceMsgId(createSeqId);
}
public void setAcksTo(String seqId,String acksTo){
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.setAcksTo(seqId,acksTo);
}
public String getAcksTo(String seqId){
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getAcksTo(seqId);
}
public void addOffer(String msgID, String offerID) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
sq.addOffer(msgID,offerID);
}
public String getOffer(String msgID) {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(this.endPoint);
return sq.getOffer(msgID);
}
1.18 +14 -6 ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java
Index: SandeshaQueue.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/SandeshaQueue.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SandeshaQueue.java 9 May 2005 12:33:14 -0000 1.17
+++ SandeshaQueue.java 11 May 2005 13:04:27 -0000 1.18
@@ -40,7 +40,8 @@
public class SandeshaQueue {
- private static SandeshaQueue queue = null;
+ private static SandeshaQueue clientQueue = null;
+ private static SandeshaQueue serverQueue = null;
HashMap incomingMap; //In comming messages.
HashMap outgoingMap; //Response messages
ArrayList highPriorityQueue; // Acks and create seq. responses.
@@ -64,13 +65,20 @@
offerMap = new HashMap();
}
- public static SandeshaQueue getInstance() {
- if (queue == null) {
- queue = new SandeshaQueue();
+ public static SandeshaQueue getInstance(byte endPoint) {
+ if (endPoint == Constants.CLIENT) {
+ if (clientQueue == null) {
+ clientQueue = new SandeshaQueue();
+ }
+ return clientQueue;
+ } else {
+ if (serverQueue == null) {
+ serverQueue = new SandeshaQueue();
+ }
+ return serverQueue;
}
- return queue;
- }
+ }
/**
* This will not replace messages automatically.
*/
1.3 +2 -2 ws-fx/sandesha/test/org/apache/sandesha/storage/TCClientStorageManager.java
Index: TCClientStorageManager.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/test/org/apache/sandesha/storage/TCClientStorageManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TCClientStorageManager.java 1 Mar 2005 17:02:48 -0000 1.2
+++ TCClientStorageManager.java 11 May 2005 13:04:27 -0000 1.3
@@ -34,7 +34,7 @@
//tests functions related to outgoing messages.
public void testOutGoingMessages() throws QueueException {
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(Constants.CLIENT);
ClientStorageManager csm = new ClientStorageManager();
//setup and add 4 messages
@@ -224,7 +224,7 @@
protected void setUp() throws Exception {
super.setUp();
- SandeshaQueue sq = SandeshaQueue.getInstance();
+ SandeshaQueue sq = SandeshaQueue.getInstance(Constants.CLIENT);
sq.clear(true);