axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From din...@apache.org
Subject svn commit: r519261 [3/6] - in /webservices/axis2/trunk/c: guththila/samples/ guththila/src/ rampart/samples/authn_provider/ rampart/samples/callback/ rampart/samples/callback/htpasswd_callback/ rampart/samples/client/sec_echo/ rampart/samples/omxmlsec...
Date Sat, 17 Mar 2007 08:13:00 GMT
Modified: webservices/axis2/trunk/c/rampart/test/openssl/rsa/test_rsa.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/openssl/rsa/test_rsa.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/openssl/rsa/test_rsa.c (original)
+++ webservices/axis2/trunk/c/rampart/test/openssl/rsa/test_rsa.c Sat Mar 17 01:12:54 2007
@@ -41,7 +41,7 @@
     env = test_init();
     plaintxt = (unsigned char *)"We will we will rock ya...";
 
-    openssl_md5(env, plaintxt , AXIS2_STRLEN(plaintxt));    
+    openssl_md5(env, plaintxt , axis2_strlen(plaintxt));    
     printf("Finish  md5() \n");
     return 0;
 }

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Sat Mar 17 01:12:54 2007
@@ -230,7 +230,7 @@
     axis2_char_t *buffer = NULL;
     axis2_char_t *ns = NULL;
 
-    ns = AXIS2_STRDUP("http://localhost/axis/Calculator", env);
+    ns = axis2_strdup("http://localhost/axis/Calculator", env);
     ns1 = axiom_namespace_create(env, ns, "tns0");
 
     add_om_ele = axiom_element_create(env, NULL, "add", ns1, &add_om_node);
@@ -287,7 +287,7 @@
     axis2_char_t *buffer = NULL;
     axis2_char_t *ns = NULL;
 
-    ns = AXIS2_STRDUP("http://localhost/axis/Calculator", env);
+    ns = axis2_strdup("http://localhost/axis/Calculator", env);
     ns1 = axiom_namespace_create(env, ns, "tns0");
 
     add_om_ele = axiom_element_create(env, NULL, "add", ns1, &add_om_node);

Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/test.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/test.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/test.c Sat Mar 17 01:12:54 2007
@@ -72,7 +72,7 @@
     axis2_char_t *buffer = NULL;
     axis2_char_t *ns = NULL;
 
-    ns = AXIS2_STRDUP("http://localhost/axis/Calculator", env);
+    ns = axis2_strdup("http://localhost/axis/Calculator", env);
     ns1 = axiom_namespace_create(env, ns, "tns0");
 
     add_om_ele = axiom_element_create(env, NULL, "add", ns1, &add_om_node);

Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Sat Mar 17 01:12:54 2007
@@ -46,7 +46,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Sat Mar 17 01:12:54 2007
@@ -54,7 +54,7 @@
     /* Set end point reference of google service */
     address = "http://api.google.com/search/beta2";
 
-    if ((argc > 1) && (AXIS2_STRCMP("-h", argv[1]) == 0))
+    if ((argc > 1) && (axis2_strcmp("-h", argv[1]) == 0))
     {
         printf("\nUsage : %s [google_key] [word_to_spell] \n", argv[0]);
         printf("\tgoogle_key Your Google license key. Default value won't work. You must use your key here.\n");
@@ -116,7 +116,7 @@
             axiom_node_t *ret_node1 = NULL;
 
             result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
-            if (AXIS2_STRCMP(axiom_element_get_localname(result_ele, env), "doSpellingSuggestionResponse") != 0)
+            if (axis2_strcmp(axiom_element_get_localname(result_ele, env), "doSpellingSuggestionResponse") != 0)
             {
                 print_invalid_om(env, ret_node);
                 return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Sat Mar 17 01:12:54 2007
@@ -56,25 +56,25 @@
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
     AXIS2_SVC_ADD_OP(svc, env, op);
-    AXIS2_QNAME_FREE(op_qname, env);
+    axis2_qname_free(op_qname, env);
 
     op_qname = axis2_qname_create(env, "sub" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
     AXIS2_SVC_ADD_OP(svc, env, op);
-    AXIS2_QNAME_FREE(op_qname, env);
+    axis2_qname_free(op_qname, env);
 
     op_qname = axis2_qname_create(env, "mul" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
     AXIS2_SVC_ADD_OP(svc, env, op);
-    AXIS2_QNAME_FREE(op_qname, env);
+    axis2_qname_free(op_qname, env);
 
     op_qname = axis2_qname_create(env, "div" , "", NULL);
     op = axis2_op_create_with_qname(env, op_qname);
     axis2_op_set_msg_exchange_pattern(op, env, AXIS2_MEP_URI_OUT_IN);
     AXIS2_SVC_ADD_OP(svc, env, op);
-    AXIS2_QNAME_FREE(op_qname, env);
+    axis2_qname_free(op_qname, env);
 }
 
 axis2_stub_t *
@@ -116,7 +116,7 @@
     svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
     op_qname = axis2_qname_create(env, "add" , "", NULL);
     ret_node =  AXIS2_SVC_CLIENT_SEND_RECEIVE_WITH_OP_QNAME(svc_client, env, op_qname, node);
-    AXIS2_QNAME_FREE(op_qname, env);
+    axis2_qname_free(op_qname, env);
 
     return ret_node;
 }

Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Sat Mar 17 01:12:54 2007
@@ -51,7 +51,7 @@
     address = "http://localhost:9090/axis2/services/math";
     if (argc > 1)
         operation = argv[1];
-    if (AXIS2_STRCMP(operation, "-h") == 0)
+    if (axis2_strcmp(operation, "-h") == 0)
     {
         printf("Usage : %s [operation] [param1] [param2] [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Sat Mar 17 01:12:54 2007
@@ -49,7 +49,7 @@
     address = "http://localhost:9090/axis2/services/mtom";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url] [image_name] [to_save_name] [do_not_optimize]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/client/notify/notify_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/notify_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Sat Mar 17 01:12:54 2007
@@ -42,7 +42,7 @@
     address = "http://localhost:9090/axis2/services/notify";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Sat Mar 17 01:12:54 2007
@@ -68,11 +68,11 @@
     AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
 
     rest_property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_VALUE(rest_property, env, axis2_strdup (AXIS2_VALUE_TRUE, env));
+    axis2_property_set_value(rest_property, env, axis2_strdup (AXIS2_VALUE_TRUE, env));
     AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_ENABLE_REST,
             rest_property);
 	get_property = axis2_property_create(env);
-	AXIS2_PROPERTY_SET_VALUE(get_property, env, axis2_strdup(AXIS2_HTTP_HEADER_GET, env));
+	axis2_property_set_value(get_property, env, axis2_strdup(AXIS2_HTTP_HEADER_GET, env));
 	AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_HTTP_METHOD, get_property);
 
     client_home = AXIS2_GETENV("AXIS2C_HOME");

Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c Sat Mar 17 01:12:54 2007
@@ -118,13 +118,13 @@
                 axis2_char_t *op_name = axiom_element_get_localname(element, env);
                 if (op_name)
                 {
-                    if (AXIS2_STRCMP(op_name, "add") == 0)
+                    if (axis2_strcmp(op_name, "add") == 0)
                         return axis2_calc_add(env, node);
-                    if (AXIS2_STRCMP(op_name, "sub") == 0)
+                    if (axis2_strcmp(op_name, "sub") == 0)
                         return axis2_calc_sub(env, node);
-                    if (AXIS2_STRCMP(op_name, "mul") == 0)
+                    if (axis2_strcmp(op_name, "mul") == 0)
                         return axis2_calc_mul(env, node);
-                    if (AXIS2_STRCMP(op_name, "div") == 0)
+                    if (axis2_strcmp(op_name, "div") == 0)
                         return axis2_calc_div(env, node);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math_skeleton.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math_skeleton.c Sat Mar 17 01:12:54 2007
@@ -118,13 +118,13 @@
                 axis2_char_t *op_name = axiom_element_get_localname(element, env);
                 if (op_name)
                 {
-                    if (AXIS2_STRCMP(op_name, "add") == 0)
+                    if (axis2_strcmp(op_name, "add") == 0)
                         return axis2_math_add(env, node);
-                    if (AXIS2_STRCMP(op_name, "sub") == 0)
+                    if (axis2_strcmp(op_name, "sub") == 0)
                         return axis2_math_sub(env, node);
-                    if (AXIS2_STRCMP(op_name, "mul") == 0)
+                    if (axis2_strcmp(op_name, "mul") == 0)
                         return axis2_math_mul(env, node);
-                    if (AXIS2_STRCMP(op_name, "div") == 0)
+                    if (axis2_strcmp(op_name, "div") == 0)
                         return axis2_math_div(env, node);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Sat Mar 17 01:12:54 2007
@@ -137,14 +137,14 @@
                 prop =  axis2_ctx_get_property(ctx, env, "ADD_RESULT", AXIS2_FALSE);
                 if (prop)
                 {
-                    axis2_char_t *val = (axis2_char_t*)AXIS2_PROPERTY_GET_VALUE(prop, env);
+                    axis2_char_t *val = (axis2_char_t*)axis2_property_get_value(prop, env);
                     printf("Previous result = %s\n", val);
                 }
                 /* set value */
                 prop = axis2_property_create(env);
                 if (prop)
                 {
-                    AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(result_str, env));
+                    axis2_property_set_value(prop, env, axis2_strdup(result_str, env));
                     axis2_ctx_set_property(ctx, env, "ADD_RESULT", prop, AXIS2_FALSE);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c Sat Mar 17 01:12:54 2007
@@ -109,7 +109,7 @@
                 axis2_char_t *op_name = axiom_element_get_localname(element, env);
                 if (op_name)
                 {
-                    if (AXIS2_STRCMP(op_name, "add") == 0)
+                    if (axis2_strcmp(op_name, "add") == 0)
                         return axis2_add_add(env, node, msg_ctx);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c Sat Mar 17 01:12:54 2007
@@ -109,7 +109,7 @@
                 axis2_char_t *op_name = axiom_element_get_localname(element, env);
                 if (op_name)
                 {
-                    if (AXIS2_STRCMP(op_name, "div") == 0)
+                    if (axis2_strcmp(op_name, "div") == 0)
                         return axis2_div_div(env, node);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c Sat Mar 17 01:12:54 2007
@@ -109,7 +109,7 @@
                 axis2_char_t *op_name = axiom_element_get_localname(element, env);
                 if (op_name)
                 {
-                    if (AXIS2_STRCMP(op_name, "mul") == 0)
+                    if (axis2_strcmp(op_name, "mul") == 0)
                         return axis2_mul_mul(env, node);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c Sat Mar 17 01:12:54 2007
@@ -109,7 +109,7 @@
                 axis2_char_t *op_name = axiom_element_get_localname(element, env);
                 if (op_name)
                 {
-                    if (AXIS2_STRCMP(op_name, "sub") == 0)
+                    if (axis2_strcmp(op_name, "sub") == 0)
                         return axis2_sub_sub(env, node);
                 }
             }

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c Sat Mar 17 01:12:54 2007
@@ -38,7 +38,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c Sat Mar 17 01:12:54 2007
@@ -38,7 +38,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c Sat Mar 17 01:12:54 2007
@@ -39,7 +39,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c Sat Mar 17 01:12:54 2007
@@ -39,7 +39,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Sat Mar 17 01:12:54 2007
@@ -53,7 +53,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Sat Mar 17 01:12:54 2007
@@ -56,7 +56,7 @@
     address = "http://localhost:9090/axis2/services/echo";
     if (argc > 1)
         address = argv[1];
-    if (AXIS2_STRCMP(address, "-h") == 0)
+    if (axis2_strcmp(address, "-h") == 0)
     {
         printf("Usage : %s [endpoint_url]\n", argv[0]);
         printf("use -h for help\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Sat Mar 17 01:12:54 2007
@@ -46,7 +46,7 @@
         {
             method_get = AXIS2_TRUE;
         }
-        else if (0 == AXIS2_STRCMP(argv[1], "-h"))
+        else if (0 == axis2_strcmp(argv[1], "-h"))
         {
             printf("Usage : %s [endpoint_url]", argv[0]);
             printf(" or %s -mGET for HTTP GET\n", argv[0]);
@@ -81,13 +81,13 @@
     AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
     /* Enable REST at the client side */
     rest_property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_VALUE(rest_property, env, axis2_strdup (AXIS2_VALUE_TRUE, env));
+    axis2_property_set_value(rest_property, env, axis2_strdup (AXIS2_VALUE_TRUE, env));
     AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_ENABLE_REST,
             rest_property);
     if (AXIS2_TRUE == method_get)
     {
         get_property = axis2_property_create(env);
-        AXIS2_PROPERTY_SET_VALUE(get_property, env, axis2_strdup(AXIS2_HTTP_HEADER_GET, env));
+        axis2_property_set_value(get_property, env, axis2_strdup(AXIS2_HTTP_HEADER_GET, env));
          AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_HTTP_METHOD,
                 get_property);
     }

Modified: webservices/axis2/trunk/c/savan/src/client/savan_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Sat Mar 17 01:12:54 2007
@@ -161,14 +161,14 @@
     /* Check whether we have received a SubscribeResponse */
     sub_elem_local_name = axiom_element_get_localname(body_elem, env);
 
-    if (AXIS2_STRCMP(ELEM_NAME_SUB_RESPONSE, sub_elem_local_name) != 0)
+    if (axis2_strcmp(ELEM_NAME_SUB_RESPONSE, sub_elem_local_name) != 0)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Subscription failed");
         return AXIS2_FAILURE;
     }
 
     sub_id = savan_client_get_sub_id_from_response(body_elem, reply, env);
-    client->sub_id = AXIS2_STRDUP(sub_id, env);
+    client->sub_id = axis2_strdup(sub_id, env);
 
     return AXIS2_SUCCESS;
 }
@@ -341,7 +341,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_GETSTATUS_RESPONSE, EVENTING_NAMESPACE, NULL);
     response_elem = axiom_element_get_first_child_with_qname(body_elem, env, qname,
         body_node, &response_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     /* Now read Expires sub element */
         
@@ -349,7 +349,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_EXPIRES, EVENTING_NAMESPACE, NULL);
     expires_elem = axiom_element_get_first_child_with_qname(response_elem, env, qname,
         response_node, &expires_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     expires = axiom_element_get_text(expires_elem, env, expires_node);
     
@@ -426,20 +426,20 @@
     qname = axis2_qname_create(env, ELEM_NAME_SUB_MGR, EVENTING_NAMESPACE, NULL);
     submgr_elem = axiom_element_get_first_child_with_qname(response_elem, env, qname,
         response_node, &submgr_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     /* Get Ref Param sub element */
     qname = axis2_qname_create(env, ELEM_NAME_REF_PARAM,
         AXIS2_WSA_NAMESPACE_SUBMISSION, NULL);
     refparam_elem = axiom_element_get_first_child_with_qname(submgr_elem, env, qname,
         submgr_node, &refparam_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
 
     /* Get Identifier sub element */
     qname = axis2_qname_create(env, ELEM_NAME_ID, EVENTING_NAMESPACE, NULL);
     id_elem = axiom_element_get_first_child_with_qname(refparam_elem, env, qname,
         refparam_node, &id_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
 
     sub_id = axiom_element_get_text(id_elem, env, id_node);
 

Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Sat Mar 17 01:12:54 2007
@@ -134,7 +134,7 @@
         param = AXIS2_SVC_GET_PARAM(svc, env, SUBSCRIBER_STORE);
     }
     
-    store = (axis2_hash_t*)AXIS2_PARAM_GET_VALUE(param, env);
+    store = (axis2_hash_t*)axis2_param_get_value(param, env);
          
     /* Set the expiry time on the subscription */
     /* TODO : For now we are ignoring the Expiry sent by the client. Add support
@@ -388,7 +388,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_SUBSCRIBE, EVENTING_NAMESPACE, NULL);
     sub_elem = axiom_element_get_first_child_with_qname(body_elem, env, qname,
         body_node, &sub_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     /* Now read each sub element of Subscribe element */
         
@@ -396,7 +396,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_ENDTO, EVENTING_NAMESPACE, NULL);
     endto_elem = axiom_element_get_first_child_with_qname(sub_elem, env, qname,
         sub_node, &endto_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     endto = axiom_element_get_text(endto_elem, env, endto_node);
     
@@ -408,12 +408,12 @@
     qname = axis2_qname_create(env, ELEM_NAME_DELIVERY, EVENTING_NAMESPACE, NULL);
     delivery_elem = axiom_element_get_first_child_with_qname(sub_elem, env, qname,
         sub_node, &delivery_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     qname = axis2_qname_create(env, ELEM_NAME_NOTIFYTO, EVENTING_NAMESPACE, NULL);
     notify_elem = axiom_element_get_first_child_with_qname(delivery_elem, env, qname,
         delivery_node, &notify_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     notify = axiom_element_get_text(notify_elem, env, notify_node);
     
@@ -425,7 +425,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_EXPIRES, EVENTING_NAMESPACE, NULL);
     expires_elem = axiom_element_get_first_child_with_qname(sub_elem, env, qname,
         sub_node, &expires_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     expires = axiom_element_get_text(expires_elem, env, expires_node);
     
@@ -435,7 +435,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_FILTER, EVENTING_NAMESPACE, NULL);
     filter_elem = axiom_element_get_first_child_with_qname(sub_elem, env, qname,
         sub_node, &filter_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     filter = axiom_element_get_text(filter_elem, env, filter_node);
     
@@ -460,7 +460,7 @@
      * savan_msg_recv to send the wse:Identifier
      * Pass a copy because msg ctx free function frees all properties */
     property = axis2_property_create(env);
-    AXIS2_PROPERTY_SET_VALUE(property, env, (void*)AXIS2_STRDUP(id, env));
+    axis2_property_set_value(property, env, (void*)axis2_strdup(id, env));
      axis2_msg_ctx_set_property(msg_ctx, env, SAVAN_KEY_SUB_ID, property,
         AXIS2_FALSE);
 

Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c Sat Mar 17 01:12:54 2007
@@ -123,7 +123,7 @@
             return AXIS2_SUCCESS; /* returning FAILURE will break handler chain */
         }
         
-        store = (axis2_hash_t*)AXIS2_PARAM_GET_VALUE(param, env);
+        store = (axis2_hash_t*)axis2_param_get_value(param, env);
         if (!store)
         {
             AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan][out handler] "

Modified: webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Sat Mar 17 01:12:54 2007
@@ -222,7 +222,7 @@
     
     /* Get subscriber id from the msg ctx */
     property =  axis2_msg_ctx_get_property(msg_ctx, env, SAVAN_KEY_SUB_ID, AXIS2_FALSE);
-    id = (axis2_char_t*)AXIS2_PROPERTY_GET_VALUE(property, env);
+    id = (axis2_char_t*)axis2_property_get_value(property, env);
     
     /* Set sub id as a ref param */
     refparam_elem = axiom_element_create(env, submgr_node, ELEM_NAME_REF_PARAM,

Modified: webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Sat Mar 17 01:12:54 2007
@@ -92,7 +92,7 @@
     }
     
     /* copy the new id */
-    subscriber->id = AXIS2_STRDUP(id, env);
+    subscriber->id = axis2_strdup(id, env);
 
     return AXIS2_SUCCESS;
 }
@@ -145,7 +145,7 @@
     }
     
     /* copy the new one */
-    subscriber->delivery_mode = AXIS2_STRDUP(mode, env);
+    subscriber->delivery_mode = axis2_strdup(mode, env);
 
     return AXIS2_SUCCESS;
 }    
@@ -168,7 +168,7 @@
     }
     
     /* copy the new one */
-    subscriber->expires = AXIS2_STRDUP(expires, env);
+    subscriber->expires = axis2_strdup(expires, env);
 
     return AXIS2_SUCCESS;
 }
@@ -203,7 +203,7 @@
     }
     
     /* copy the new one */
-    subscriber->filter = AXIS2_STRDUP(filter, env);
+    subscriber->filter = axis2_strdup(filter, env);
 
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/savan/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/util/savan_util.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Sat Mar 17 01:12:54 2007
@@ -47,21 +47,21 @@
         return SAVAN_MSG_TYPE_UNKNOWN;
     }
     
-    if (AXIS2_STRCMP(action, SAVAN_ACTIONS_SUB) == 0)
+    if (axis2_strcmp(action, SAVAN_ACTIONS_SUB) == 0)
         return SAVAN_MSG_TYPE_SUB;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_SUB_RESPONSE) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_SUB_RESPONSE) == 0)
         return SAVAN_MSG_TYPE_SUB_RESPONSE;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_UNSUB) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_UNSUB) == 0)
         return SAVAN_MSG_TYPE_UNSUB;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_UNSUB_RESPONSE) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_UNSUB_RESPONSE) == 0)
         return SAVAN_MSG_TYPE_UNSUB_RESPONSE;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_GET_STATUS) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_GET_STATUS) == 0)
         return SAVAN_MSG_TYPE_GET_STATUS;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_GET_STATUS_RESPONSE) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_GET_STATUS_RESPONSE) == 0)
         return SAVAN_MSG_TYPE_GET_STATUS_RESPONSE;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_RENEW) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_RENEW) == 0)
         return SAVAN_MSG_TYPE_RENEW;
-    else if (AXIS2_STRCMP(action, SAVAN_ACTIONS_RENEW_RESPONSE) == 0)
+    else if (axis2_strcmp(action, SAVAN_ACTIONS_RENEW_RESPONSE) == 0)
         return SAVAN_MSG_TYPE_RENEW_RESPONSE;
     
     return SAVAN_MSG_TYPE_UNKNOWN;
@@ -114,7 +114,7 @@
     qname = axis2_qname_create(env, ELEM_NAME_ID, EVENTING_NAMESPACE, NULL);
     id_elem = axiom_element_get_first_child_with_qname(header_elem, env, qname,
         header_node, &id_node);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     
     /* Now read the id */
     sub_id = axiom_element_get_text(id_elem, env, id_node);
@@ -187,7 +187,7 @@
         return NULL;
     }
 
-    store = (axis2_hash_t*)AXIS2_PARAM_GET_VALUE(param, env);
+    store = (axis2_hash_t*)axis2_param_get_value(param, env);
 
     return store;
 }

Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Sat Mar 17 01:12:54 2007
@@ -104,7 +104,7 @@
                     {
                         const axis2_qname_t *qname = NULL;
                         qname = axis2_op_get_qname((axis2_op_t *)op, env);
-                        oname = AXIS2_QNAME_GET_LOCALPART(qname, env);
+                        oname = axis2_qname_get_localpart(qname, env);
                         printf("op name = %s\n", oname);
                     }
                 }
@@ -146,12 +146,12 @@
     dll_desc = axis2_dll_desc_create(env);
 
     axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
-    dll_name = AXIS2_STRACAT(axis2c_home, "/lib/libaxis2_http_receiver.so", env);
+    dll_name = axis2_stracat(axis2c_home, "/lib/libaxis2_http_receiver.so", env);
     printf("transport receiver name:%s\n", dll_name);
      axis2_dll_desc_set_name(dll_desc, env, dll_name);
      axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
     impl_info_param = axis2_param_create(env, NULL, NULL);
-    AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+    axis2_param_set_value(impl_info_param, env, dll_desc);
     axis2_class_loader_init(env);
     transport_recv = (axis2_transport_receiver_t *) axis2_class_loader_create_dll(env,
             impl_info_param);
@@ -180,12 +180,12 @@
     dll_desc = axis2_dll_desc_create(env);
 
     axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
-    dll_name = AXIS2_STRACAT(axis2c_home, "/lib/libaxis2_http_sender.so", env);
+    dll_name = axis2_stracat(axis2c_home, "/lib/libaxis2_http_sender.so", env);
     printf("transport sender name:%s\n", dll_name);
      axis2_dll_desc_set_name(dll_desc, env, dll_name);
      axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
     impl_info_param = axis2_param_create(env, NULL, NULL);
-    AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+    axis2_param_set_value(impl_info_param, env, dll_desc);
     axis2_class_loader_init(env);
     transport_sender = (axis2_transport_sender_t *) axis2_class_loader_create_dll(env,
             impl_info_param);
@@ -266,12 +266,12 @@
     }
     engage_qname = axis2_qname_create(env, "module2", NULL, NULL);
     AXIS2_CONF_ENGAGE_MODULE(axis_conf, env, engage_qname);
-    AXIS2_QNAME_FREE(engage_qname, env);
+    axis2_qname_free(engage_qname, env);
     engage_qname = NULL;
 
     engage_qname = axis2_qname_create(env, "module1", NULL, NULL);
     AXIS2_CONF_ENGAGE_MODULE(axis_conf, env, engage_qname);
-    AXIS2_QNAME_FREE(engage_qname, env);
+    axis2_qname_free(engage_qname, env);
     engage_qname = NULL;
 
     AXIS2_CONF_ENGAGE_MODULE_WITH_VERSION(axis_conf, env, "test_module", "1.92");
@@ -287,18 +287,18 @@
         {
             axis2_qname_t *engaged_mod_qname = NULL;
             engaged_mod_qname = axis2_array_list_get(engaged_modules, env, i);
-            if (0 == AXIS2_STRCMP("module2-0.92",
-                    AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, env)))
+            if (0 == axis2_strcmp("module2-0.92",
+                    axis2_qname_get_localpart(engaged_mod_qname, env)))
             {
                 found1 = AXIS2_TRUE;
             }
-            if (0 == AXIS2_STRCMP("module1",
-                    AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, env)))
+            if (0 == axis2_strcmp("module1",
+                    axis2_qname_get_localpart(engaged_mod_qname, env)))
             {
                 found2 = AXIS2_TRUE;
             }
-            if (0 == AXIS2_STRCMP("test_module-1.92",
-                    AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, env)))
+            if (0 == axis2_strcmp("test_module-1.92",
+                    axis2_qname_get_localpart(engaged_mod_qname, env)))
             {
                 found3 = AXIS2_TRUE;
             }

Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Sat Mar 17 01:12:54 2007
@@ -85,7 +85,7 @@
         printf("axis2_test_add_module_ops SUCCESS\n");
 
     AXIS2_SVC_FREE(svc, env);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     axis2_module_desc_free(module_desc, env);
     AXIS2_CONF_FREE(axis2_config, env);
 
@@ -122,7 +122,7 @@
         printf("axis2_test_svc_engage_module SUCCESS\n");
 
     AXIS2_SVC_FREE(svc, env);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
     AXIS2_CONF_FREE(axis2_config, env);
 
     return 0;
@@ -184,7 +184,7 @@
             {
                 const axis2_qname_t *qname = NULL;
                 qname = axis2_op_get_qname((axis2_op_t *)op2, env);
-                oname = AXIS2_QNAME_GET_LOCALPART(qname, env);
+                oname = axis2_qname_get_localpart(qname, env);
                 printf("op name = %s\n", oname);
             }
         }

Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Sat Mar 17 01:12:54 2007
@@ -69,7 +69,7 @@
 
      axis2_conf_ctx_free(conf_ctx, env);
      axis2_msg_ctx_free(msg_ctx, env);
-    AXIS2_QNAME_FREE(qname, env);
+    axis2_qname_free(qname, env);
      axis2_svc_grp_ctx_free(svc_grp_ctx, env);
      axis2_svc_ctx_free(svc_ctx, env);
     AXIS2_SVC_FREE(svc, env);

Modified: webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c Sat Mar 17 01:12:54 2007
@@ -103,10 +103,10 @@
     }
     printf("Starting URL Test ....\n");
     printf("Parsed URL : \n Protocol :%s|\n Server :%s|\n Port :%d|\n Path : %s|\n",
-            AXIS2_URL_GET_PROTOCOL(url, env), AXIS2_URL_GET_SERVER(url, env),
-            AXIS2_URL_GET_PORT(url, env), AXIS2_URL_GET_PATH(url, env));
+            axis2_url_get_protocol(url, env), axis2_url_get_server(url, env),
+            axis2_url_get_port(url, env), axis2_url_get_path(url, env));
     printf("End of URL Test ... \n");
-    AXIS2_URL_FREE(url, env);
+    axis2_url_free(url, env);
 }
 
 void test_http_client(const axis2_env_t *env)
@@ -130,7 +130,7 @@
             NULL, 0, NULL);
     url = axis2_url_create(env, "http", "localhost", 80,
             NULL);
-    header = axis2_http_header_create(env, "Host", AXIS2_URL_GET_SERVER(url, env));
+    header = axis2_http_header_create(env, "Host", axis2_url_get_server(url, env));
     AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
     client = axis2_http_client_create(env, url);
 
@@ -193,7 +193,7 @@
             NULL);
     /* Add an ssl certificate variable */
     /*setenv("AXIS2_SSL_CA_FILE", "cert.pem", 1);*/
-    header = axis2_http_header_create(env, "Host", AXIS2_URL_GET_SERVER(url, env));
+    header = axis2_http_header_create(env, "Host", axis2_url_get_server(url, env));
     AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
     client = axis2_http_client_create(env, url);
 

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c Sat Mar 17 01:12:54 2007
@@ -52,7 +52,7 @@
     word_to_echo = "helloworld";
     echo_type = "string";
 
-    if ((argc > 1) && (AXIS2_STRCMP("-h", argv[1]) == 0))
+    if ((argc > 1) && (axis2_strcmp("-h", argv[1]) == 0))
     {
         printf("\nUsage : %s [echo_operation] [echo_value] [XSD_type]\n",
                 argv[0]);
@@ -123,7 +123,7 @@
             ret_ele =
                 (axiom_element_t *)
                 AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
-            if (AXIS2_STRCMP
+            if (axis2_strcmp
                     (axiom_element_get_localname(ret_ele, env),
                             echo_response_buff) != 0)
             {

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c Sat Mar 17 01:12:54 2007
@@ -52,7 +52,7 @@
     word_to_echo = "helloworld";
     echo_type = "string";
 
-    if ((argc > 1) && (AXIS2_STRCMP("-h", argv[1]) == 0))
+    if ((argc > 1) && (axis2_strcmp("-h", argv[1]) == 0))
     {
         printf("\nUsage : %s [echo_operation] [echo_value] [XSD_type]\n",
                 argv[0]);
@@ -123,7 +123,7 @@
             ret_ele =
                 (axiom_element_t *)
                 AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
-            if (AXIS2_STRCMP
+            if (axis2_strcmp
                     (axiom_element_get_localname(ret_ele, env),
                             echo_response_buff) != 0)
             {

Modified: webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c Sat Mar 17 01:12:54 2007
@@ -156,7 +156,7 @@
                 {
 
 
-                    if (AXIS2_STRCMP(op_name, "add") == 0)
+                    if (axis2_strcmp(op_name, "add") == 0)
                     {
                         return  axis2_skel_calculator_add(env  ,
                                 content_node);
@@ -165,7 +165,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "sub") == 0)
+                    if (axis2_strcmp(op_name, "sub") == 0)
                     {
                         return  axis2_skel_calculator_sub(env  ,
                                 content_node);
@@ -174,7 +174,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "mul") == 0)
+                    if (axis2_strcmp(op_name, "mul") == 0)
                     {
                         return  axis2_skel_calculator_mul(env  ,
                                 content_node);
@@ -183,7 +183,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "div") == 0)
+                    if (axis2_strcmp(op_name, "div") == 0)
                     {
                         return  axis2_skel_calculator_div(env  ,
                                 content_node);

Modified: webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c Sat Mar 17 01:12:54 2007
@@ -176,7 +176,7 @@
                 {
 
 
-                    if (AXIS2_STRCMP(op_name, "echoString") == 0)
+                    if (axis2_strcmp(op_name, "echoString") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_string(env  ,
                                 content_node);
@@ -185,7 +185,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoStringArray") == 0)
+                    if (axis2_strcmp(op_name, "echoStringArray") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_string_array(env  ,
                                 content_node);
@@ -194,7 +194,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoInteger") == 0)
+                    if (axis2_strcmp(op_name, "echoInteger") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_integer(env  ,
                                 content_node);
@@ -203,7 +203,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoIntegerArray") == 0)
+                    if (axis2_strcmp(op_name, "echoIntegerArray") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_integer_array(env  ,
                                 content_node);
@@ -212,7 +212,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoFloat") == 0)
+                    if (axis2_strcmp(op_name, "echoFloat") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_float(env  ,
                                 content_node);
@@ -221,7 +221,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoFloatArray") == 0)
+                    if (axis2_strcmp(op_name, "echoFloatArray") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_float_array(env  ,
                                 content_node);
@@ -230,7 +230,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoStruct") == 0)
+                    if (axis2_strcmp(op_name, "echoStruct") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_struct(env  ,
                                 content_node);
@@ -239,7 +239,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoStructArray") == 0)
+                    if (axis2_strcmp(op_name, "echoStructArray") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_struct_array(env  ,
                                 content_node);
@@ -248,7 +248,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoVoid") == 0)
+                    if (axis2_strcmp(op_name, "echoVoid") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_void(env  ,
                                 content_node);
@@ -257,7 +257,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoBase64") == 0)
+                    if (axis2_strcmp(op_name, "echoBase64") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_base64(env  ,
                                 content_node);
@@ -266,7 +266,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoDate") == 0)
+                    if (axis2_strcmp(op_name, "echoDate") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_date(env  ,
                                 content_node);
@@ -275,7 +275,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoHexBinary") == 0)
+                    if (axis2_strcmp(op_name, "echoHexBinary") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_hex_binary(env  ,
                                 content_node);
@@ -284,7 +284,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoDecimal") == 0)
+                    if (axis2_strcmp(op_name, "echoDecimal") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_decimal(env  ,
                                 content_node);
@@ -293,7 +293,7 @@
                     }
 
 
-                    if (AXIS2_STRCMP(op_name, "echoBoolean") == 0)
+                    if (axis2_strcmp(op_name, "echoBoolean") == 0)
                     {
                         return  axis2_skel_interop_test_port_type_doc_service_echo_boolean(env  ,
                                 content_node);

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c Sat Mar 17 01:12:54 2007
@@ -471,7 +471,7 @@
      * So when importing check the target namespace here and ignore it.
      */
     target_ns = XML_SCHEMA_GET_TARGET_NAMESPACE( xml_schema, env);
-    if ( !AXIS2_STRCMP(target_ns, AXIS2_URI_2001_SCHEMA_XSD) )
+    if ( !axis2_strcmp(target_ns, AXIS2_URI_2001_SCHEMA_XSD) )
     {
         return AXIS2_SUCCESS;
     }
@@ -818,7 +818,7 @@
                 generated_type_qname = w2c_schema_compiler_generate_type_qname( compiler_impl, env, qname, parent_schema);
                 if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( schema_type, env) )
                 {
-                    local_part = AXIS2_QNAME_GET_LOCALPART( generated_type_qname, env);
+                    local_part = axis2_qname_get_localpart( generated_type_qname, env);
                     XML_SCHEMA_TYPE_SET_NAME( schema_type, env, local_part);
                     qname_str  = w2c_string_make_key_from_qname( qname, env);
                     meta_inf = axis2_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
@@ -861,7 +861,7 @@
         type_qname = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME( ref_ele, env);
         if ( type_qname != NULL)
         {
-           type_name = AXIS2_QNAME_GET_LOCALPART( type_qname, env);
+           type_name = axis2_qname_get_localpart( type_qname, env);
         }
         if( NULL != type_name )
         {
@@ -877,7 +877,7 @@
             ref_schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE( ref_ele, env);
             if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( ref_schema_type, env) )
             {
-                local_part = AXIS2_QNAME_GET_LOCALPART( generated_type_qname, env);
+                local_part = axis2_qname_get_localpart( generated_type_qname, env);
                 XML_SCHEMA_TYPE_SET_NAME( ref_schema_type, env, local_part);
                 meta_inf = axis2_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
                                                              qname_str, AXIS2_HASH_KEY_STRING);
@@ -1021,7 +1021,7 @@
          qname = axis2_qname_create_from_string( env, key);
          W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
                  env, qname, value);
-         AXIS2_QNAME_FREE( qname, env);
+         axis2_qname_free( qname, env);
     }
 
     for (hi = axis2_hash_first( compiler_impl-> all_processed_anon_type, env);
@@ -1031,7 +1031,7 @@
          qname = axis2_qname_create_from_string( env, key);
          W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
                  env, qname, value);
-         AXIS2_QNAME_FREE( qname, env);
+         axis2_qname_free( qname, env);
     }
 
     for (hi = axis2_hash_first( compiler_impl-> processed_type_map, env);
@@ -1041,7 +1041,7 @@
          qname = axis2_qname_create_from_string( env, key);
          W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
                  env, qname, value);
-         AXIS2_QNAME_FREE( qname, env);
+         axis2_qname_free( qname, env);
     }
 
     /** the processed element set which is useful  */ 
@@ -1052,7 +1052,7 @@
          qname = axis2_qname_create_from_string( env, key);
          W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
                  env, qname, value);
-         AXIS2_QNAME_FREE( qname, env);
+         axis2_qname_free( qname, env);
     }
     return compiler_impl-> base_schema_type_mapper;
 }
@@ -1067,7 +1067,7 @@
     xml_schema_t *loaded_schema = NULL;
     xml_schema_t *schema = NULL;
     
-    target_ns = AXIS2_QNAME_GET_URI( schema_type_qname, env);
+    target_ns = axis2_qname_get_uri( schema_type_qname, env);
     loaded_schema = (xml_schema_t*)axis2_hash_get( compiler_impl-> loaded_schema_map,
             target_ns, AXIS2_HASH_KEY_STRING );
     if ( loaded_schema != NULL )
@@ -1098,8 +1098,8 @@
     axis2_char_t counter_str[32];
     axis2_qname_t *qname = NULL;
 
-    ns_uri = AXIS2_QNAME_GET_URI( ref_ele_qname, env);
-    local_part = AXIS2_QNAME_GET_LOCALPART( ref_ele_qname, env);
+    ns_uri = axis2_qname_get_uri( ref_ele_qname, env);
+    local_part = axis2_qname_get_localpart( ref_ele_qname, env);
 
     while( AXIS2_TRUE)
     {
@@ -1112,7 +1112,7 @@
             return qname;
         }
         /* else */
-        AXIS2_QNAME_FREE( qname, env);
+        axis2_qname_free( qname, env);
     }
 }
 
@@ -2198,7 +2198,7 @@
     {
         qname = XML_SCHEMA_TYPE_GET_QNAME( schema_type, env);
         qname_str = w2c_string_make_key_from_qname( qname, env);
-        if ( 0 == AXIS2_STRCMP(qname_str, W2C_SCHEMA_XSD_BASE64) )
+        if ( 0 == axis2_strcmp(qname_str, W2C_SCHEMA_XSD_BASE64) )
         {
             return AXIS2_TRUE;
         }
@@ -2248,7 +2248,7 @@
             if( base_type_qname != NULL)
             {
                 qname_str = w2c_string_make_key_from_qname( base_type_qname, env);
-                nsuri = AXIS2_QNAME_GET_URI( base_type_qname, env);
+                nsuri = axis2_qname_get_uri( base_type_qname, env);
                 if ( NULL == nsuri || '\0' == *nsuri)
                 {
                     /** the blank namespace should be taken */

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c Sat Mar 17 01:12:54 2007
@@ -297,7 +297,7 @@
 
     compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
 
-    compiler_options_impl-> output_location = AXIS2_STRDUP(output_location, env);
+    compiler_options_impl-> output_location = axis2_strdup(output_location, env);
 
     return AXIS2_SUCCESS;
 }
@@ -327,7 +327,7 @@
 
     compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
 
-    compiler_options_impl-> mapper_class_package = AXIS2_STRDUP(mapper_class_package, env);
+    compiler_options_impl-> mapper_class_package = axis2_strdup(mapper_class_package, env);
 
     return AXIS2_SUCCESS;
 }
@@ -359,7 +359,7 @@
 
     compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
 
-    compiler_options_impl-> package_name = AXIS2_STRDUP(package_name, env);
+    compiler_options_impl-> package_name = axis2_strdup(package_name, env);
 
     return AXIS2_SUCCESS;
 }
@@ -512,7 +512,7 @@
 
     compiler_options_impl = W2C_INTF_TO_IMPL(compiler_options);
 
-    compiler_options_impl-> language = AXIS2_STRDUP(language, env);
+    compiler_options_impl-> language = axis2_strdup(language, env);
 
     return AXIS2_SUCCESS;
 }
@@ -584,6 +584,6 @@
 w2c_schema_compiler_options_default_name_maker( axis2_char_t *name,
                                      const axis2_env_t *env)
 {
-        return AXIS2_STRDUP( name, env);
+        return axis2_strdup( name, env);
 }
 

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c Sat Mar 17 01:12:54 2007
@@ -155,11 +155,11 @@
     schema_property_loader_impl->writer_instance = NULL;
     schema_property_loader_impl->typemapper_name = NULL;
     schema_property_loader_impl->prop_filename = NULL;
-    schema_property_loader_impl->language = AXIS2_STRDUP(language, env);
+    schema_property_loader_impl->language = axis2_strdup(language, env);
      
     axis2c_home = getenv ( "AXIS2C_HOME" );
-    path_len = AXIS2_STRLEN (axis2c_home ) + 
-             AXIS2_STRLEN (W2C_SCHEMA_PROPERTY_LOADER_DEFAULT_PROPERTIES) +
+    path_len = axis2_strlen (axis2c_home ) + 
+             axis2_strlen (W2C_SCHEMA_PROPERTY_LOADER_DEFAULT_PROPERTIES) +
              2;
     schema_property_loader_impl-> prop_filename = AXIS2_MALLOC ( env->allocator,
                                         sizeof(axis2_char_t)*path_len );
@@ -176,7 +176,7 @@
     }
 	*/
     schema_property_loader_impl-> prop_set =  axis2_properties_create( env);
-	AXIS2_PROPERTIES_LOAD( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
+	axis2_properties_load( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
 
     if ( schema_property_loader_impl-> prop_set != NULL )
     {
@@ -236,7 +236,7 @@
 
     if (schema_property_loader_impl-> prop_set)
     {
-        AXIS2_PROPERTIES_FREE( schema_property_loader_impl-> prop_set, env);
+        axis2_properties_free( schema_property_loader_impl-> prop_set, env);
     }
 
     if (schema_property_loader_impl-> prop_filename)
@@ -320,7 +320,7 @@
     
     if (schema_property_loader_impl-> prop_set)
     {
-         AXIS2_PROPERTIES_FREE ( schema_property_loader_impl->prop_set, env );
+         axis2_properties_free ( schema_property_loader_impl->prop_set, env );
     }
 	/*
     f = fopen ( schema_property_loader_impl-> prop_filename, "r+");
@@ -332,7 +332,7 @@
     }
 	*/
     schema_property_loader_impl-> prop_set =  axis2_properties_create( env);
-	AXIS2_PROPERTIES_LOAD( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
+	axis2_properties_load( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
 
     if ( schema_property_loader_impl-> prop_set != NULL )
     {
@@ -434,7 +434,7 @@
      w2c_schema_writer_t *writer = NULL;
      axis2_dll_desc_t *dll_desc = NULL;
 
-     prop_hash = AXIS2_PROPERTIES_GET_ALL( obj_impl-> prop_set, env);
+     prop_hash = axis2_properties_get_all( obj_impl-> prop_set, env);
      language = obj_impl-> language;
 
      /**
@@ -448,7 +448,7 @@
          {
             axis2_hash_this(hi, (void*)&key, NULL, (void*)&val);
             if ( w2c_string_indexof_cs ( key, language) == 0 && 
-                         (index = w2c_string_indexof ( key, '.')) == AXIS2_STRLEN(language))
+                         (index = w2c_string_indexof ( key, '.')) == axis2_strlen(language))
             {
                 if (w2c_string_indexof_cs( key,
                      W2C_SCHEMA_PROPERTY_LOADER_WRITER_CLASS) == index + 1)
@@ -466,22 +466,22 @@
                 if (w2c_string_indexof_cs( key,
                      W2C_SCHEMA_PROPERTY_LOADER_WRITER_TEMPLATE) == index + 1)
                 {
-                    obj_impl-> template_name = AXIS2_STRDUP( val, env);
+                    obj_impl-> template_name = axis2_strdup( val, env);
                 }
                 if (w2c_string_indexof_cs( key, 
                      W2C_SCHEMA_PROPERTY_LOADER_TYPEMAP) == index + 1)
                 {
-                    obj_impl-> typemapper_name = AXIS2_STRDUP( val, env);
+                    obj_impl-> typemapper_name = axis2_strdup( val, env);
                 }
                 if (w2c_string_indexof_cs( key, 
                      W2C_SCHEMA_PROPERTY_LOADER_CLASS) == index + 1)
                 {
-                    obj_impl-> default_class = AXIS2_STRDUP( val, env);
+                    obj_impl-> default_class = axis2_strdup( val, env);
                 }
                 if (w2c_string_indexof_cs( key, 
                      W2C_SCHEMA_PROPERTY_LOADER_ARRAY) == index + 1)
                 {
-                    obj_impl-> default_array = AXIS2_STRDUP( val, env);
+                    obj_impl-> default_array = axis2_strdup( val, env);
                 }
             }
          }

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c Sat Mar 17 01:12:54 2007
@@ -682,15 +682,15 @@
     
     if (schema_writer_meta_info_impl->extension_basetype)
     {
-        AXIS2_QNAME_FREE(schema_writer_meta_info_impl->extension_basetype, env);
+        axis2_qname_free(schema_writer_meta_info_impl->extension_basetype, env);
     }
     if (schema_writer_meta_info_impl->restriction_basetype)
     {
-        AXIS2_QNAME_FREE(schema_writer_meta_info_impl->restriction_basetype, env);
+        axis2_qname_free(schema_writer_meta_info_impl->restriction_basetype, env);
     }
     if (schema_writer_meta_info_impl->ownqname)
     {
-        AXIS2_QNAME_FREE(schema_writer_meta_info_impl->ownqname, env);
+        axis2_qname_free(schema_writer_meta_info_impl->ownqname, env);
     }
     if (schema_writer_meta_info_impl->nillable_qnamelist)
     {
@@ -893,7 +893,7 @@
     w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
-    writer_meta_info_impl-> enum_facet = AXIS2_STRDUP(enum_facet,env);
+    writer_meta_info_impl-> enum_facet = axis2_strdup(enum_facet,env);
     return AXIS2_SUCCESS;
 }
 axis2_char_t *AXIS2_CALL
@@ -1273,7 +1273,7 @@
                              axis2_qname_t *restriction_base_type)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-    return AXIS2_QNAME_EQUALS( W2C_INTF_TO_IMPL(schema_writer_meta_info)-> restriction_basetype,
+    return axis2_qname_equals( W2C_INTF_TO_IMPL(schema_writer_meta_info)-> restriction_basetype,
                     env,
                     restriction_base_type );
 }

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c Sat Mar 17 01:12:54 2007
@@ -100,7 +100,7 @@
     db_type = W2C_ENGINE_CONFIGURATION_GET_DATABINDING_TYPE( conf, env);
 
     /* this executes only with following configuration */
-    if ( !AXIS2_STRCMP( db_type, "adb" ) )
+    if ( !axis2_strcmp( db_type, "adb" ) )
     {
         current_typemapper = W2C_ENGINE_CONFIGURATION_GET_TYPEMAPPER( conf, env);
         status = w2c_databinding_adb_ext_invoke( env, conf);

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c Sat Mar 17 01:12:54 2007
@@ -47,9 +47,9 @@
     writer_impl = W2C_INTF_TO_IMPL(writer);
    
     /** verify unique names */ 
-    temp_name = AXIS2_QNAME_GET_LOCALPART( qname, env);
-    temp_uri = AXIS2_QNAME_GET_URI( qname, env);
-    temp_prefix = AXIS2_QNAME_GET_PREFIX( qname, env);
+    temp_name = axis2_qname_get_localpart( qname, env);
+    temp_uri = axis2_qname_get_uri( qname, env);
+    temp_prefix = axis2_qname_get_prefix( qname, env);
     temp_name = w2c_schema_writer_make_unique_class_name( writer_impl, env,
                                  writer_impl-> names_list, temp_name);
     temp_qname = axis2_qname_create( env, temp_name, temp_uri, temp_prefix);
@@ -58,7 +58,7 @@
         W2C_SCHEMA_COMPILER_OPTIONS_GET_QNAME2NAME_MAKER( writer_impl-> options, env);
     if ( qname2name_maker == NULL)
     {
-        fully_qualified_class_name = AXIS2_QNAME_GET_LOCALPART( temp_qname, env);
+        fully_qualified_class_name = axis2_qname_get_localpart( temp_qname, env);
     }
     else
     {
@@ -66,7 +66,7 @@
             W2C_QNAME2NAME_MAKER_SUGGEST_NAME( qname2name_maker, env, temp_qname);
     }
 
-    fully_qualified_class_name = AXIS2_STRDUP( fully_qualified_class_name, env);
+    fully_qualified_class_name = axis2_strdup( fully_qualified_class_name, env);
     
     name_maker = W2C_SCHEMA_COMPILER_OPTIONS_GET_NAME_MAKER_FUNC
                                             ( writer_impl-> options, env);
@@ -124,8 +124,8 @@
     axis2_char_t *model_name = NULL;
     axis2_char_t *namespace_uri = NULL;
 
-    original_name = AXIS2_QNAME_GET_LOCALPART( qname, env);
-    original_name = AXIS2_STRDUP( original_name, env);
+    original_name = axis2_qname_get_localpart( qname, env);
+    original_name = axis2_strdup( original_name, env);
     class_name = W2C_SCHEMA_WRITER_META_INFO_GET_OWN_CLASSNAME( meta_info, env);
     if( NULL == class_name )
     {
@@ -165,7 +165,7 @@
             w2c_schema_writer_parse( writer_impl, env,
                           model_source_node, out, header_template);
         }
-        namespace_uri = AXIS2_QNAME_GET_URI( qname, env);
+        namespace_uri = axis2_qname_get_uri( qname, env);
         model_name = axis2_stracat( class_name, "|", env);
         model_name = w2c_string_add_string( model_name, namespace_uri, env);
         axis2_hash_set( writer_impl-> model_map,  model_name, AXIS2_HASH_KEY_STRING, model_source_node);
@@ -196,7 +196,7 @@
                         const axis2_env_t *env,
                         axis2_char_t *c_class_name4element)
 {
-    return !(AXIS2_STRCMP( c_class_name4element, W2C_SCHEMA_C_DEFAULT_CLASS));
+    return !(axis2_strcmp( c_class_name4element, W2C_SCHEMA_C_DEFAULT_CLASS));
 }
 
 /****************** standard create and delete for DLL ************************/

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c Sat Mar 17 01:12:54 2007
@@ -197,7 +197,7 @@
 
     writer_impl = W2C_INTF_TO_IMPL(writer);
 
-    writer_impl-> template_name = AXIS2_STRDUP( template_name, env);
+    writer_impl-> template_name = axis2_strdup( template_name, env);
     writer_impl-> base_type_map = base_type_map;
 
     output = W2C_SCHEMA_COMPILER_OPTIONS_GET_OUTPUT_LOCATION( options, env);
@@ -226,7 +226,7 @@
                 "name", W2C_SCHEMA_WRITER_WRAPPED_DATABINDING_CLASS_NAME);
         if ( writer_impl-> package_name != NULL)
         {
-            length = AXIS2_STRLEN( writer_impl-> package_name);
+            length = axis2_strlen( writer_impl-> package_name);
             if ( writer_impl-> package_name[length-1] == '.' )
             {
                 writer_impl-> package_name[length-1] = '\0';
@@ -356,7 +356,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if( root_dir == NULL )
     {
-        root_dir = AXIS2_STRDUP(".", env);
+        root_dir = axis2_strdup(".", env);
     }
 
     writer_impl-> root_dir = root_dir;
@@ -385,14 +385,14 @@
 	AXIS2_ENV_CHECK(env, NULL);
 
     writer_impl = W2C_INTF_TO_IMPL(writer);
-    ns_uri = AXIS2_QNAME_GET_URI( qname, env);
+    ns_uri = axis2_qname_get_uri( qname, env);
 
     qname2name_maker =
         W2C_SCHEMA_COMPILER_OPTIONS_GET_QNAME2NAME_MAKER( writer_impl-> options, env);
 
     if ( qname2name_maker == NULL)
     {
-        original_name = AXIS2_QNAME_GET_LOCALPART( qname, env);
+        original_name = axis2_qname_get_localpart( qname, env);
     }
     else
     {
@@ -411,7 +411,7 @@
         package_prefix = 
             (writer_impl-> package_name == NULL)? 
                         (W2C_SCHEMA_WRITER_DEFAULT_PACKAGE "."):writer_impl-> package_name;
-        package_prefix = AXIS2_STRDUP( package_prefix, env);
+        package_prefix = axis2_strdup( package_prefix, env);
         package_prefix = w2c_string_add_string( package_prefix, 
                         W2C_SCHEMA_WRITER_WRAPPED_DATABINDING_CLASS_NAME, env);
     }
@@ -421,7 +421,7 @@
     }
     if( package_prefix != NULL)
     {
-        length = AXIS2_STRLEN( fully_qualified_class_name);
+        length = axis2_strlen( fully_qualified_class_name);
         fully_qualified_class_name = axis2_stracat(package_prefix,
                 (package_prefix[length-1]=='.')?"":".", env);
         fully_qualified_class_name = w2c_string_add_string(fully_qualified_class_name,
@@ -454,7 +454,7 @@
     }
     if( NULL == writer_impl-> package_name)
     {
-        package_name = AXIS2_STRDUP( base_package_name, env);
+        package_name = axis2_strdup( base_package_name, env);
     }
     else
     {
@@ -488,7 +488,7 @@
         fully_qualified_class_name =
             W2C_SCHEMA_WRITER_MAKE_FULLY_QUALIFIED_CLASS_NAME( &(writer_impl->writer), env, qname);
     }
-    length = AXIS2_STRLEN( fully_qualified_class_name);
+    length = axis2_strlen( fully_qualified_class_name);
     for ( ; length>=0 && fully_qualified_class_name[length]!= '.'; length -- );
     class_name = fully_qualified_class_name+length;
 
@@ -518,7 +518,7 @@
             w2c_schema_writer_parse( writer_impl, env,
                           model_source_node, out, source_template);
         }
-        namespace_uri = AXIS2_QNAME_GET_URI( qname, env);
+        namespace_uri = axis2_qname_get_uri( qname, env);
         model_name = axis2_stracat( class_name, "|", env);
         model_name = w2c_string_add_string( model_name, namespace_uri, env);
         axis2_hash_set( writer_impl-> model_map,  model_name, AXIS2_HASH_KEY_STRING, model_source_node);
@@ -558,15 +558,15 @@
     {
        model =  w2c_xslt_utils_add_child_node( env, "class", NULL);
     }
-    ns_uri = AXIS2_QNAME_GET_URI( qname, env);
-    prefix = AXIS2_QNAME_GET_PREFIX( qname, env);
+    ns_uri = axis2_qname_get_uri( qname, env);
+    prefix = axis2_qname_get_prefix( qname, env);
 
     prefix = w2c_schema_writer_get_prefix4uri( writer_impl, env, ns_uri, prefix);
 
     /** class_name is already name maken */
     w2c_xslt_utils_add_attribute( env, model, "name", class_name);
 
-    caps_name = AXIS2_STRDUP( class_name, env); 
+    caps_name = axis2_strdup( class_name, env); 
     caps_name = axis2_string_toupper( caps_name);
     w2c_xslt_utils_add_attribute( env, model, "caps-name", caps_name);
     AXIS2_FREE( env-> allocator, caps_name);
@@ -685,16 +685,16 @@
     
         if ( qname2name_maker == NULL)
         {
-            localpart = AXIS2_QNAME_GET_LOCALPART( qname, env);
+            localpart = axis2_qname_get_localpart( qname, env);
         }
         else
         {
             localpart = 
                 W2C_QNAME2NAME_MAKER_SUGGEST_NAME( qname2name_maker, env, qname);
         }
-        prefix = AXIS2_QNAME_GET_PREFIX( qname, env);
-        original_name = AXIS2_QNAME_GET_LOCALPART( qname, env);
-        nsuri = AXIS2_QNAME_GET_URI( qname, env);
+        prefix = axis2_qname_get_prefix( qname, env);
+        original_name = axis2_qname_get_localpart( qname, env);
+        nsuri = axis2_qname_get_uri( qname, env);
         unique_name = w2c_schema_writer_make_unique_class_name( 
                 writer_impl, env, property_names, localpart);
         parent_meta_info = W2C_SCHEMA_WRITER_META_INFO_GET_PARENT( meta_info, env);
@@ -711,14 +711,14 @@
         if( NULL != classname )
         {
             w2c_xslt_utils_add_attribute( env, property, "type", classname);
-            caps_type = AXIS2_STRDUP( classname, env);
+            caps_type = axis2_strdup( classname, env);
             caps_type = axis2_string_toupper( caps_type);
             w2c_xslt_utils_add_attribute( env, property, "caps-type", caps_type);
             AXIS2_FREE( env-> allocator, caps_type);
         }
 
              
-        caps_name = AXIS2_STRDUP( unique_name, env);
+        caps_name = axis2_strdup( unique_name, env);
 
         caps_name = axis2_string_toupper( caps_name);
         w2c_xslt_utils_add_attribute( env, property, "caps-cname", caps_name);
@@ -761,7 +761,7 @@
         }
         if ( schema_qname != NULL && schema_type != NULL)
         {
-            short_type_name = AXIS2_QNAME_GET_LOCALPART( schema_qname, env);
+            short_type_name = axis2_qname_get_localpart( schema_qname, env);
         }
         else
         {
@@ -808,8 +808,8 @@
                         const axis2_env_t *env,
                         axis2_char_t *java_class_name4element)
 {
-    return !(AXIS2_STRCMP( java_class_name4element, "DEFAULT_CLASS_NAME")) ||
-           !(AXIS2_STRCMP( java_class_name4element, "DEFAULT_CLASS_ARRAY_NAME"));
+    return !(axis2_strcmp( java_class_name4element, "DEFAULT_CLASS_NAME")) ||
+           !(axis2_strcmp( java_class_name4element, "DEFAULT_CLASS_ARRAY_NAME"));
 }
 
 axis2_char_t*
@@ -823,7 +823,7 @@
     axis2_char_t count_str[32];
     static int count = 0;
 
-    class_name = AXIS2_STRDUP( xml_name, env);
+    class_name = axis2_strdup( xml_name, env);
     present = (int)axis2_hash_get( list_of_names, xml_name, AXIS2_HASH_KEY_STRING);
     if ( present)
     {
@@ -874,7 +874,7 @@
     /*printf("%s\n", buffer);*/
 
     full_path = getenv("AXIS2C_HOME");
-    full_path = AXIS2_STRDUP ( full_path, env);
+    full_path = axis2_strdup ( full_path, env);
     full_path = w2c_string_add_string(full_path, W2C_SCHEMA_WRITER_XSLT_PATH, env );
     full_path = w2c_string_add_string(full_path, template_name, env );
 
@@ -901,28 +901,28 @@
     axis2_char_t count_str[32];
     axis2_char_t *prefix = NULL;
 
-    if ( uri == NULL || AXIS2_STRLEN( uri) ==0 )
+    if ( uri == NULL || axis2_strlen( uri) ==0 )
     {
         return NULL;
     }
     prefix = axis2_hash_get( writer_impl-> uri2prefix_map, uri, AXIS2_HASH_KEY_STRING);
     if( prefix == NULL)
     {
-        if ( default_prefix == NULL || 0 == AXIS2_STRLEN( default_prefix) )
+        if ( default_prefix == NULL || 0 == axis2_strlen( default_prefix) )
         {
             sprintf( count_str, "%d", writer_impl->last_prefix_index ++ );
             prefix = axis2_stracat( "ns", count_str, env);
         }
         else
         {
-            prefix = AXIS2_STRDUP( default_prefix, env);
+            prefix = axis2_strdup( default_prefix, env);
         }
         axis2_hash_set(writer_impl-> prefix2uri_map, prefix, AXIS2_HASH_KEY_STRING, uri);
         axis2_hash_set(writer_impl-> uri2prefix_map, uri, AXIS2_HASH_KEY_STRING, prefix);
     }
     else
     {
-        prefix = AXIS2_STRDUP( prefix, env);
+        prefix = axis2_strdup( prefix, env);
     }
     return prefix;
 }
@@ -935,7 +935,7 @@
     w2c_schema_writer_impl_t *writer_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     writer_impl = W2C_INTF_TO_IMPL(writer);
-    writer_impl-> mapping_class_package = AXIS2_STRDUP( packagename, env);
+    writer_impl-> mapping_class_package = axis2_strdup( packagename, env);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c?view=diff&rev=519261&r1=519260&r2=519261
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c Sat Mar 17 01:12:54 2007
@@ -113,7 +113,7 @@
     w2c_schema_print_message ( env, props,"schema2code.arg2");
     w2c_schema_print_message ( env, props,"schema2code.arg3");
     
-    AXIS2_PROPERTIES_FREE( props, env);
+    axis2_properties_free( props, env);
 }
 
 static void
@@ -122,6 +122,6 @@
 {
    axis2_char_t *message = NULL;
    message = (axis2_char_t *)
-                AXIS2_PROPERTIES_GET_PROPERTY(messagep, env, key); 
+                axis2_properties_get_property(messagep, env, key); 
    printf ( "%s\n", message );
 }



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


Mime
View raw message