svn commit: r696663 - in /webservices/sandesha/trunk/c: samples/RMSampleService/services.xml samples/rm_echo_1_0/policy.xml src/msgprocessors/app_msg_processor.c src/storage/sqlite/permanent_storage_mgr.c

Author: damitha
Date: Thu Sep 18 07:45:28 2008
New Revision: 696663

URL: http://svn.apache.org/viewvc?rev=696663&view=rev
Log:
Testing policy

Modified:
    webservices/sandesha/trunk/c/samples/RMSampleService/services.xml
    webservices/sandesha/trunk/c/samples/rm_echo_1_0/policy.xml
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c

Modified: webservices/sandesha/trunk/c/samples/RMSampleService/services.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/services.xml?rev=696663&r1=696662&r2=696663&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/services.xml (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/services.xml Thu Sep 18 07:45:28 2008
@@ -23,7 +23,7 @@
                 <wsrm:RMAssertion>
                     <wsrm:InactivityTimeout Milliseconds="600000"/>
                     <wsrm:AcknowledgementInterval Milliseconds="200"/>
-                    <wsrm:BaseRetransmissionInterval Milliseconds="300"/>
+                    <wsrm:BaseRetransmissionInterval Milliseconds="8"/>
                     <wsrm:ExponentialBackoff/>
                     <sanc:InactivityTimeout>64</sanc:InactivityTimeout>
                     <sanc:StorageManager>persistent</sanc:StorageManager>

Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/policy.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/policy.xml?rev=696663&r1=696662&r2=696663&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/policy.xml (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/policy.xml Thu Sep 18 07:45:28 2008
@@ -4,7 +4,7 @@
             <wsrm:RMAssertion>
                 <wsrm:InactivityTimeout Milliseconds="600000"/>
                 <wsrm:AcknowledgementInterval Milliseconds="200"/>
-                <wsrm:BaseRetransmissionInterval Milliseconds="300"/>
+                <wsrm:BaseRetransmissionInterval Milliseconds="8"/>
                 <wsrm:ExponentialBackoff/>
                 <sanc:InactivityTimeout>64</sanc:InactivityTimeout>
                 <sanc:StorageManager>persistent</sanc:StorageManager>

Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=696663&r1=696662&r2=696663&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Sep 18 07:45:28 2008
@@ -2922,15 +2922,13 @@
     axis2_msg_ctx_t *req_msg_ctx = NULL;
     axis2_op_ctx_t *op_ctx = NULL;
     axis2_char_t *rmd_sequence_id = NULL;
-    axis2_module_desc_t *module_desc = NULL;
-    axutil_qname_t *qname = NULL;
-    axutil_param_t *retrans_interval_param = NULL;
-    int retrans_interval = 0;
+    long retrans_interval = 0;
     axis2_conf_t *conf = NULL;
     const axis2_char_t *mep = NULL;
     axis2_relates_to_t *relates_to = NULL;
     sandesha2_seq_property_bean_t *relates_to_bean = NULL;
     axis2_svc_t *svc = NULL;
+    sandesha2_property_bean_t *property_bean = NULL;
 
     AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,   
         "[Sandesha2] Entry:sandesha2_app_msg_processor_send_app_msg");
@@ -3350,18 +3348,8 @@
     }
 
     conf = axis2_conf_ctx_get_conf(conf_ctx, env);
-    qname = axutil_qname_create(env, SANDESHA2_MODULE, NULL, NULL);
-    module_desc = axis2_conf_get_module(conf, env, qname);
-    retrans_interval_param = axis2_module_desc_get_param(module_desc, env, 
-            SANDESHA2_PROPERTIES_RETRANSMISSION_INTERVAL);
-    if(retrans_interval_param)
-    {
-        retrans_interval = AXIS2_ATOI(axutil_param_get_value(retrans_interval_param, env));
-    }
-    if(qname)
-    {
-        axutil_qname_free(qname, env);
-    }
+    property_bean = sandesha2_utils_get_property_bean(env, svc);
+    retrans_interval = sandesha2_property_bean_get_retrans_interval(property_bean, env);
 
     relates_to_bean = sandesha2_seq_property_bean_create_with_data(env, msg_id, 
             SANDESHA2_SEQ_PROP_RELATED_MSG_ID, rms_sequence_id);

Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c?rev=696663&r1=696662&r2=696663&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Thu Sep 18 07:45:28 2008
@@ -349,6 +349,8 @@
     axiom_soap_envelope_t *soap_envelope = NULL;
     sandesha2_msg_store_bean_t *msg_store_bean = NULL;
     axis2_char_t *soap_env_str = NULL;
+    axis2_char_t *svc_name = NULL;
+    axis2_svc_t *svc = NULL;
     /*axis2_char_t *persistent_prop_str = NULL;
     axutil_property_t *prop_property = NULL;*/
 
@@ -363,7 +365,19 @@
         return NULL;
     }
 
+    conf = axis2_conf_ctx_get_conf(conf_ctx, env);
     msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
+
+    svc_name = sandesha2_msg_store_bean_get_svc(msg_store_bean, env);
+    if(svc_name)
+    {
+        svc = axis2_conf_get_svc(conf, env, svc_name);
+        if(svc)
+        {
+            axis2_msg_ctx_set_svc(msg_ctx, env, svc);
+        }
+    }
+
     soap_env_str = axutil_strdup(env, sandesha2_msg_store_bean_get_soap_envelope_str(msg_store_bean, env));
     if(soap_env_str)
     {
@@ -405,7 +419,6 @@
 
     axis2_msg_ctx_set_msg_id(msg_ctx, env, sandesha2_msg_store_bean_get_msg_id(msg_store_bean, env));
 
-    conf = axis2_conf_ctx_get_conf(conf_ctx, env);
     transport_out = sandesha2_msg_store_bean_get_transport_out(msg_store_bean, env);
     transport_out_desc = axis2_conf_get_transport_out(conf, env, transport_out);
     if(transport_out_desc)