svn commit: r386849 - in /webservices/sandesha/trunk/src/org/apache/sandesha2: Sandesha2Constants.java util/PropertyManager.java util/SandeshaUtil.java

[chamikara]

Author: chamikara
Date: Sat Mar 18 05:37:00 2006
New Revision: 386849

URL: http://svn.apache.org/viewcvs?rev=386849&view=rev
Log:
SandeshaUtil.getPropertyBean resutn a default value, when the bean is not set 
in the ctx hierarchy.

Modified:
    webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java
    
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java

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=386849&r1=386848&r2=386849&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Sandesha2Constants.java 
Sat Mar 18 05:37:00 2006
@@ -406,6 +406,8 @@
                        String MessageTypesToDrop=VALUE_NONE;
                        
                        int RetransmissionCount = 8;
+                       
+                       int MaximumRetransmissionCount = 10;
                }
        }
        

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=386849&r1=386848&r2=386849&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java 
(original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java 
Sat Mar 18 05:37:00 2006
@@ -64,21 +64,17 @@
        }
 
        public void loadlPropertiesFromDefaultValues() {
-               propertyBean
-                               
.setAcknowledgementInterval(Sandesha2Constants.Properties.DefaultValues.AcknowledgementInterval);
-               propertyBean
-                               
.setExponentialBackoff(Sandesha2Constants.Properties.DefaultValues.ExponentialBackoff);
-               propertyBean
-                               .setInactiveTimeoutInterval(
-                                               
Sandesha2Constants.Properties.DefaultValues.InactivityTimeout,
+               
propertyBean.setAcknowledgementInterval(Sandesha2Constants.Properties.DefaultValues.AcknowledgementInterval);
+               
propertyBean.setExponentialBackoff(Sandesha2Constants.Properties.DefaultValues.ExponentialBackoff);
+               propertyBean.setInactiveTimeoutInterval(
+                                       
Sandesha2Constants.Properties.DefaultValues.InactivityTimeout,
                                                
Sandesha2Constants.Properties.DefaultValues.InactivityTimeoutMeasure);
-               propertyBean
-                               
.setInOrder(Sandesha2Constants.Properties.DefaultValues.InvokeInOrder);
+               
+               
propertyBean.setInOrder(Sandesha2Constants.Properties.DefaultValues.InvokeInOrder);
                propertyBean.setMsgTypesToDrop(null);
-               propertyBean
-                               
.setRetransmissionInterval(Sandesha2Constants.Properties.DefaultValues.RetransmissionInterval);
-               propertyBean
-                               
.setStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.StorageManager);
+               
propertyBean.setRetransmissionInterval(Sandesha2Constants.Properties.DefaultValues.RetransmissionInterval);
+               
propertyBean.setStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.StorageManager);
+               
propertyBean.setMaximumRetransmissionCount(Sandesha2Constants.Properties.DefaultValues.MaximumRetransmissionCount);
        }
 
        public void loadPropertiesFromPropertyFile(InputStream in) {

Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=386849&r1=386848&r2=386849&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java 
Sat Mar 18 05:37:00 2006
@@ -902,8 +902,13 @@
        
        public static SandeshaPropertyBean getPropretyBean (MessageContext 
messageCtx) throws SandeshaException {
                Parameter parameter =  
messageCtx.getParameter(Sandesha2Constants.SANDESHA2_POLICY_BEAN);
-               if (parameter==null)
-                       throw new SandeshaException ("Property bean not set for 
the message");
+               parameter = null;
+               if (parameter==null) {
+                       //TODO - get actual values from the module.
+                       log.debug("Property bean not set. Using the default 
one");
+                       SandeshaPropertyBean defaultPropertyBean = 
PropertyManager.getInstance().getPropertyBean();
+                       return defaultPropertyBean;
+               }
                
                SandeshaPropertyBean propertyBean = (SandeshaPropertyBean) 
parameter.getValue ();
                return propertyBean;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]