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 2005/05/05 09:35:17 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/storage/queue IncomingSequence.java SandeshaQueue.java
chamikara 2005/05/05 00:35:17
Modified: sandesha/src/org/apache/sandesha IStorageManager.java
sandesha/src/org/apache/sandesha/client
ClientStorageManager.java
sandesha/src/org/apache/sandesha/server
ServerStorageManager.java
sandesha/src/org/apache/sandesha/storage/dao
ISandeshaDAO.java SandeshaDatabaseDAO.java
SandeshaQueueDAO.java
sandesha/src/org/apache/sandesha/storage/queue
IncomingSequence.java SandeshaQueue.java
Log:
Storage classes were modified to store AcksTo part
Revision Changes Path
1.19 +7 -0 ws-fx/sandesha/src/org/apache/sandesha/IStorageManager.java
Index: IStorageManager.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/IStorageManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- IStorageManager.java 28 Feb 2005 13:25:56 -0000 1.18
+++ IStorageManager.java 5 May 2005 07:35:16 -0000 1.19
@@ -16,8 +16,11 @@
*/
package org.apache.sandesha;
+import java.util.Iterator;
import java.util.Map;
+import org.apache.sandesha.storage.queue.IncomingSequence;
+
/**
* @author
*/
@@ -154,5 +157,9 @@
public void setTerminateReceived(String seqId);
public String getKeyFromOutgoingSeqId(String seqId);
+
+ public void setAcksTo(String seqId,String acksTo);
+
+ public String getAcksTo(String seqId);
}
\ No newline at end of file
1.28 +10 -0 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ClientStorageManager.java 27 Apr 2005 07:08:49 -0000 1.27
+++ ClientStorageManager.java 5 May 2005 07:35:16 -0000 1.28
@@ -24,9 +24,11 @@
import org.apache.sandesha.RMMessageContext;
import org.apache.sandesha.storage.dao.ISandeshaDAO;
import org.apache.sandesha.storage.dao.SandeshaDAOFactory;
+import org.apache.sandesha.storage.queue.IncomingSequence;
import org.apache.sandesha.storage.queue.SandeshaQueue;
import org.apache.sandesha.ws.rm.RMHeaders;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -390,5 +392,13 @@
public String getKeyFromOutgoingSeqId(String seqId) {
return accessor.getKeyFromOutgoingSequenceId(seqId);
}
+
+ public void setAcksTo(String seqId,String acksTo){
+ accessor.setAcksTo(seqId,acksTo);
+ }
+
+ public String getAcksTo(String seqId){
+ return accessor.getAcksTo(seqId);
+ }
}
\ No newline at end of file
1.25 +11 -0 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ServerStorageManager.java 27 Apr 2005 07:08:50 -0000 1.24
+++ ServerStorageManager.java 5 May 2005 07:35:16 -0000 1.25
@@ -21,6 +21,7 @@
import org.apache.sandesha.Constants;
import org.apache.sandesha.IStorageManager;
import org.apache.sandesha.RMMessageContext;
+import org.apache.sandesha.client.ClientStorageManager;
import org.apache.sandesha.storage.dao.ISandeshaDAO;
import org.apache.sandesha.storage.dao.SandeshaDAOFactory;
import org.apache.sandesha.ws.rm.RMHeaders;
@@ -395,4 +396,14 @@
public String getKeyFromOutgoingSeqId(String seqId) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ public void setAcksTo(String seqId,String acksTo){
+ accessor.setAcksTo(seqId,acksTo);
+ }
+
+ public String getAcksTo(String seqId){
+ return accessor.getAcksTo(seqId);
+ }
+
+
}
\ No newline at end of file
1.9 +4 -0 ws-fx/sandesha/src/org/apache/sandesha/storage/dao/ISandeshaDAO.java
Index: ISandeshaDAO.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/dao/ISandeshaDAO.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ISandeshaDAO.java 27 Apr 2005 07:08:50 -0000 1.8
+++ ISandeshaDAO.java 5 May 2005 07:35:17 -0000 1.9
@@ -17,6 +17,7 @@
package org.apache.sandesha.storage.dao;
import org.apache.sandesha.RMMessageContext;
+import org.apache.sandesha.storage.queue.IncomingSequence;
import java.util.Iterator;
import java.util.Set;
@@ -122,4 +123,7 @@
public String getFirstCreateSequenceMsgId(String createSeqId);
+ public void setAcksTo(String seqId,String acksTo);
+
+ public String getAcksTo(String seqId);
}
\ No newline at end of file
1.9 +14 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SandeshaDatabaseDAO.java 27 Apr 2005 07:08:50 -0000 1.8
+++ SandeshaDatabaseDAO.java 5 May 2005 07:35:17 -0000 1.9
@@ -31,6 +31,20 @@
public class SandeshaDatabaseDAO implements ISandeshaDAO {
/* (non-Javadoc)
+ * @see org.apache.sandesha.storage.dao.ISandeshaDAO#getAcksTo(java.lang.String)
+ */
+ public String getAcksTo(String seqId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ /* (non-Javadoc)
+ * @see org.apache.sandesha.storage.dao.ISandeshaDAO#setAcksTo(java.lang.String, java.lang.String)
+ */
+ public void setAcksTo(String seqId, String acksTo) {
+ // TODO Auto-generated method stub
+
+ }
+ /* (non-Javadoc)
* @see org.apache.sandesha.storage.dao.ISandeshaDAO#getFirstCreateSequenceMsgId(java.lang.String)
*/
public String getFirstCreateSequenceMsgId(String createSeqId) {
1.10 +14 -0 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SandeshaQueueDAO.java 27 Apr 2005 07:08:50 -0000 1.9
+++ SandeshaQueueDAO.java 5 May 2005 07:35:17 -0000 1.10
@@ -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.storage.queue.IncomingSequence;
import org.apache.sandesha.storage.queue.QueueException;
import org.apache.sandesha.storage.queue.SandeshaQueue;
@@ -474,4 +475,17 @@
SandeshaQueue sq = SandeshaQueue.getInstance();
return sq.getFirstCreateSequenceMsgId(createSeqId);
}
+
+ public void setAcksTo(String seqId,String acksTo){
+
+ SandeshaQueue sq = SandeshaQueue.getInstance();
+ sq.setAcksTo(seqId,acksTo);
+ }
+
+ public String getAcksTo(String seqId){
+
+ SandeshaQueue sq = SandeshaQueue.getInstance();
+ return sq.getAcksTo(seqId);
+
+ }
}
1.6 +9 -1 ws-fx/sandesha/src/org/apache/sandesha/storage/queue/IncomingSequence.java
Index: IncomingSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/queue/IncomingSequence.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IncomingSequence.java 12 Apr 2005 02:15:33 -0000 1.5
+++ IncomingSequence.java 5 May 2005 07:35:17 -0000 1.6
@@ -45,8 +45,16 @@
private HashMap hash;
private boolean beingProcessedLock = false; //When true messages are
private long lastMsgNo = -1;
+ private String acksTo = null;
-
+ public void setAcksTo(String ack){
+ acksTo = ack;
+ }
+
+ public String getAcksTo(){
+ return acksTo;
+ }
+
private boolean terminateReceived = false;
public boolean isTerminateReceived() {
1.14 +41 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SandeshaQueue.java 2 May 2005 04:17:09 -0000 1.13
+++ SandeshaQueue.java 5 May 2005 07:35:17 -0000 1.14
@@ -490,8 +490,9 @@
while (it.hasNext()) {
String s = (String) it.next();
System.out.println("\n Sequence id - " + s);
+
IncomingSequence sh = (IncomingSequence) incomingMap.get(s);
-
+
Iterator it1 = sh.getAllKeys().iterator();
while (it1.hasNext()) {
Long l = (Long) it1.next();
@@ -923,6 +924,45 @@
return null;
}
+
+ public void setAcksTo(String seqId,String acksTo){
+
+ if(seqId==null){
+ System.out.println("ERROR: seq is null");
+ return;
+ }
+
+ Iterator it = incomingMap.keySet().iterator();
+
+ while(it.hasNext()){
+ String key = (String) it.next();
+ if(key.equals(seqId)){
+ IncomingSequence ics = (IncomingSequence) incomingMap.get(key);
+ if(ics!=null){
+ ics.setAcksTo(acksTo);
+ break;
+ }
+ }
+ }
+ }
+
+ public String getAcksTo(String seqId){
+
+ displayIncomingMap();
+ if(seqId==null){
+ System.out.println("ERROR: seq is null");
+ return null;
+ }
+
+ IncomingSequence ics = (IncomingSequence) incomingMap.get(seqId);
+
+ if(ics!=null){
+ return ics.getAcksTo();
+ }else {
+ System.out.println("ERROR: ics null");
+ return null;
+ }
+ }
}