Author: chamikara
Date: Sat Nov 26 00:41:04 2005
New Revision: 349098
URL: http://svn.apache.org/viewcvs?rev=349098&view=rev
Log:
Ability to set in-order invocation in the sandesha2.properties file.
Modified:
webservices/sandesha/trunk/config/sandesha2.properties
webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java
Modified: webservices/sandesha/trunk/config/sandesha2.properties
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/sandesha2.properties?rev=349098&r1=349097&r2=349098&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/sandesha2.properties (original)
+++ webservices/sandesha/trunk/config/sandesha2.properties Sat Nov 26 00:41:04
2005
@@ -9,4 +9,8 @@
#Storage Manager Class
#----------------------
-StorageManager=org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
\ No newline at end of file
+StorageManager=org.apache.sandesha2.storage.inmemory.InMemoryStorageManager
+
+#Delivery Assurance
+#-------------------
+InvokeInOrder=true
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java?rev=349098&r1=349097&r2=349098&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java Sat Nov
26 00:41:04 2005
@@ -301,6 +301,8 @@
String StorageManager = "StorageManager";
+ String InOrderInvocation = "InvokeInOrder";
+
public interface DefaultValues {
int RetransmissionInterval = 20000;
@@ -314,6 +316,8 @@
String InactivityTimeoutMeasure = "seconds"; //this
can be - seconds,minutes,hours,days
String StorageManager =
"org.apache.sandesha2.storage.inmemory.InMemoryStorageManager";
+
+ boolean InvokeInOrder = true;
}
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java?rev=349098&r1=349097&r2=349098&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/TerminateManager.java
Sat Nov 26 00:41:04 2005
@@ -33,6 +33,7 @@
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
import org.apache.sandesha2.storage.beans.InvokerBean;
+import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
/**
@@ -67,7 +68,8 @@
nextMsgBeanMgr.delete(nextMsgBean.getSequenceId());
}
-
if(Constants.QOS.DeliveryAssurance.DEFAULT_DELIVERY_ASSURANCE!=Constants.QOS.DeliveryAssurance.IN_ORDER)
{
+ boolean inOrderInvocation =
PropertyManager.getInstance().isInOrderInvocation();
+ if(inOrderInvocation) {
terminateAfterInvocation(configContext,sequenceID);
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=349098&r1=349097&r2=349098&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
Sat Nov 26 00:41:04 2005
@@ -53,9 +53,7 @@
}
public void invoke(MessageContext msgCtx) throws AxisFault {
-
- //try {
-
+
ConfigurationContext context = msgCtx.getSystemContext();
if (context == null)
throw new AxisFault("ConfigurationContext is null");
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=349098&r1=349097&r2=349098&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Sat Nov 26 00:41:04 2005
@@ -161,7 +161,8 @@
//FIXME - fix delivery assurances for the client side
if (msgCtx.isServerSide()) {
- if
(Constants.QOS.DeliveryAssurance.DEFAULT_DELIVERY_ASSURANCE ==
Constants.QOS.DeliveryAssurance.IN_ORDER) {
+ boolean inOrderInvocation =
PropertyManager.getInstance().isInOrderInvocation();
+ if (inOrderInvocation) {
//pause the message
msgCtx.setPausedTrue(new
QName(Constants.IN_HANDLER_NAME));
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java?rev=349098&r1=349097&r2=349098&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
Sat Nov 26 00:41:04 2005
@@ -79,6 +79,7 @@
loadAcknowledgementInterval(properties);
loadInactivityTimeout(properties);
loadStoragemanagerClass(properties);
+ loadInOrderInvocation (properties);
}
@@ -216,6 +217,26 @@
propertyBean.setStorageManagerClass(Constants.Properties.DefaultValues.StorageManager);
}
+ private void loadInOrderInvocation (Properties properties) {
+ String inOrderInvocation =
properties.getProperty(Constants.Properties.InOrderInvocation);
+ boolean loaded = false;
+
+ if (inOrderInvocation!=null) {
+ inOrderInvocation = inOrderInvocation.trim();
+ if (inOrderInvocation.equalsIgnoreCase("true")) {
+ propertyBean.setInOrder(true);
+ loaded = true;
+ }else if (inOrderInvocation.equalsIgnoreCase("false")) {
+ propertyBean.setInOrder(false);
+ loaded = true;
+ }
+ }
+
+ if (!loaded)
+
propertyBean.setInOrder(Constants.Properties.DefaultValues.InvokeInOrder);
+
+ }
+
public boolean isExponentialBackoff () {
@@ -241,6 +262,10 @@
public RMPolicyBean getRMPolicyBean () {
return propertyBean.getPolicyBean();
+ }
+
+ public boolean isInOrderInvocation () {
+ return propertyBean.isInOrder();
}
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java?rev=349098&r1=349097&r2=349098&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaPropertyBean.java
Sat Nov 26 00:41:04 2005
@@ -29,6 +29,7 @@
RMPolicyBean policyBean = new RMPolicyBean ();
String storageManagerClass = null;
+ boolean inOrder = true;
public long getInactiveTimeoutInterval() {
return policyBean.getInactiveTimeoutInterval();
@@ -88,5 +89,14 @@
public RMPolicyBean getPolicyBean () {
return policyBean;
+ }
+
+
+ public boolean isInOrder() {
+ return inOrder;
+ }
+
+ public void setInOrder(boolean inOrder) {
+ this.inOrder = inOrder;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
