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 2004/10/20 12:40:57 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/server ServerStorageManager.java
jaliya 2004/10/20 03:40:57
Modified: sandesha/src/org/apache/sandesha/server
ServerStorageManager.java
Log:
Two methods were added to replace the insertRequestMessage and insertResponseMessage funtionality.
Now all the messages are handled depending on whether they are incoming or outgong messages.
insertIncomingMessage(RMMessageContext rmMessageContext)
insertOutgoingMessage(RMMessageContext rmMessageContext)
Revision Changes Path
1.7 +51 -83 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerStorageManager.java 11 Oct 2004 10:58:37 -0000 1.6
+++ ServerStorageManager.java 20 Oct 2004 10:40:57 -0000 1.7
@@ -85,58 +85,6 @@
}
/**
- * This will insert the message to the sequence in the InqQueue identified
- * by sequenceId. If sequence is not present will create a new one.
- */
- public void insertRequestMessage(RMMessageContext rmMessageContext) {
-
- IServerDAO accessor = ServerDAOFactory
- .getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
-
- //No need to use this property
- //RMHeaders rmHeaders =
- // (RMHeaders) rmMessageContext.getMsgContext().getProperty(
- // org.apache.sandesha.Constants.ENV_RM_REQUEST_HEADERS);
-
- RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
-
- String sequenceId = rmHeaders.getSequence().getIdentifier()
- .getIdentifier();
-
- boolean exists = accessor.isIncomingSequenceExists(sequenceId);
-
- if (!exists)
- addSequence(sequenceId); //Creating new sequence
-
- //TODO: add getRmHeaders method to MessageContext
- long messageNumber = rmHeaders.getSequence().getMessageNumber()
- .getMessageNumber();
-
- if (messageNumber <= 0)
- return; //TODO: throw some exception
-
- Long msgNo = new Long(messageNumber);
- accessor.addMessageToIncomingSequence(sequenceId, msgNo,
- rmMessageContext);
- }
-
- public void insertResponseMessage(RMMessageContext msg) {
- IServerDAO accessor = ServerDAOFactory
- .getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
- String sequenceId = msg.getSequenceID();
- //RMHeaders rmHeaders =msg.getRMHeaders();
- //String sequenceId =
- // rmHeaders.getSequence().getIdentifier().getIdentifier();
-
- boolean exists = accessor.isOutgoingSequenceExists(sequenceId);
- if (!exists)
- accessor.addOutgoingSequence(sequenceId);
-
- accessor.addMessageToOutgoingSequence(sequenceId, msg);
-
- }
-
- /**
* Used to find out weather the sequence with this id has already been
* created.
*/
@@ -272,29 +220,6 @@
/*
* (non-Javadoc)
*
- * @see org.apache.sandesha.IStorageManager#getNextResponseMessageToSend()
- */
- /*
- * public RMMessageContext getNextResponseMessageToSend() { // TODO
- * Auto-generated method stub return null; }
- */
-
- //Simple method to sort an object array.
- /*
- * private Object[] sortObjArray(Object[] objs){
- *
- * Object temp; for(int i=0;i <objs.length;i++){ for(int j=(i+1);j
- * <objs.length;j++){ long l1 = ((Long) objs[i]).longValue(); long l2 =
- * ((Long) objs[j]).longValue();
- *
- * if(l1>l2){ //swaping temp=objs[i]; objs[i]=objs[j]; objs[j]=temp; } } }
- *
- * return objs; }
- */
-
- /*
- * (non-Javadoc)
- *
* @see org.apache.sandesha.IStorageManager#setOutSequence(java.lang.String,
* java.lang.String)
*/
@@ -315,11 +240,9 @@
String sequenceID = accessor.getSequenceOfOutSequence(oldOutsequenceId);
if (sequenceID == null) {
- // System.out.println("REOVING REMOVING REMOVING REMO "
- // +oldOutsequenceId);
+
return false;
}
- System.out.println("REOVING REMOVING " + oldOutsequenceId);
accessor.setOutSequence(sequenceID, newOutSequenceId);
accessor.setOutSequenceApproved(sequenceID, true);
@@ -328,15 +251,60 @@
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.sandesha.IStorageManager#getNextMessageNumber(java.lang.String)
- */
public long getNextMessageNumber(String sequenceID) {
IServerDAO accessor = ServerDAOFactory
.getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
long l = accessor.getNextOutgoingMessageNumber(sequenceID);
return l;
+ }
+
+ public void insertClientRequestMessage(RMMessageContext rmMessageContext) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void insertOutgoingMessage(RMMessageContext msg) {
+ IServerDAO accessor = ServerDAOFactory
+ .getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
+ String sequenceId = msg.getSequenceID();
+
+ boolean exists = accessor.isOutgoingSequenceExists(sequenceId);
+ if (!exists)
+ accessor.addOutgoingSequence(sequenceId);
+
+ accessor.addMessageToOutgoingSequence(sequenceId, msg);
+
+ }
+
+ public void insertIncomingMessage(RMMessageContext rmMessageContext) {
+ IServerDAO accessor = ServerDAOFactory
+ .getStorageAccessor(Constants.SERVER_QUEUE_ACCESSOR);
+
+ //No need to use this property
+ //RMHeaders rmHeaders =
+ // (RMHeaders) rmMessageContext.getMsgContext().getProperty(
+ // org.apache.sandesha.Constants.ENV_RM_REQUEST_HEADERS);
+
+ RMHeaders rmHeaders = rmMessageContext.getRMHeaders();
+
+ String sequenceId = rmHeaders.getSequence().getIdentifier()
+ .getIdentifier();
+
+ boolean exists = accessor.isIncomingSequenceExists(sequenceId);
+
+ if (!exists)
+ addSequence(sequenceId); //Creating new sequence
+
+ //TODO: add getRmHeaders method to MessageContext
+ long messageNumber = rmHeaders.getSequence().getMessageNumber()
+ .getMessageNumber();
+
+ if (messageNumber <= 0)
+ return; //TODO: throw some exception
+
+ Long msgNo = new Long(messageNumber);
+ accessor.addMessageToIncomingSequence(sequenceId, msgNo,
+ rmMessageContext);
+
}
}