Author: chamikara
Date: Sun Apr 2 11:21:16 2006
New Revision: 390881
URL: http://svn.apache.org/viewcvs?rev=390881&view=rev
Log:
Changed the version from 1.0-SNAPSHOT to SNAPSHOT
Changes to the termination policy. A sequence can terminate in two ways
1. A client setting the LAST_MESSAGE property
2. A client calling the Sandesha2ClientAPI.terminateSequence() method
Added a module description
Modified:
webservices/sandesha/trunk/config/module.xml
webservices/sandesha/trunk/project.properties
webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
Modified: webservices/sandesha/trunk/config/module.xml
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/module.xml?rev=390881&r1=390880&r2=390881&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/module.xml (original)
+++ webservices/sandesha/trunk/config/module.xml Sun Apr 2 11:21:16 2006
@@ -1,5 +1,9 @@
<module name="Sandesha2-0.9" class="org.apache.sandesha2.SandeshaModule">
+ <Description>
+ This module implements WS-ReliableMessaging for Axis2. This implements
both the WSRM submitted spec and the new spec being developed under the OASIS
WSRX group.
+ </Description>
+
<inflow>
<handler name="SandeshaGlobalInHandler"
class="org.apache.sandesha2.handlers.SandeshaGlobalInHandler">
<order phase="PreDispatch" after="AddressingFinalInHandler" />
Modified: webservices/sandesha/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.properties?rev=390881&r1=390880&r2=390881&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.properties (original)
+++ webservices/sandesha/trunk/project.properties Sun Apr 2 11:21:16 2006
@@ -17,7 +17,7 @@
maven.xdoc.date = left
maven.xdoc.version = ${pom.currentVersion}
-current.version=0.91-SNAPSHOT
+current.version=SNAPSHOT
maven.html2xdoc.enabled=false
maven.html2xdoc.dir=./xdocs
axis2.version=SNAPSHOT
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java?rev=390881&r1=390880&r2=390881&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
Sun Apr 2 11:21:16 2006
@@ -277,7 +277,7 @@
String SEQUENCE_TIMED_OUT = "SequenceTimedOut";
- String LAST_MESSAGE = "LastMessage";
+// String LAST_MESSAGE = "LastMessage";
String REQUEST_SIDE_SEQUENCE_ID = "RequestSideSequenceID";
//used only at the server side
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=390881&r1=390880&r2=390881&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Sun Apr 2 11:21:16 2006
@@ -408,15 +408,15 @@
LastMessage lastMessage = (LastMessage)
sequence.getLastMessage();
- if (lastMessage!=null) {
- long messageNumber =
sequence.getMessageNumber().getMessageNumber();
- SequencePropertyBean lastMessageBean = new
SequencePropertyBean ();
- lastMessageBean.setSequenceID(sequenceId);
-
lastMessageBean.setName(Sandesha2Constants.SequenceProperties.LAST_MESSAGE);
- lastMessageBean.setValue(new
Long(messageNumber).toString());
-
- seqPropMgr.insert(lastMessageBean);
- }
+// if (lastMessage!=null) {
+// long messageNumber =
sequence.getMessageNumber().getMessageNumber();
+// SequencePropertyBean lastMessageBean = new
SequencePropertyBean ();
+// lastMessageBean.setSequenceID(sequenceId);
+//
lastMessageBean.setName(Sandesha2Constants.SequenceProperties.LAST_MESSAGE);
+// lastMessageBean.setValue(new
Long(messageNumber).toString());
+//
+// seqPropMgr.insert(lastMessageBean);
+// }
RMMsgContext ackRMMessage =
AcknowledgementManager.generateAckMessage(rmMsgCtx,sequenceId);
@@ -525,6 +525,10 @@
String to = toEPR.getAddress();
String sequenceKey = (String)
msgContext.getProperty(Sandesha2ClientAPI.SEQUENCE_KEY);
internalSequenceId =
SandeshaUtil.getInternalSequenceID(to,sequenceKey);
+
+ String lastAppMessage = (String)
msgContext.getProperty(Sandesha2ClientAPI.LAST_MESSAGE);
+ if (lastAppMessage!=null &&
"true".equals(lastAppMessage))
+ lastMessage = true;
}
/* checking weather the user has given the messageNumber (most
of the cases this will not be the case where
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java?rev=390881&r1=390880&r2=390881&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
Sun Apr 2 11:21:16 2006
@@ -172,7 +172,7 @@
boolean lastMessageNumberExceeded = false;
String reason = null;
- SequencePropertyBean lastMessageBean =
seqPropMgr.retrieve(sequenceID,Sandesha2Constants.SequenceProperties.LAST_MESSAGE);
+ SequencePropertyBean lastMessageBean =
seqPropMgr.retrieve(sequenceID,Sandesha2Constants.SequenceProperties.LAST_OUT_MESSAGE_NO);
if (lastMessageBean!=null) {
long lastMessageNo =
Long.parseLong(lastMessageBean.getValue());
if (messageNumber>lastMessageNo) {
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=390881&r1=390880&r2=390881&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
Sun Apr 2 11:21:16 2006
@@ -346,8 +346,7 @@
} catch (AxisFault e) {
String message = "Cant start the listner for incoming
messages";
log.error(e.getStackTrace());
- System.out.println(e.getStackTrace());
- throw new SandeshaException (message);
+ throw new SandeshaException (message,e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
