You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by du...@apache.org on 2007/03/19 07:46:45 UTC

svn commit: r519855 - in /webservices/sandesha/trunk/c: samples/RMSampleService/ samples/rm_echo_1_1/ samples/rm_echo_single_1_0/ samples/rm_echo_single_1_1/ samples/rm_report/ src/client/ src/handlers/ src/msgprocessors/ src/storage/inmemory/ src/stor...

Author: dushshantha
Date: Sun Mar 18 23:46:44 2007
New Revision: 519855

URL: http://svn.apache.org/viewvc?view=rev&rev=519855
Log:
removed some of the macro references

Modified:
    webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
    webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
    webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
    webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
    webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
    webservices/sandesha/trunk/c/samples/rm_report/report.c
    webservices/sandesha/trunk/c/src/client/client.c
    webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
    webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
    webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
    webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
    webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
    webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
    webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c
    webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
    webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
    webservices/sandesha/trunk/c/src/util/ack_mgr.c
    webservices/sandesha/trunk/c/src/util/msg_creator.c
    webservices/sandesha/trunk/c/src/util/msg_init.c
    webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
    webservices/sandesha/trunk/c/src/util/seq_mgr.c
    webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
    webservices/sandesha/trunk/c/src/workers/sender_worker.c

Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c Sun Mar 18 23:46:44 2007
@@ -74,7 +74,7 @@
     qname = axis2_qname_create(env, "Text", ns, NULL);
     text_parent_element = axiom_element_get_first_child_with_qname(element, env, 
             qname, node, &text_parent_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     if (!text_parent_node) /* 'text' node */
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -176,7 +176,7 @@
     qname = axis2_qname_create(env, "Text", ns, NULL);
     text_parent_element = axiom_element_get_first_child_with_qname(element, env, 
             qname, node, &text_parent_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     if (!text_parent_node) /* 'text' node */
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);

Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c Sun Mar 18 23:46:44 2007
@@ -109,7 +109,7 @@
     {
         op_qname = (axis2_qname_t *)axis2_op_get_qname(op, env);
         if(op_qname)
-            op_name = AXIS2_QNAME_GET_LOCALPART(op_qname, env);
+            op_name = axis2_qname_get_localpart(op_qname, env);
         if(op_name)
         {
             if (axis2_strcmp(op_name, "echoString") == 0)

Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c Sun Mar 18 23:46:44 2007
@@ -170,7 +170,7 @@
         property = axis2_property_create(env);
         if(property)
         {
-            AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(offered_seq_id, 
+            axis2_property_set_value(property, env, axis2_strdup(offered_seq_id, 
                 env));
             AXIS2_OPTIONS_SET_PROPERTY(options, env, 
                 SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);

Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c Sun Mar 18 23:46:44 2007
@@ -163,7 +163,7 @@
     property = axis2_property_create(env);
     if(property)
     {
-        AXIS2_PROPERTY_SET_VALUE(property, env, axis2_strdup(offered_seq_id, 
+        axis2_property_set_value(property, env, axis2_strdup(offered_seq_id, 
             env));
         AXIS2_OPTIONS_SET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);

Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/rm_echo_single_1_1.c Sun Mar 18 23:46:44 2007
@@ -159,7 +159,7 @@
     property = axis2_property_create(env);
     if(property)
     {
-        AXIS2_PROPERTY_SET_VALUE(property, env, axis2_strdup(offered_seq_id, 
+        axis2_property_set_value(property, env, axis2_strdup(offered_seq_id, 
             env));
         AXIS2_OPTIONS_SET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);

Modified: webservices/sandesha/trunk/c/samples/rm_report/report.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_report/report.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_report/report.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_report/report.c Sun Mar 18 23:46:44 2007
@@ -165,7 +165,7 @@
     property = axis2_property_create(env);
     if(property)
     {
-        AXIS2_PROPERTY_SET_VALUE(property, env, axis2_strdup(offered_seq_id, 
+        axis2_property_set_value(property, env, axis2_strdup(offered_seq_id, 
             env));
         AXIS2_OPTIONS_SET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);

Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Sun Mar 18 23:46:44 2007
@@ -262,7 +262,7 @@
         property = axis2_ctx_get_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, 
             AXIS2_FALSE);
         if(property)
-            within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+            within_transaction_str = (axis2_char_t *) axis2_property_get_value(
                 property, env);
         if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str, 
             AXIS2_VALUE_TRUE))
@@ -432,7 +432,7 @@
         property = (axis2_property_t *) axis2_ctx_get_property(ctx, env, 
             SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
         if(property)
-            within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+            within_transaction_str = (axis2_char_t *) axis2_property_get_value(
                 property, env);
         if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str, 
             AXIS2_VALUE_TRUE))
@@ -666,7 +666,7 @@
     property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_RM_SPEC_VERSION);
     if(property)
-        rm_spec_version = AXIS2_PROPERTY_GET_VALUE(property, env);
+        rm_spec_version = axis2_property_get_value(property, env);
     if(!rm_spec_version)
     {
         rm_spec_version = 
@@ -776,7 +776,7 @@
     property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_RM_SPEC_VERSION);
     if(property)
-        rm_spec_version = AXIS2_PROPERTY_GET_VALUE(property, env);
+        rm_spec_version = axis2_property_get_value(property, env);
     if(!rm_spec_version)
     {
         rm_spec_version = 
@@ -1100,7 +1100,7 @@
     property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env, 
         SANDESHA2_CLIENT_RM_SPEC_VERSION);
     if(property)
-        rm_spec_version = AXIS2_PROPERTY_GET_VALUE(property, env);
+        rm_spec_version = axis2_property_get_value(property, env);
     if(!rm_spec_version)
     {
         rm_spec_version = axis2_strdup(SANDESHA2_SPEC_VERSION_1_0, env); 
@@ -1289,7 +1289,7 @@
     property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_RM_SPEC_VERSION);
     if(property)
-        rm_spec_version = AXIS2_PROPERTY_GET_VALUE(property, env);
+        rm_spec_version = axis2_property_get_value(property, env);
     if(!rm_spec_version)
     {
         rm_spec_version = 
@@ -1594,7 +1594,7 @@
         property = axis2_ctx_get_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, 
             AXIS2_FALSE);
         if(property)
-            within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+            within_transaction_str = (axis2_char_t *) axis2_property_get_value(
                 property, env);
         if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str, 
             AXIS2_VALUE_TRUE))
@@ -1733,7 +1733,7 @@
         property = AXIS2_OPTIONS_GET_PROPERTY(options, env, 
             SANDESHA2_CLIENT_RM_SPEC_VERSION);
         if(property)
-            rm_spec_version = AXIS2_PROPERTY_GET_VALUE(property, env);
+            rm_spec_version = axis2_property_get_value(property, env);
         if(!rm_spec_version)
         {
             rm_spec_version = 
@@ -1980,7 +1980,7 @@
     property = (axis2_property_t *) axis2_ctx_get_property(ctx, env, 
         SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
     if(property)
-        within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+        within_transaction_str = (axis2_char_t *) axis2_property_get_value(
             property, env);
     if(within_transaction_str && 0 == axis2_strcmp(within_transaction_str, 
         AXIS2_VALUE_TRUE))

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Sun Mar 18 23:46:44 2007
@@ -153,7 +153,7 @@
     property = axis2_ctx_get_property(ctx, env, SANDESHA2_REINJECTED_MESSAGE, 
             AXIS2_FALSE);
     if(property)
-        reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env); 
+        reinjected_msg = (axis2_char_t *) axis2_property_get_value(property, env); 
     if(reinjected_msg && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, reinjected_msg))
     {
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Detected"
@@ -171,7 +171,7 @@
     property = axis2_ctx_get_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, 
         AXIS2_FALSE);
     if(property)
-        within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+        within_transaction_str = (axis2_char_t *) axis2_property_get_value(
             property, env);
     if(within_transaction_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, 
         within_transaction_str))
@@ -375,7 +375,7 @@
                     rcvd_msgs_str1 = sandesha2_seq_property_bean_get_value(
                             rcvd_msgs_bean, env);
                     sprintf(msg_no_str, "%ld", msg_no);
-                    if(rcvd_msgs_str1 && 0 < AXIS2_STRLEN(rcvd_msgs_str1))
+                    if(rcvd_msgs_str1 && 0 < axis2_strlen(rcvd_msgs_str1))
                         bean_value = axis2_strcat(env, rcvd_msgs_str1, ",",
                             msg_no_str, NULL);
                     else

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Sun Mar 18 23:46:44 2007
@@ -112,7 +112,7 @@
     temp_prop = axis2_ctx_get_property(ctx, env, 
             SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
     if(temp_prop)
-        str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env); 
+        str_done = (axis2_char_t *) axis2_property_get_value(temp_prop, env); 
     if(str_done && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, str_done))
     {
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
@@ -123,7 +123,7 @@
     temp_prop = axis2_ctx_get_property(ctx, env, SANDESHA2_REINJECTED_MESSAGE, 
             AXIS2_FALSE);
     if(temp_prop)
-        reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, 
+        reinjected_msg = (axis2_char_t *) axis2_property_get_value(temp_prop, 
                         env);
     if(reinjected_msg && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, reinjected_msg))
     {
@@ -138,7 +138,7 @@
     temp_prop = axis2_ctx_get_property(ctx, env, 
             SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
     if(temp_prop)
-        within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+        within_transaction_str = (axis2_char_t *) axis2_property_get_value(
                         temp_prop, env);
     if(within_transaction_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, 
                 within_transaction_str))

Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Sun Mar 18 23:46:44 2007
@@ -150,7 +150,7 @@
     temp_prop = axis2_msg_ctx_get_property(msg_ctx, env, 
             SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
     if(temp_prop)
-        str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env); 
+        str_done = (axis2_char_t *) axis2_property_get_value(temp_prop, env); 
     if(str_done && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, str_done))
     {
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
@@ -166,7 +166,7 @@
     temp_prop = axis2_msg_ctx_get_property(msg_ctx, env, 
             SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
     if(temp_prop)
-        within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+        within_transaction_str = (axis2_char_t *) axis2_property_get_value(
                         temp_prop, env);
     if(within_transaction_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, 
                 within_transaction_str))
@@ -187,7 +187,7 @@
     temp_prop = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_DUMMY_MESSAGE, 
             AXIS2_FALSE);
     if(NULL != temp_prop)
-        dummy_msg_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env); 
+        dummy_msg_str = (axis2_char_t *) axis2_property_get_value(temp_prop, env); 
     if(dummy_msg_str && 0 == axis2_strcmp(AXIS2_VALUE_TRUE, dummy_msg_str))
     {
         dummy_msg = AXIS2_TRUE;

Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Sun Mar 18 23:46:44 2007
@@ -235,7 +235,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_WSA_VERSION, 
         AXIS2_FALSE);
     if(property)
-        wsa_version = AXIS2_PROPERTY_GET_VALUE(property, env);
+        wsa_version = axis2_property_get_value(property, env);
     
     property = axis2_property_create_with_args(env, 0, 0, 0, wsa_version);
     if(property)

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?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Sun Mar 18 23:46:44 2007
@@ -973,7 +973,7 @@
             }
         }        
     }
-    op_name = AXIS2_QNAME_GET_LOCALPART(axis2_op_get_qname( axis2_op_ctx_get_op(
+    op_name = axis2_qname_get_localpart(axis2_op_get_qname( axis2_op_ctx_get_op(
         axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env);
     if (to_epr)
         to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);

Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Sun Mar 18 23:46:44 2007
@@ -326,7 +326,7 @@
         sandesha2_next_msg_bean_set_next_msg_no_to_process(next_bean, env, 1);
         
         rm_spec_ver = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
-        if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, rm_spec_ver))
+        if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, rm_spec_ver))
         {
             axis2_char_t *reply_to_addr = sandesha2_utils_get_seq_property(env, 
                 int_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR, storage_mgr); 

Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Sun Mar 18 23:46:44 2007
@@ -492,7 +492,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
         AXIS2_FALSE);
     if(property)
-        seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
+        seq_key = axis2_property_get_value(property, env);
     int_seq_id = sandesha2_utils_get_internal_seq_id(env, to_address, seq_key);
     out_seq_id = sandesha2_utils_get_seq_property(env, int_seq_id, 
         SANDESHA2_SEQ_PROP_OUT_SEQ_ID, storage_mgr);

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c Sun Mar 18 23:46:44 2007
@@ -196,7 +196,7 @@
     property = axis2_ctx_get_property(ctx, env, key, AXIS2_FALSE);
     if(property)
     {
-        bean_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(
+        bean_mgr_impl->table = (axis2_hash_t *) axis2_property_get_value(
             property, env);
     }
     if(!bean_mgr_impl->table)
@@ -209,9 +209,9 @@
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
             return NULL;
         }
-        AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
-        AXIS2_PROPERTY_SET_VALUE(property, env, bean_mgr_impl->table);
-        AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
+        axis2_property_set_scope(property, env, AXIS2_SCOPE_APPLICATION);
+        axis2_property_set_value(property, env, bean_mgr_impl->table);
+        axis2_property_set_free_func(property, env, axis2_hash_free_void_arg);
         axis2_ctx_set_property(ctx, env, key, property, AXIS2_FALSE);
     }
     bean_mgr_impl->bean_mgr.ops = bean_mgr_ops;

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_storage_mgr.c Sun Mar 18 23:46:44 2007
@@ -402,7 +402,7 @@
     ctx = axis2_conf_ctx_get_base(conf_ctx, env);
     property = axis2_ctx_get_property(ctx, env, 
             storage_mgr_impl->SANDESHA2_MSG_MAP_KEY, AXIS2_FALSE);
-    storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+    storage_map = (axis2_hash_t *) axis2_property_get_value(property, env);
     if(!storage_map)
         return NULL;
     return (axis2_msg_ctx_t *) axis2_hash_get(storage_map, key, 
@@ -431,13 +431,13 @@
     {
         property = axis2_property_create(env);
     }
-    storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+    storage_map = (axis2_hash_t *) axis2_property_get_value(property, env);
     if(!storage_map)
     {
         storage_map = axis2_hash_make(env);
         axis2_property_set_scope(property, env, AXIS2_SCOPE_APPLICATION);
-        AXIS2_PROPERTY_SET_VALUE(property, env, storage_map);
-        AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
+        axis2_property_set_value(property, env, storage_map);
+        axis2_property_set_free_func(property, env, axis2_hash_free_void_arg);
         axis2_ctx_set_property(ctx, env, storage_mgr_impl->SANDESHA2_MSG_MAP_KEY, 
                 property, AXIS2_FALSE);
     }
@@ -474,7 +474,7 @@
                 AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+    storage_map = (axis2_hash_t *) axis2_property_get_value(property, env);
     if(!storage_map)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT, 
@@ -514,7 +514,7 @@
                 AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    storage_map = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+    storage_map = (axis2_hash_t *) axis2_property_get_value(property, env);
     if(!storage_map)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT, 

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Sun Mar 18 23:46:44 2007
@@ -710,7 +710,7 @@
         axis2_char_t *mep = NULL;
         if(qname)
         {
-            axis2_char_t *op_name = AXIS2_QNAME_TO_STRING(qname, env);
+            axis2_char_t *op_name = axis2_qname_to_string(qname, env);
             sandesha2_msg_store_bean_set_op(bean, env, op_name);
         }
         mep = (axis2_char_t *) axis2_op_get_msg_exchange_pattern(op, env);
@@ -772,7 +772,7 @@
             property = axis2_msg_ctx_get_property(msg_ctx, env, 
                 SANDESHA2_IN_MESSAGE_STORAGE_KEY, AXIS2_FALSE);
             if(property)
-                in_msg_store_key = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+                in_msg_store_key = (axis2_char_t *) axis2_property_get_value(
                     property, env);
             if(!in_msg_store_key)
             {
@@ -1060,7 +1060,7 @@
         SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE);
     if(property)
     {
-        axis2_char_t *value = AXIS2_PROPERTY_GET_VALUE(property, env);
+        axis2_char_t *value = axis2_property_get_value(property, env);
         prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
             SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
     }
@@ -1069,7 +1069,7 @@
     if(property)
     {
         axis2_char_t *temp_str = NULL;
-        axis2_char_t *value = AXIS2_PROPERTY_GET_VALUE(property, env);
+        axis2_char_t *value = axis2_property_get_value(property, env);
         if(value)
         {
             temp_str = prop_str;
@@ -1105,7 +1105,7 @@
 
         property = (axis2_property_t *) v;
         if(property)
-            value = AXIS2_PROPERTY_GET_VALUE(property, env);
+            value = axis2_property_get_value(property, env);
         if(value)
         {
             temp_str = prop_str;

Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Sun Mar 18 23:46:44 2007
@@ -166,18 +166,18 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, 
                         SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, AXIS2_FALSE);
                         
-    if(NULL == property || NULL == AXIS2_PROPERTY_GET_VALUE(property, env))
+    if(NULL == property || NULL == axis2_property_get_value(property, env))
         return AXIS2_FAILURE;
-    out_desc = AXIS2_PROPERTY_GET_VALUE(property, env);
+    out_desc = axis2_property_get_value(property, env);
     axis2_msg_ctx_set_transport_out_desc(msg_ctx, env, out_desc);
     
     property = axis2_msg_ctx_get_property(msg_ctx, env, 
                         SANDESHA2_MESSAGE_STORE_KEY, AXIS2_FALSE);
                         
-    if(NULL == property || NULL == AXIS2_PROPERTY_GET_VALUE(property, env))
+    if(NULL == property || NULL == axis2_property_get_value(property, env))
         return AXIS2_FAILURE;
     
-    key = AXIS2_PROPERTY_GET_VALUE(property, env);
+    key = axis2_property_get_value(property, env);
     conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
     conf = axis2_conf_ctx_get_conf(conf_ctx, env);
     storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);

Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Sun Mar 18 23:46:44 2007
@@ -131,7 +131,7 @@
             AXIS2_FALSE);
         if(property)
         {
-            AXIS2_PROPERTY_SET_VALUE(property, env, addr_ns_uri);
+            axis2_property_set_value(property, env, addr_ns_uri);
         }
         else
         {

Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Sun Mar 18 23:46:44 2007
@@ -129,7 +129,7 @@
      */
     qname = axis2_qname_create(env, "CreateSequenceOperation", NULL, NULL);
     create_seq_op = axis2_op_create_with_qname(env, qname);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
 
     create_seq_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, 
             application_rm_msg, create_seq_op);
@@ -172,7 +172,7 @@
         AXIS2_TARGET_EPR, AXIS2_FALSE);
     if(property)
     {
-        temp_to = AXIS2_PROPERTY_GET_VALUE(property, env);
+        temp_to = axis2_property_get_value(property, env);
         to_epr = axis2_endpoint_ref_create(env, axis2_endpoint_ref_get_address(
             temp_to, env));
     }
@@ -219,7 +219,7 @@
         property = axis2_ctx_get_property(ctx, env, 
                 SANDESHA2_CLIENT_OFFERED_SEQ_ID, AXIS2_FALSE);
         if(property)
-            offered_seq = AXIS2_PROPERTY_GET_VALUE(property, env);
+            offered_seq = axis2_property_get_value(property, env);
         if(offered_seq && 0 != axis2_strcmp("", offered_seq))
         {
             sandesha2_seq_offer_t *offer_part = NULL;
@@ -394,7 +394,7 @@
     prop = axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
     if(prop)
     {
-       AXIS2_PROPERTY_SET_VALUE(prop, env, addressing_ns_value); 
+       axis2_property_set_value(prop, env, addressing_ns_value); 
     }
     else
     {
@@ -728,8 +728,8 @@
 
                 next_param = (axis2_param_t *) axis2_array_list_get(op_params, 
                         env, i);
-                temp_name = AXIS2_PARAM_GET_NAME(next_param, env);
-                temp_value = AXIS2_PARAM_GET_VALUE(next_param, env);
+                temp_name = axis2_param_get_name(next_param, env);
+                temp_value = axis2_param_get_value(next_param, env);
                 new_param = axis2_param_create(env, temp_name, temp_value);
                 /*new_param->ops->value_free = next_param->ops->value_free;*/
                 axis2_op_add_param(new_op, env, new_param); 
@@ -766,7 +766,7 @@
                 prop = (axis2_property_t *) v;
                 ctx = axis2_op_ctx_get_base(new_op_ctx, env);
                 if(prop)
-                    new_prop = AXIS2_PROPERTY_CLONE(prop, env);
+                    new_prop = axis2_property_clone(prop, env);
                 if(new_prop)
                     axis2_ctx_set_property(ctx, env, key, new_prop, AXIS2_FALSE);
             }
@@ -799,7 +799,7 @@
                 prop = (axis2_property_t *) v;
                 ctx = axis2_msg_ctx_get_base(new_msg, env);
                 if(prop)
-                    new_prop = AXIS2_PROPERTY_CLONE(prop, env);
+                    new_prop = axis2_property_clone(prop, env);
                 if(new_prop)
                     axis2_ctx_set_property(ctx, env, key, new_prop, AXIS2_FALSE);
             }
@@ -834,7 +834,7 @@
                 key = (axis2_char_t *) k;
                 prop = (axis2_property_t *) v;
                 if(prop)
-                    new_prop = AXIS2_PROPERTY_CLONE(prop, env);
+                    new_prop = axis2_property_clone(prop, env);
                 if(new_prop)
                 axis2_hash_set(new_msg_props, key, AXIS2_HASH_KEY_STRING, new_prop);
             }
@@ -865,7 +865,7 @@
             void *value = NULL;
             axis2_param_t *new_policy_param = NULL;
 
-            value = AXIS2_PARAM_GET_VALUE(ref_policy_param, env);
+            value = axis2_param_get_value(ref_policy_param, env);
             new_policy_param = axis2_param_create(env, 
                     SANDESHA2_SANDESHA_PROPERTY_BEAN, value);
         }
@@ -1013,7 +1013,7 @@
     }
     qname = axis2_qname_create(env, "MakeConnectionOperation", NULL, NULL);
     make_conn_op = axis2_op_create_with_qname(env, qname);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     make_conn_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, 
         ref_rm_msg_ctx, make_conn_op);
     if(make_conn_msg_ctx)

Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Sun Mar 18 23:46:44 2007
@@ -135,7 +135,7 @@
         ctx = axis2_msg_ctx_get_base(msg_ctx, env);
     prop = axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
     if(prop)
-        addressing_ns = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(prop, env);
+        addressing_ns = (axis2_char_t *) axis2_property_get_value(prop, env);
     
     if(!addressing_ns && !axis2_msg_ctx_get_server_side(msg_ctx, env))
     {
@@ -516,7 +516,7 @@
                 op = NULL;
             }
         }
-        AXIS2_QNAME_FREE(tmp_qname, env);
+        axis2_qname_free(tmp_qname, env);
         axis2_msg_ctx_set_op(msg_ctx, env, op);
     }
 }

Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Sun Mar 18 23:46:44 2007
@@ -215,7 +215,7 @@
             AXIS2_FAILURE);
         return NULL;
     }
-    return (sandesha2_property_bean_t*)AXIS2_PARAM_GET_VALUE(param, env);
+    return (sandesha2_property_bean_t*)axis2_param_get_value(param, env);
     
 }
 
@@ -364,7 +364,7 @@
     property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
                         env, SANDESHA2_INVOKER, AXIS2_FALSE);
     if(property)
-        invoker = AXIS2_PROPERTY_GET_VALUE(property, env);
+        invoker = axis2_property_get_value(property, env);
     if(!invoker)
     {
         invoker = sandesha2_in_order_invoker_create(env);
@@ -392,7 +392,7 @@
     property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
                         env, SANDESHA2_SENDER, AXIS2_FALSE);
     if(property)
-        sender = AXIS2_PROPERTY_GET_VALUE(property, env);
+        sender = axis2_property_get_value(property, env);
         
     if(!sender)
     {
@@ -420,7 +420,7 @@
     property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
                         env, SANDESHA2_POLLING_MGR, AXIS2_FALSE);
     if(property)
-        polling_mgr = AXIS2_PROPERTY_GET_VALUE(property, env);
+        polling_mgr = axis2_property_get_value(property, env);
        
     /* Assumes that if someone has set the polling_mgr, he must have already 
      * started it 
@@ -476,10 +476,10 @@
     property = axis2_ctx_get_property(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR, 
         AXIS2_FALSE);
 
-    if(property && AXIS2_PROPERTY_GET_VALUE(property, env))
+    if(property && axis2_property_get_value(property, env))
     {
         sandesha2_storage_mgr_t *storage_mgr = NULL;
-        storage_mgr = (sandesha2_storage_mgr_t*)AXIS2_PROPERTY_GET_VALUE(
+        storage_mgr = (sandesha2_storage_mgr_t*)axis2_property_get_value(
             property, env);
         return storage_mgr;
     }
@@ -513,7 +513,7 @@
     property = axis2_ctx_get_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
         AXIS2_FALSE);
     if(property)
-        storage_mgr = AXIS2_PROPERTY_GET_VALUE(property, env);
+        storage_mgr = axis2_property_get_value(property, env);
     else
         storage_mgr = sandesha2_permanent_storage_mgr_create(env, conf_ctx);
     property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 
@@ -521,7 +521,7 @@
     axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR, 
         property, AXIS2_FALSE);
     /*if(property)
-        storage_mgr_list = AXIS2_PROPERTY_GET_VALUE(property, env);
+        storage_mgr_list = axis2_property_get_value(property, env);
     sandesha2_storage_mgr_t *storage_mgr = 
         sandesha2_permanent_storage_mgr_create(env, conf_ctx);
     axis2_array_list_add(storage_mgr_list, env, storage_mgr);
@@ -545,7 +545,7 @@
     
     start_str = axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", NULL);
     start_len = axis2_strlen(start_str);
-    if(0 != AXIS2_STRNCMP(incoming_seq_id, start_str, start_len))
+    if(0 != axis2_strcmp(incoming_seq_id, start_str, start_len))
         return NULL;
     ret = axis2_strdup((incoming_seq_id + start_len * sizeof(axis2_char_t)), env);
     
@@ -570,7 +570,7 @@
             AXIS2_FAILURE);
         return NULL;
     }
-    return (sandesha2_property_bean_t*)AXIS2_PARAM_GET_VALUE(param, env);
+    return (sandesha2_property_bean_t*)axis2_param_get_value(param, env);
 
 }
 
@@ -748,12 +748,12 @@
             property = axis2_msg_ctx_get_property(req_msg, env, 
                         AXIS2_WSA_VERSION, AXIS2_FALSE);
             if(property)
-                addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
+                addr_ver = axis2_property_get_value(property, env);
         }
     }
     else
     {
-        addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
+        addr_ver = axis2_property_get_value(property, env);
     }
     property = axis2_property_create_with_args(env, 0, 0, 0, addr_ver);
     axis2_msg_ctx_set_property(new_msg, env, AXIS2_WSA_VERSION, property,
@@ -765,7 +765,7 @@
     {
         axis2_property_set_scope(property, env, AXIS2_SCOPE_APPLICATION);
         axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_OUT, 
-            AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
+            axis2_property_clone(property, env), AXIS2_FALSE);
     }*/
     out_stream = axis2_msg_ctx_get_transport_out_stream(ref_msg, 
         env);
@@ -774,19 +774,19 @@
         AXIS2_TRANSPORT_IN, AXIS2_FALSE);
     if(property)
         axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_IN, 
-            AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
+            axis2_property_clone(property, env), AXIS2_FALSE);
     property = axis2_msg_ctx_get_property(ref_msg, env, 
         AXIS2_HTTP_OUT_TRANSPORT_INFO, AXIS2_FALSE);
     if(property)
         axis2_msg_ctx_set_property(new_msg, env, AXIS2_HTTP_OUT_TRANSPORT_INFO, 
-            AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
+            axis2_property_clone(property, env), AXIS2_FALSE);
     axis2_msg_ctx_set_http_out_transport_info(new_msg, env, 
         axis2_msg_ctx_get_http_out_transport_info(ref_msg, env));
     property = axis2_msg_ctx_get_property(ref_msg, env, 
         AXIS2_TRANSPORT_HEADERS, AXIS2_FALSE);
     if(property)
         axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_HEADERS, 
-            AXIS2_PROPERTY_CLONE(property, env), AXIS2_FALSE);
+            axis2_property_clone(property, env), AXIS2_FALSE);
     axis2_msg_ctx_set_execution_chain(new_msg, env, 
         axis2_msg_ctx_get_execution_chain(ref_msg, env));
     paused_phase_name = (axis2_char_t*)axis2_msg_ctx_get_paused_phase_name(
@@ -1034,7 +1034,7 @@
     property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
                         env, SANDESHA2_POLLING_MGR, AXIS2_FALSE);
     if(property)
-        polling_mgr = AXIS2_PROPERTY_GET_VALUE(property, env);
+        polling_mgr = axis2_property_get_value(property, env);
        
     if(polling_mgr)
     {
@@ -1269,9 +1269,9 @@
     const axis2_env_t *env,
     const axis2_char_t *reply_to)
 {
-    /*if (reply_to && AXIS2_STRSTR(reply_to, SANDESHA2_WSRM_ANON_URI_PREFIX))
+    /*if (reply_to && axis2_strstr(reply_to, SANDESHA2_WSRM_ANON_URI_PREFIX))
         return AXIS2_TRUE;*/
-    if (reply_to && AXIS2_STRSTR(reply_to, "anonymous"))
+    if (reply_to && axis2_strstr(reply_to, "anonymous"))
         return AXIS2_TRUE;
     else
         return AXIS2_FALSE;
@@ -1285,7 +1285,7 @@
     axis2_char_t *address_l = NULL;
     if(!address)
         return AXIS2_TRUE;
-    address_l = AXIS2_STRTRIM(env, address, NULL);
+    address_l = axis2_strtrim(env, address, NULL);
 
     if(0 == axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL, address_l))
         return AXIS2_TRUE;
@@ -1306,14 +1306,14 @@
     axis2_array_list_t *list = axis2_array_list_create(env, 0);
     axis2_char_t *ptr = NULL;
     axis2_char_t *value = NULL;
-    ptr = AXIS2_STRSTR(str, pattern);
+    ptr = axis2_strstr(str, pattern);
     while(ptr)
     {
         ptr[0] = AXIS2_EOLN;
         value = axis2_strdup(str, env);
         axis2_array_list_add(list, env, value);
         str = ptr + 3;
-        ptr = AXIS2_STRSTR(str, pattern);
+        ptr = axis2_strstr(str, pattern);
     }
     value = axis2_strdup(str, env);
     axis2_array_list_add(list, env, value);

Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Sun Mar 18 23:46:44 2007
@@ -353,7 +353,7 @@
     property = axis2_msg_ctx_get_property(first_app_msg, env, AXIS2_WSA_VERSION,
                         AXIS2_FALSE);
     if(property)
-        addr_ns_val = AXIS2_PROPERTY_GET_VALUE(property, env);
+        addr_ns_val = axis2_property_get_value(property, env);
     if(!addr_ns_val)
     {
         axis2_op_ctx_t *op_ctx = NULL;
@@ -366,7 +366,7 @@
             property = axis2_msg_ctx_get_property(req_msg_ctx, env, 
                         AXIS2_WSA_VERSION, AXIS2_FALSE);
             if(property)
-                addr_ns_val = AXIS2_PROPERTY_GET_VALUE(property, env);
+                addr_ns_val = axis2_property_get_value(property, env);
         }
     }
     if(!addr_ns_val)
@@ -383,7 +383,7 @@
     property = axis2_msg_ctx_get_property(first_app_msg, env, 
                         SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
     if(property)
-        acks_to_str = AXIS2_PROPERTY_GET_VALUE(property, env);
+        acks_to_str = axis2_property_get_value(property, env);
     /*if(!to_epr)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] WSA To is NULL");
@@ -416,7 +416,7 @@
         /*ctx = axis2_op_ctx_get_base(op_ctx, env);
         property = axis2_ctx_get_property(ctx, env, 
                 SANDESHA2_SEQ_PROP_REPLY_TO_EPR, AXIS2_FALSE);
-        reply_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);*/
+        reply_to_epr = axis2_property_get_value(property, env);*/
         if(reply_to_epr)
             reply_to_bean = sandesha2_seq_property_bean_create_with_data(env,
                         int_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR,
@@ -534,7 +534,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_ACKS_TO,
                         AXIS2_FALSE);
     if(property)
-        acks_to = AXIS2_PROPERTY_GET_VALUE(property, env);
+        acks_to = axis2_property_get_value(property, env);
     
     
     return AXIS2_SUCCESS;

Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Sun Mar 18 23:46:44 2007
@@ -370,7 +370,7 @@
                 property = axis2_msg_ctx_get_property(msg_to_invoke, env,
                         SANDESHA2_POST_FAILURE_MESSAGE, AXIS2_FALSE);
                 if(property)
-                    post_failure_str = AXIS2_PROPERTY_GET_VALUE(property, env);
+                    post_failure_str = axis2_property_get_value(property, env);
                 if(post_failure_str && 0 == axis2_strcmp(
                         post_failure_str, AXIS2_VALUE_TRUE))
                     post_failure_invocation = AXIS2_TRUE;

Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=519855&r1=519854&r2=519855
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Sun Mar 18 23:46:44 2007
@@ -310,7 +310,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, 
         SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
     if(property)
-        AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
+        axis2_property_set_value(property, env, AXIS2_VALUE_TRUE);
     else
     {
         property = axis2_property_create_with_args(env, 0, 0, 0, 
@@ -339,7 +339,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, 
         SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE);
     if(property)
-        qualified_for_sending = AXIS2_PROPERTY_GET_VALUE(property, env);
+        qualified_for_sending = axis2_property_get_value(property, env);
     if(qualified_for_sending && 0 != axis2_strcmp(
         qualified_for_sending, AXIS2_VALUE_TRUE))
     {
@@ -426,7 +426,7 @@
         property = axis2_msg_ctx_get_property(msg_ctx, env, 
             SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
         if(property)
-            AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_FALSE);
+            axis2_property_set_value(property, env, AXIS2_VALUE_FALSE);
         else
         {
             property = axis2_property_create_with_args(env, 0, 0, 0,
@@ -447,7 +447,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, 
         SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE); 
     if(property)
-        AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
+        axis2_property_set_value(property, env, AXIS2_VALUE_TRUE);
     else
     {
         property = axis2_property_create_with_args(env, 0, 0, 0,
@@ -514,7 +514,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, 
         SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
     if(property)
-        AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_FALSE);
+        axis2_property_set_value(property, env, AXIS2_VALUE_FALSE);
     else
     {
         property = axis2_property_create_with_args(env, 0, 0, 0, 



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org