You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 21:24:23 UTC

svn commit: r524243 [8/17] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/ guththila/samples/ guththila/src/ include/ modu...

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axiom_text.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
 #include <axutil_log_default.h>
 #include <axutil_error_default.h>
 #include <axis2_svc_client.h>
@@ -86,10 +86,10 @@
     axiom_node_t *payload = NULL;
     axiom_node_t *response = NULL;
     axis2_uri_t *wsdl_uri = NULL;
-    axis2_qname_t *op_qname = NULL;
+    axutil_qname_t *op_qname = NULL;
     axis2_svc_client_t *svc_client = NULL;
     const axis2_char_t *client_home = NULL;
-    axis2_qname_t *wsdl_svc_qname = NULL;
+    axutil_qname_t *wsdl_svc_qname = NULL;
 
 
     /* Set up deploy folder. It is from the deploy folder, the configuration
@@ -104,7 +104,7 @@
     if (!client_home || !strcmp (client_home, ""))
         client_home = "../..";
 
-    wsdl_svc_qname = axis2_qname_create(env, "Calculator",
+    wsdl_svc_qname = axutil_qname_create(env, "Calculator",
             "http://localhost/axis/Calculator", NULL);
     wsdl_uri = axis2_uri_parse_string(env, wsdl_uri_str);
     svc_client =
@@ -117,7 +117,7 @@
         return 1;
     }
     payload = build_om_programatically_for_wsdl1(env);
-    op_qname = axis2_qname_create(env, "add", "http://localhost/axis/Calculator",
+    op_qname = axutil_qname_create(env, "add", "http://localhost/axis/Calculator",
             NULL);
     response = axis2_svc_client_send_receive_with_op_qname(svc_client, env,
             op_qname, payload);
@@ -149,10 +149,10 @@
     axiom_node_t *payload = NULL;
     axiom_node_t *response = NULL;
     axis2_uri_t *wsdl_uri = NULL;
-    axis2_qname_t *op_qname = NULL;
+    axutil_qname_t *op_qname = NULL;
     axis2_svc_client_t *svc_client = NULL;
     const axis2_char_t *client_home = NULL;
-    axis2_qname_t *wsdl_svc_qname = NULL;
+    axutil_qname_t *wsdl_svc_qname = NULL;
 
     /* Set up deploy folder. It is from the deploy folder, the configuration
      * is picked up using the axis2.xml file.
@@ -166,7 +166,7 @@
     if (!client_home || !strcmp (client_home, ""))
         client_home = "../..";
 
-    wsdl_svc_qname = axis2_qname_create(env, "reservationService",
+    wsdl_svc_qname = axutil_qname_create(env, "reservationService",
             "http://greath.example.com/2004/wsdl/resSvc", NULL);
     wsdl_uri = axis2_uri_parse_string(env, wsdl_uri_str);
     svc_client =
@@ -179,7 +179,7 @@
         return -1;
     }
     payload = build_om_programatically_for_wsdl2(env);
-    op_qname = axis2_qname_create(env, "add", "http://localhost/axis/Calculator",
+    op_qname = axutil_qname_create(env, "add", "http://localhost/axis/Calculator",
             NULL);
     response = axis2_svc_client_send_receive_with_op_qname(svc_client, env,
             op_qname, payload);

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/test.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/test.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axiom_text.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
 #include <axutil_log_default.h>
 #include <axutil_error_default.h>
 #include <axis2_svc_client.h>

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c Fri Mar 30 12:24:00 2007
@@ -42,7 +42,7 @@
 void axis2_populate_axis_service(axis2_stub_t* stub, const axutil_env_t *env)
 {
     axis2_svc_client_t* svc_client = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axis2_svc_t* svc = NULL;
     axis2_op_t* op = NULL;
 
@@ -52,29 +52,29 @@
 
     /*creating the operations*/
 
-    op_qname = axis2_qname_create(env, "add" , "", NULL);
+    op_qname = axutil_qname_create(env, "add" , "", 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);
+    axutil_qname_free(op_qname, env);
 
-    op_qname = axis2_qname_create(env, "sub" , "", NULL);
+    op_qname = axutil_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);
+    axutil_qname_free(op_qname, env);
 
-    op_qname = axis2_qname_create(env, "mul" , "", NULL);
+    op_qname = axutil_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);
+    axutil_qname_free(op_qname, env);
 
-    op_qname = axis2_qname_create(env, "div" , "", NULL);
+    op_qname = axutil_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);
+    axutil_qname_free(op_qname, env);
 }
 
 axis2_stub_t *
@@ -109,14 +109,14 @@
 {
     axis2_svc_client_t *svc_client = NULL;
     axiom_node_t *ret_node = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     svc_client = axis2_stub_get_svc_client(stub, env);
-    op_qname = axis2_qname_create(env, "add" , "", NULL);
+    op_qname = axutil_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);
+    axutil_qname_free(op_qname, env);
 
     return ret_node;
 }
@@ -128,12 +128,12 @@
 {
     axis2_svc_client_t *svc_client = NULL;
     axiom_node_t *ret_node = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     svc_client = axis2_stub_get_svc_client(stub, env);
-    op_qname = axis2_qname_create(env, "sub" , "", NULL);
+    op_qname = axutil_qname_create(env, "sub" , "", NULL);
     ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
 
     return ret_node;
@@ -146,12 +146,12 @@
 {
     axis2_svc_client_t *svc_client = NULL;
     axiom_node_t *ret_node = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     svc_client = axis2_stub_get_svc_client(stub, env);
-    op_qname = axis2_qname_create(env, "mul" , "", NULL);
+    op_qname = axutil_qname_create(env, "mul" , "", NULL);
     ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
 
     return ret_node;
@@ -164,12 +164,12 @@
 {
     axis2_svc_client_t *svc_client = NULL;
     axiom_node_t *ret_node = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     svc_client = axis2_stub_get_svc_client(stub, env);
-    op_qname = axis2_qname_create(env, "div" , "", NULL);
+    op_qname = axutil_qname_create(env, "div" , "", NULL);
     ret_node =  axis2_svc_client_send_receive_with_op_qname(svc_client, env, op_qname, node);
 
     return ret_node;

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Fri Mar 30 12:24:00 2007
@@ -42,8 +42,8 @@
     axis2_svc_client_t* svc_client = NULL;
     axiom_node_t *payload = NULL;
     axiom_node_t *ret_node = NULL;
-    axis2_property_t *rest_property = NULL;
-	axis2_property_t *get_property = NULL;
+    axutil_property_t *rest_property = NULL;
+	axutil_property_t *get_property = NULL;
 	axis2_char_t *search_string = NULL;
 
 	if (argc > 1)
@@ -67,12 +67,12 @@
     options = axis2_options_create(env);
     axis2_options_set_to(options, env, endpoint_ref);
 
-    rest_property = axis2_property_create(env);
-    axis2_property_set_value(rest_property, env, axis2_strdup (env, AXIS2_VALUE_TRUE));
+    rest_property = axutil_property_create(env);
+    axutil_property_set_value(rest_property, env, axis2_strdup (env, AXIS2_VALUE_TRUE));
     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(env, AXIS2_HTTP_HEADER_GET));
+	get_property = axutil_property_create(env);
+	axutil_property_set_value(get_property, env, axis2_strdup(env, AXIS2_HTTP_HEADER_GET));
 	axis2_options_set_property(options, env, AXIS2_HTTP_METHOD, get_property);
 
     client_home = AXIS2_GETENV("AXIS2C_HOME");

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Fri Mar 30 12:24:00 2007
@@ -132,19 +132,19 @@
             ctx =  axis2_svc_grp_ctx_get_base(svc_grp_ctx, env);
             if (ctx)
             {
-                axis2_property_t* prop = NULL;
+                axutil_property_t* prop = NULL;
                 /* get value */
                 prop =  axis2_ctx_get_property(ctx, env, "ADD_RESULT");
                 if (prop)
                 {
-                    axis2_char_t *val = (axis2_char_t*)axis2_property_get_value(prop, env);
+                    axis2_char_t *val = (axis2_char_t*)axutil_property_get_value(prop, env);
                     printf("Previous result = %s\n", val);
                 }
                 /* set value */
-                prop = axis2_property_create(env);
+                prop = axutil_property_create(env);
                 if (prop)
                 {
-                    axis2_property_set_value(prop, env, axis2_strdup(env, result_str));
+                    axutil_property_set_value(prop, env, axis2_strdup(env, result_str));
                     axis2_ctx_set_property(ctx, env, "ADD_RESULT", prop);
                 }
             }

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=524243&r1=524242&r2=524243
==============================================================================
--- 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 Fri Mar 30 12:24:00 2007
@@ -30,7 +30,7 @@
     axis2_svc_client_t* svc_client = NULL;
     axiom_node_t *payload = NULL;
     axiom_node_t *ret_node = NULL;
-    axis2_string_t *soap_action = NULL;
+    axutil_string_t *soap_action = NULL;
 
     /* Set up the environment */
     env = axutil_env_create_all("echo_blocking_soap11.log", AXIS2_LOG_LEVEL_TRACE);
@@ -54,9 +54,9 @@
     options = axis2_options_create(env);
     axis2_options_set_to(options, env, endpoint_ref);
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
-    soap_action = axis2_string_create(env, "http://ws.apache.org/axis2/c/samples/echo/soap_action");
+    soap_action = axutil_string_create(env, "http://ws.apache.org/axis2/c/samples/echo/soap_action");
     axis2_options_set_soap_action(options, env, soap_action);
-    axis2_string_free(soap_action, env);
+    axutil_string_free(soap_action, env);
 
     /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
      * using the axis2.xml file.

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Fri Mar 30 12:24:00 2007
@@ -32,8 +32,8 @@
     axiom_node_t *payload = NULL;
     axiom_node_t *ret_node = NULL;
     axis2_bool_t method_get = AXIS2_FALSE;
-    axis2_property_t *rest_property = NULL;
-	axis2_property_t *get_property = NULL;
+    axutil_property_t *rest_property = NULL;
+	axutil_property_t *get_property = NULL;
 
     /* Set up the environment */
     env = axutil_env_create_all("echo_rest.log", AXIS2_LOG_LEVEL_TRACE);
@@ -80,14 +80,14 @@
     options = axis2_options_create(env);
     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 (env, AXIS2_VALUE_TRUE));
+    rest_property = axutil_property_create(env);
+    axutil_property_set_value(rest_property, env, axis2_strdup (env, AXIS2_VALUE_TRUE));
     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(env, AXIS2_HTTP_HEADER_GET));
+        get_property = axutil_property_create(env);
+        axutil_property_set_value(get_property, env, axis2_strdup(env, AXIS2_HTTP_HEADER_GET));
          axis2_options_set_property(options, env, AXIS2_HTTP_METHOD,
                 get_property);
     }

Modified: webservices/axis2/trunk/c/savan/include/mod_savan.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/include/mod_savan.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/include/mod_savan.h (original)
+++ webservices/axis2/trunk/c/savan/include/mod_savan.h Fri Mar 30 12:24:00 2007
@@ -31,11 +31,11 @@
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL 
 savan_in_handler_create(const axutil_env_t *env, 
-                     axis2_qname_t *qname);
+                     axutil_qname_t *qname);
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL 
 savan_out_handler_create(const axutil_env_t *env, 
-                       axis2_qname_t *qname);
+                       axutil_qname_t *qname);
     
 /** @} */
     

Modified: webservices/axis2/trunk/c/savan/include/savan_msg_recv.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/include/savan_msg_recv.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/include/savan_msg_recv.h (original)
+++ webservices/axis2/trunk/c/savan/include/savan_msg_recv.h Fri Mar 30 12:24:00 2007
@@ -32,7 +32,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_msg_recv.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c (original)
+++ webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
 #include <axis2_svc_client.h>
 #include <axis2_options.h>
 #include <axis2_op.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 #include <savan.h>
 

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Fri Mar 30 12:24:00 2007
@@ -290,7 +290,7 @@
 {
     axis2_options_t *wsa_options = NULL;
     const axis2_char_t *old_action = NULL;
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     axiom_namespace_t *ns = NULL;
     axiom_node_t *reply = NULL;
     axiom_node_t *status_node = NULL;
@@ -338,18 +338,18 @@
     body_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(reply, env);
     
     /* Get Subscribe element from Body */
-    qname = axis2_qname_create(env, ELEM_NAME_GETSTATUS_RESPONSE, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     /* Now read Expires sub element */
         
     /* Expires */
-    qname = axis2_qname_create(env, ELEM_NAME_EXPIRES, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     expires = axiom_element_get_text(expires_elem, env, expires_node);
     
@@ -406,7 +406,7 @@
     axiom_node_t *response_node,
     const axutil_env_t *env)
 {
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     axiom_element_t *submgr_elem = NULL;
     axiom_element_t *refparam_elem = NULL;
     axiom_element_t *id_elem = NULL;
@@ -423,23 +423,23 @@
      */
 
     /* Get Sub Mgr sub element */
-    qname = axis2_qname_create(env, ELEM_NAME_SUB_MGR, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     /* Get Ref Param sub element */
-    qname = axis2_qname_create(env, ELEM_NAME_REF_PARAM,
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
 
     /* Get Identifier sub element */
-    qname = axis2_qname_create(env, ELEM_NAME_ID, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
 
     sub_id = axiom_element_get_text(id_elem, env, id_node);
 

Modified: webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_publishing_client.c Fri Mar 30 12:24:00 2007
@@ -71,7 +71,7 @@
     axis2_endpoint_ref_t* endpoint_ref = NULL;
     axis2_options_t *options = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_qname_t *op_qname = NULL;
+    axutil_qname_t *op_qname = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -92,7 +92,7 @@
     axis2_options_set_action(options, env,
             "http://ws.apache.org/axis2/c/savan/dummy");
     
-    op_qname = axis2_qname_create(env, "publish", NULL, NULL);
+    op_qname = axutil_qname_create(env, "publish", NULL, NULL);
         
     /* Create service client */
     svc_client = axis2_svc_client_create_with_conf_ctx_and_svc(env, repo_path,

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Fri Mar 30 12:24:00 2007
@@ -94,7 +94,7 @@
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_svc_t *svc = NULL;
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
     axutil_hash_t *store = NULL;
     savan_subscriber_t *subscriber = NULL;
     axis2_char_t *expires = NULL;
@@ -134,7 +134,7 @@
         param = axis2_svc_get_param(svc, env, SUBSCRIBER_STORE);
     }
     
-    store = (axutil_hash_t*)axis2_param_get_value(param, env);
+    store = (axutil_hash_t*)axutil_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
@@ -276,7 +276,7 @@
     const axutil_env_t *env)
 {
     axutil_hash_t *store = NULL;
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -292,7 +292,7 @@
     }
     
     /* Add the hash map as a parameter to the given service */
-    param = axis2_param_create(env, SUBSCRIBER_STORE, (void*)store);
+    param = axutil_param_create(env, SUBSCRIBER_STORE, (void*)store);
     if (!param)
     {
         /* TODO : error reporting */
@@ -315,7 +315,7 @@
     axis2_char_t *sub_id = NULL;
     axiom_soap_envelope_t *envelope = NULL;
     axiom_soap_body_t *body = NULL;
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     
     axiom_node_t *body_node = NULL;
     axiom_node_t *sub_node = NULL;
@@ -385,18 +385,18 @@
     body_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
     
     /* Get Subscribe element from Body */
-    qname = axis2_qname_create(env, ELEM_NAME_SUBSCRIBE, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     /* Now read each sub element of Subscribe element */
         
     /* EndTo */
-    qname = axis2_qname_create(env, ELEM_NAME_ENDTO, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     endto = axiom_element_get_text(endto_elem, env, endto_node);
     
@@ -405,15 +405,15 @@
     savan_subscriber_set_end_to(subscriber, env, endto_epr);
     
     /* Get Delivery element and read NotifyTo */
-    qname = axis2_qname_create(env, ELEM_NAME_DELIVERY, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
-    qname = axis2_qname_create(env, ELEM_NAME_NOTIFYTO, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     notify = axiom_element_get_text(notify_elem, env, notify_node);
     
@@ -422,20 +422,20 @@
     savan_subscriber_set_notify_to(subscriber, env, notify_epr);
     
     /* Expires */
-    qname = axis2_qname_create(env, ELEM_NAME_EXPIRES, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     expires = axiom_element_get_text(expires_elem, env, expires_node);
     
     savan_subscriber_set_expires(subscriber, env, expires);
     
     /* Filter */
-    qname = axis2_qname_create(env, ELEM_NAME_FILTER, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     filter = axiom_element_get_text(filter_elem, env, filter_node);
     
@@ -452,15 +452,15 @@
     axis2_msg_ctx_t *msg_ctx,
     axis2_char_t *id)
 {
-    axis2_property_t *property = NULL;
+    axutil_property_t *property = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     /* Set the subscription id as a property in the msg_ctx. We use this inside
      * 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(env, id));
+    property = axutil_property_create(env);
+    axutil_property_set_value(property, env, (void*)axis2_strdup(env, id));
      axis2_msg_ctx_set_property(msg_ctx, env, SAVAN_KEY_SUB_ID, property,
         AXIS2_FALSE);
 

Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_in_handler.c Fri Mar 30 12:24:00 2007
@@ -24,7 +24,7 @@
 #include <axis2_msg_ctx.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_msg_info_headers.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
 #include <axis2_engine.h>
 #include <axis2_svc.h>
 
@@ -46,7 +46,7 @@
 
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
 savan_in_handler_create(const axutil_env_t *env, 
-                         axis2_qname_t *qname) 
+                         axutil_qname_t *qname) 
 {
     axis2_handler_t *handler = NULL;
     

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_msg_ctx.h>
 #include <axis2_conf_ctx.h>
 #include <axis2_msg_info_headers.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
 
 #include <savan_constants.h>
 #include <savan_error.h>
@@ -50,7 +50,7 @@
 AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
 savan_out_handler_create(
     const axutil_env_t *env, 
-    axis2_qname_t *qname) 
+    axutil_qname_t *qname) 
 {
     axis2_handler_t *handler = NULL;
     
@@ -81,7 +81,7 @@
 {
     savan_message_types_t msg_type = SAVAN_MSG_TYPE_UNKNOWN;
     /*axis2_svc_t *svc = NULL;*/
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
     axutil_hash_t *store = NULL;
     const axis2_svc_t *svc = NULL;
     const axis2_char_t *svc_name = NULL;
@@ -123,7 +123,7 @@
             return AXIS2_SUCCESS; /* returning FAILURE will break handler chain */
         }
         
-        store = (axutil_hash_t*)axis2_param_get_value(param, env);
+        store = (axutil_hash_t*)axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
 #include <axiom_soap_header.h>
 #include <axiom_soap_body.h>
 #include <axiom_soap_fault.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
 #include <axis2_addr.h>
 
 #include <savan_util.h>
@@ -164,7 +164,7 @@
     axis2_msg_info_headers_t* old_info_header = NULL;
     axiom_soap_envelope_t *default_envelope = NULL;
     axiom_node_t *body_node = NULL;
-    axis2_property_t *property = NULL;
+    axutil_property_t *property = NULL;
     axiom_node_t *response_node = NULL;
     axiom_node_t *submgr_node = NULL;
     axiom_node_t *addr_node = NULL;
@@ -221,7 +221,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*)axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Fri Mar 30 12:24:00 2007
@@ -224,7 +224,7 @@
     axis2_char_t *path = NULL;
     axis2_options_t *options = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
-    axis2_qname_t *op_qname = NULL;
+    axutil_qname_t *op_qname = NULL;
 
     printf("[savan][subscribe] publish...\n");
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan][subscribe] publish...");
@@ -250,7 +250,7 @@
     /* Engage addressing module */
     /*axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);*/
     
-    op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
+    op_qname = axutil_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
 
     op_client = axis2_svc_client_create_op_client(svc_client, env,
         op_qname);

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Fri Mar 30 12:24:00 2007
@@ -77,7 +77,7 @@
     axis2_char_t *sub_id = NULL;
     axiom_soap_envelope_t *envelope = NULL;
     axiom_soap_header_t *header = NULL;
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     axiom_node_t *header_node = NULL;
     axiom_node_t *id_node = NULL;
     axiom_element_t *header_elem = NULL;
@@ -111,10 +111,10 @@
     header_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
     
     /* Get Identifier element from header */
-    qname = axis2_qname_create(env, ELEM_NAME_ID, EVENTING_NAMESPACE, NULL);
+    qname = axutil_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);
+    axutil_qname_free(qname, env);
     
     /* Now read the id */
     sub_id = axiom_element_get_text(id_elem, env, id_node);
@@ -163,7 +163,7 @@
     axis2_msg_ctx_t *msg_ctx)
 {
     axis2_svc_t *svc = NULL;
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
     axutil_hash_t *store = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
@@ -187,7 +187,7 @@
         return NULL;
     }
 
-    store = (axutil_hash_t*)axis2_param_get_value(param, env);
+    store = (axutil_hash_t*)axutil_param_get_value(param, env);
 
     return store;
 }

Modified: webservices/axis2/trunk/c/test/core/context/test_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/test_context.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/test_context.c (original)
+++ webservices/axis2/trunk/c/test/core/context/test_context.c Fri Mar 30 12:24:00 2007
@@ -34,8 +34,8 @@
     struct axis2_svc_ctx *svc_ctx2 = NULL;
     struct axis2_svc *svc1 = NULL;
     struct axis2_svc *svc2 = NULL;
-    struct axis2_qname *qname1 = NULL;
-    struct axis2_qname *qname2 = NULL;
+    struct axutil_qname *qname1 = NULL;
+    struct axutil_qname *qname2 = NULL;
     struct axis2_op_ctx *op_ctx1 = NULL;
     struct axis2_op_ctx *op_ctx2 = NULL;
     struct axis2_op *op = NULL;
@@ -59,8 +59,8 @@
     svc_grp_ctx1 = axis2_svc_grp_ctx_create(env, svc_grp1, conf_ctx);
     svc_grp_ctx2 = axis2_svc_grp_ctx_create(env, svc_grp2, conf_ctx);
 
-    qname1 = axis2_qname_create(env, "name1", NULL, NULL);
-    qname2 = axis2_qname_create(env, "name2", NULL, NULL);
+    qname1 = axutil_qname_create(env, "name1", NULL, NULL);
+    qname2 = axutil_qname_create(env, "name2", NULL, NULL);
 
     svc1 = axis2_svc_create_with_qname(env, qname1);
     svc2 = axis2_svc_create_with_qname(env, qname2);

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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Fri Mar 30 12:24:00 2007
@@ -77,7 +77,7 @@
         {
             axutil_hash_t *ops = NULL;
             axis2_svc_t *svc = NULL;
-            axis2_param_t *impl_info_param = NULL;
+            axutil_param_t *impl_info_param = NULL;
 
             axutil_hash_this(hi, NULL, NULL, &service);
             svc = (axis2_svc_t *) service;
@@ -102,9 +102,9 @@
                     axutil_hash_this(hi2, NULL, NULL, &op);
                     if (op)
                     {
-                        const axis2_qname_t *qname = NULL;
+                        const axutil_qname_t *qname = NULL;
                         qname = axis2_op_get_qname((axis2_op_t *)op, env);
-                        oname = axis2_qname_get_localpart(qname, env);
+                        oname = axutil_qname_get_localpart(qname, env);
                         printf("op name = %s\n", oname);
                     }
                 }
@@ -135,7 +135,7 @@
     axutil_dll_desc_t *dll_desc = NULL;
     axis2_char_t *dll_name = NULL;
     axis2_transport_receiver_t *transport_recv = NULL;
-    axis2_param_t *impl_info_param = NULL;
+    axutil_param_t *impl_info_param = NULL;
     axis2_bool_t is_running = AXIS2_FALSE;
     axis2_char_t *axis2c_home = NULL;
 
@@ -150,8 +150,8 @@
     printf("transport receiver name:%s\n", dll_name);
      axutil_dll_desc_set_name(dll_desc, env, dll_name);
      axutil_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);
+    impl_info_param = axutil_param_create(env, NULL, NULL);
+    axutil_param_set_value(impl_info_param, env, dll_desc);
     axutil_class_loader_init(env);
     transport_recv = (axis2_transport_receiver_t *) axutil_class_loader_create_dll(env,
             impl_info_param);
@@ -167,7 +167,7 @@
     axutil_dll_desc_t *dll_desc = NULL;
     axis2_char_t *dll_name = NULL;
     axis2_transport_sender_t *transport_sender = NULL;
-    axis2_param_t *impl_info_param = NULL;
+    axutil_param_t *impl_info_param = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t *axis2c_home = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
@@ -184,8 +184,8 @@
     printf("transport sender name:%s\n", dll_name);
      axutil_dll_desc_set_name(dll_desc, env, dll_name);
      axutil_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);
+    impl_info_param = axutil_param_create(env, NULL, NULL);
+    axutil_param_set_value(impl_info_param, env, dll_desc);
     axutil_class_loader_init(env);
     transport_sender = (axis2_transport_sender_t *) axutil_class_loader_create_dll(env,
             impl_info_param);
@@ -201,11 +201,11 @@
 {
 
     axis2_conf_t *axis_conf = NULL;
-    axis2_qname_t *mod_qname1 = NULL;
-    axis2_qname_t *mod_qname2 = NULL;
-    axis2_qname_t *mod_qname3 = NULL;
-    axis2_qname_t *mod_qname4 = NULL;
-    axis2_qname_t *mod_qname5 = NULL;
+    axutil_qname_t *mod_qname1 = NULL;
+    axutil_qname_t *mod_qname2 = NULL;
+    axutil_qname_t *mod_qname3 = NULL;
+    axutil_qname_t *mod_qname4 = NULL;
+    axutil_qname_t *mod_qname5 = NULL;
     axis2_module_desc_t *module1 = NULL;
     axis2_module_desc_t *module2 = NULL;
     axis2_module_desc_t *module3 = NULL;
@@ -213,7 +213,7 @@
     axis2_module_desc_t *module5 = NULL;
     axis2_module_desc_t *def_mod = NULL;
     axutil_array_list_t *engaged_modules = NULL;
-    axis2_qname_t *engage_qname = NULL;
+    axutil_qname_t *engage_qname = NULL;
     axis2_bool_t found1 = AXIS2_FALSE;
     axis2_bool_t found2 = AXIS2_FALSE;
     axis2_bool_t found3 = AXIS2_FALSE;
@@ -224,23 +224,23 @@
 
 
     axis_conf = axis2_conf_create(env);
-    mod_qname1 = axis2_qname_create(env, "module1", NULL, NULL);
+    mod_qname1 = axutil_qname_create(env, "module1", NULL, NULL);
     module1 = axis2_module_desc_create_with_qname(env, mod_qname1);
      axis2_conf_add_module(axis_conf, env, module1);
 
-    mod_qname2 = axis2_qname_create(env, "module2-0.90", NULL, NULL);
+    mod_qname2 = axutil_qname_create(env, "module2-0.90", NULL, NULL);
     module2 = axis2_module_desc_create_with_qname(env, mod_qname2);
      axis2_conf_add_module(axis_conf, env, module2);
 
-    mod_qname3 = axis2_qname_create(env, "module2-0.92", NULL, NULL);
+    mod_qname3 = axutil_qname_create(env, "module2-0.92", NULL, NULL);
     module3 = axis2_module_desc_create_with_qname(env, mod_qname3);
      axis2_conf_add_module(axis_conf, env, module3);
 
-    mod_qname4 = axis2_qname_create(env, "module2-0.91", NULL, NULL);
+    mod_qname4 = axutil_qname_create(env, "module2-0.91", NULL, NULL);
     module4 = axis2_module_desc_create_with_qname(env, mod_qname4);
      axis2_conf_add_module(axis_conf, env, module4);
 
-    mod_qname5 = axis2_qname_create(env, "test_module-1.92", NULL, NULL);
+    mod_qname5 = axutil_qname_create(env, "test_module-1.92", NULL, NULL);
     module5 = axis2_module_desc_create_with_qname(env, mod_qname5);
      axis2_conf_add_module(axis_conf, env, module5);
 
@@ -264,14 +264,14 @@
         printf("axis2_default_module_version (test_module) .. FAILED\n");
         return AXIS2_FAILURE;
     }
-    engage_qname = axis2_qname_create(env, "module2", NULL, NULL);
+    engage_qname = axutil_qname_create(env, "module2", NULL, NULL);
      axis2_conf_engage_module(axis_conf, env, engage_qname);
-    axis2_qname_free(engage_qname, env);
+    axutil_qname_free(engage_qname, env);
     engage_qname = NULL;
 
-    engage_qname = axis2_qname_create(env, "module1", NULL, NULL);
+    engage_qname = axutil_qname_create(env, "module1", NULL, NULL);
      axis2_conf_engage_module(axis_conf, env, engage_qname);
-    axis2_qname_free(engage_qname, env);
+    axutil_qname_free(engage_qname, env);
     engage_qname = NULL;
 
      axis2_conf_engage_module_with_version(axis_conf, env, "test_module", "1.92");
@@ -285,20 +285,20 @@
         list_size = axutil_array_list_size(engaged_modules, env);
         for (i = 0; i < list_size; i++)
         {
-            axis2_qname_t *engaged_mod_qname = NULL;
+            axutil_qname_t *engaged_mod_qname = NULL;
             engaged_mod_qname = axutil_array_list_get(engaged_modules, env, i);
             if (0 == axis2_strcmp("module2-0.92",
-                    axis2_qname_get_localpart(engaged_mod_qname, env)))
+                    axutil_qname_get_localpart(engaged_mod_qname, env)))
             {
                 found1 = AXIS2_TRUE;
             }
             if (0 == axis2_strcmp("module1",
-                    axis2_qname_get_localpart(engaged_mod_qname, env)))
+                    axutil_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)))
+                    axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Fri Mar 30 12:24:00 2007
@@ -59,7 +59,7 @@
 int axis2_test_svc_add_module_ops()
 {
     struct axis2_svc *svc = NULL;
-    struct axis2_qname *qname = NULL;
+    struct axutil_qname *qname = NULL;
     struct axis2_module_desc *module_desc = NULL;
     struct axis2_conf *axis2_config = NULL;
 
@@ -72,7 +72,7 @@
 
     axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axutil_env_t *env = axutil_env_create(allocator);
-    qname = axis2_qname_create(env, "name1", NULL, NULL);
+    qname = axutil_qname_create(env, "name1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
     module_desc = axis2_module_desc_create(env);
     axis2_config = axis2_conf_create(env);
@@ -85,7 +85,7 @@
         printf("axis2_test_add_module_ops SUCCESS\n");
 
     axis2_svc_free(svc, env);
-    axis2_qname_free(qname, env);
+    axutil_qname_free(qname, env);
     axis2_module_desc_free(module_desc, env);
      axis2_conf_free(axis2_config, env);
 
@@ -95,7 +95,7 @@
 int axis2_test_svc_engage_module()
 {
     axis2_svc_t *svc = NULL;
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     axis2_module_desc_t *moduleref = NULL;
     axis2_conf_t *axis2_config = NULL;
     axis2_status_t status = AXIS2_FAILURE;
@@ -107,7 +107,7 @@
 
     axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axutil_env_t *env = axutil_env_create(allocator);
-    qname = axis2_qname_create(env, "name1", NULL, NULL);
+    qname = axutil_qname_create(env, "name1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
     moduleref = axis2_module_desc_create(env);
     axis2_config = axis2_conf_create(env);
@@ -122,7 +122,7 @@
         printf("axis2_test_svc_engage_module SUCCESS\n");
 
     axis2_svc_free(svc, env);
-    axis2_qname_free(qname, env);
+    axutil_qname_free(qname, env);
      axis2_conf_free(axis2_config, env);
 
     return 0;
@@ -131,7 +131,7 @@
 int axis2_test_svc_get_op()
 {
     struct axis2_svc *svc = NULL;
-    struct axis2_qname *qname = NULL;
+    struct axutil_qname *qname = NULL;
     struct axutil_hash_t *ops = NULL;
     struct axis2_op *op = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
@@ -143,14 +143,14 @@
 
     axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     const axutil_env_t *env = axutil_env_create(allocator);
-    qname = axis2_qname_create(env, "op1", NULL, NULL);
+    qname = axutil_qname_create(env, "op1", NULL, NULL);
     op = axis2_op_create_with_qname(env, qname);
-    qname = axis2_qname_create(env, "svc1", NULL, NULL);
+    qname = axutil_qname_create(env, "svc1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
 
     status = axis2_svc_add_op(svc, env, op);
 
-    qname = axis2_qname_create(env, "op2", NULL, NULL);
+    qname = axutil_qname_create(env, "op2", NULL, NULL);
     op = axis2_op_create_with_qname(env, qname);
     status = axis2_svc_add_op(svc, env, op);
 
@@ -182,9 +182,9 @@
             axutil_hash_this(hi2, NULL, NULL, &op2);
             if (op2)
             {
-                const axis2_qname_t *qname = NULL;
+                const axutil_qname_t *qname = NULL;
                 qname = axis2_op_get_qname((axis2_op_t *)op2, env);
-                oname = axis2_qname_get_localpart(qname, env);
+                oname = axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Fri Mar 30 12:24:00 2007
@@ -38,14 +38,14 @@
     struct axis2_svc_ctx *svc_ctx;
     struct axis2_svc_grp *svc_grp;
     struct axis2_svc_grp_ctx *svc_grp_ctx;
-    struct axis2_qname *qname;
+    struct axutil_qname *qname;
 
     conf_ctx = axis2_conf_ctx_create(env, conf);
 
     svc_grp = axis2_svc_grp_create(env);
     svc_grp_ctx = axis2_svc_grp_ctx_create(env, svc_grp, conf_ctx);
 
-    qname = axis2_qname_create(env, "name1", NULL, NULL);
+    qname = axutil_qname_create(env, "name1", NULL, NULL);
     svc = axis2_svc_create_with_qname(env, qname);
     svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
 
@@ -69,7 +69,7 @@
 
      axis2_conf_ctx_free(conf_ctx, env);
      axis2_msg_ctx_free(msg_ctx, env);
-    axis2_qname_free(qname, env);
+    axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- 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 Fri Mar 30 12:24:00 2007
@@ -116,7 +116,7 @@
     axis2_http_request_line_t *request_line = NULL;
     axis2_url_t *url = NULL;
     axis2_http_header_t *header = NULL;
-    axis2_stream_t *request_body = NULL;
+    axutil_stream_t *request_body = NULL;
     axis2_http_simple_response_t *response = NULL;
     int status = 0;
     char *body_bytes = NULL;
@@ -125,7 +125,7 @@
     printf("Starting http_client tests\n");
     request_line = axis2_http_request_line_create(env, "GET",
             "/axis2/services", "HTTP/1.0");
-    request_body = axis2_stream_create_basic(env);
+    request_body = axutil_stream_create_basic(env);
     request = axis2_http_simple_request_create(env, request_line,
             NULL, 0, NULL);
     url = axis2_url_create(env, "http", "localhost", 80,
@@ -177,7 +177,7 @@
     axis2_http_request_line_t *request_line = NULL;
     axis2_url_t *url = NULL;
     axis2_http_header_t *header = NULL;
-    axis2_stream_t *request_body = NULL;
+    axutil_stream_t *request_body = NULL;
     axis2_http_simple_response_t *response = NULL;
     int status = 0;
     char *body_bytes = NULL;
@@ -186,7 +186,7 @@
     printf("Starting https_client tests\n");
     request_line = axis2_http_request_line_create(env, "GET",
             "/", "HTTP/1.0");
-    request_body = axis2_stream_create_basic(env);
+    request_body = axutil_stream_create_basic(env);
     request = axis2_http_simple_request_create(env, request_line,
             NULL, 0, NULL);
     url = axis2_url_create(env, "https", "localhost", 9090,

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h Fri Mar 30 12:24:00 2007
@@ -25,7 +25,7 @@
 
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_properties.h>
+#include <axutil_properties.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -47,7 +47,7 @@
  * @param file_name     name of the file
  * @return the hash including the messages
  */
-AXIS2_EXTERN axis2_properties_t* AXIS2_CALL
+AXIS2_EXTERN axutil_properties_t* AXIS2_CALL
 w2c_messages_get_message_properties( 
     const axutil_env_t *env );
 
@@ -78,7 +78,7 @@
  */
 AXIS2_EXTERN void AXIS2_CALL
 w2c_messages_print_n_log_error_from_properties( const axutil_env_t *env,
-                                          axis2_properties_t *props,
+                                          axutil_properties_t *props,
                                           axis2_char_t *key );
 
 /** @} */

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h Fri Mar 30 12:24:00 2007
@@ -24,7 +24,7 @@
  */
 
 #include <axis2_utils.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -63,7 +63,7 @@
     axis2_char_t* (AXIS2_CALL *
     suggest_name)(w2c_qname2name_maker_t *qname2name_maker,
          const axutil_env_t *env,
-         axis2_qname_t *qname);
+         axutil_qname_t *qname);
 
 
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h Fri Mar 30 12:24:00 2007
@@ -30,7 +30,7 @@
 #include <w2c_schema_writer_meta_info.h>
 #include <xml_schema_complex_type.h>
 #include <xml_schema_simple_type.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -100,7 +100,7 @@
     axis2_char_t* (AXIS2_CALL *
     make_fully_qualified_class_name)( w2c_schema_writer_t *writer,
         const axutil_env_t *env,
-        axis2_qname_t *qname);
+        axutil_qname_t *qname);
 
 
     axis2_status_t (AXIS2_CALL *

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h Fri Mar 30 12:24:00 2007
@@ -289,14 +289,14 @@
     axis2_status_t (AXIS2_CALL *
     set_extension_basetype)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axutil_env_t *env,
-                            axis2_qname_t *extension_basetype);
+                            axutil_qname_t *extension_basetype);
    /**
     * getter for extension_basetype.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
     * @param  value for the extension_basetype
     */
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_extension_basetype)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axutil_env_t *env);
 
@@ -311,14 +311,14 @@
     axis2_status_t (AXIS2_CALL *
     set_restriction_basetype)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axutil_env_t *env,
-                            axis2_qname_t *restriction_basetype);
+                            axutil_qname_t *restriction_basetype);
    /**
     * getter for restriction_basetype.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
     * @param  value for the restriction_basetype
     */
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_restriction_basetype)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axutil_env_t *env);
 
@@ -333,14 +333,14 @@
     axis2_status_t (AXIS2_CALL *
     set_ownqname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axutil_env_t *env,
-                            axis2_qname_t *ownqname);
+                            axutil_qname_t *ownqname);
    /**
     * getter for ownqname.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
     * @param  value for the ownqname
     */
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ownqname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axutil_env_t *env);
 
@@ -639,7 +639,7 @@
     axis2_bool_t (AXIS2_CALL *
     is_restriction_base_type)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                          const axutil_env_t *env,
-                         axis2_qname_t *restriction_base_type);
+                         axutil_qname_t *restriction_base_type);
 
    /**
     * register nillable qname.
@@ -652,86 +652,86 @@
     axis2_status_t (AXIS2_CALL *
     register_nillable_qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                          const axutil_env_t *env,
-                         axis2_qname_t *qname);
+                         axutil_qname_t *qname);
     
     axis2_bool_t (AXIS2_CALL *
     is_nillable)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                          const axutil_env_t *env,
-                         axis2_qname_t *qname);
+                         axutil_qname_t *qname);
 
 
     axis2_status_t (AXIS2_CALL *
     register_mapping)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname,
-                             axis2_qname_t *schema_name,
+                             axutil_qname_t *qname,
+                             axutil_qname_t *schema_name,
                              axis2_char_t *class_name,
                              int type);
 
-    axis2_qname_t* (AXIS2_CALL *
+    axutil_qname_t* (AXIS2_CALL *
     get_schemaqname4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
 
     axis2_char_t* (AXIS2_CALL *
     get_classname4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
 
     axis2_bool_t (AXIS2_CALL *
     get_attri_status4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
     axis2_bool_t (AXIS2_CALL *
     get_any_status4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
     axis2_bool_t (AXIS2_CALL *
     get_array_status4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
     axis2_bool_t (AXIS2_CALL *
     get_binary_status4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
     axis2_bool_t (AXIS2_CALL *
     get_any_attri_status4qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
          
     axis2_status_t (AXIS2_CALL *
     add_min_occurs)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname,
+                             axutil_qname_t *qname,
                              long min_occurs);
 
     axis2_status_t (AXIS2_CALL *
     add_max_occurs)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname,
+                             axutil_qname_t *qname,
                              long max_occurs);
 
     axis2_status_t (AXIS2_CALL *
     register_qname_index)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname,
+                             axutil_qname_t *qname,
                              int index);
 
     long (AXIS2_CALL *
     get_min_occurs)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
     long (AXIS2_CALL *
     get_max_occurs)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *qname);
+                             axutil_qname_t *qname);
 
     axutil_array_list_t* (AXIS2_CALL *
     get_qname_array)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
@@ -749,7 +749,7 @@
     axis2_status_t (AXIS2_CALL *
     add_status)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                              const axutil_env_t *env,
-                             axis2_qname_t *type,
+                             axutil_qname_t *type,
                              int mask);
     
     axis2_status_t (AXIS2_CALL *

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h Fri Mar 30 12:24:00 2007
@@ -25,8 +25,8 @@
 
 #include <stdio.h>
 #include <axis2_utils.h>
-#include <axis2_string.h>
-#include <axis2_qname.h>
+#include <axutil_string.h>
+#include <axutil_qname.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -99,7 +99,7 @@
  * @return	newly create hash key
  */
 AXIS2_EXTERN axis2_char_t*
-w2c_string_make_key_from_qname(axis2_qname_t *qname,
+w2c_string_make_key_from_qname(axutil_qname_t *qname,
                                const axutil_env_t *env);
 
 /** @} */

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h Fri Mar 30 12:24:00 2007
@@ -26,7 +26,7 @@
 #include <axis2_utils.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -67,7 +67,7 @@
     axis2_char_t* (AXIS2_CALL *
     get_parameter_name)(w2c_typemapper_t *typemapper,
           const axutil_env_t *env,
-          axis2_qname_t *qname);
+          axutil_qname_t *qname);
 
    /**
     * retrieve the language type name to the given qname in wsdl.
@@ -79,7 +79,7 @@
     axis2_char_t* (AXIS2_CALL *
     get_type_name)(w2c_typemapper_t *typemapper,
           const axutil_env_t *env,
-          axis2_qname_t *qname);
+          axutil_qname_t *qname);
 
    /**
     * add a mapping to the list.
@@ -92,7 +92,7 @@
     axis2_status_t (AXIS2_CALL *
     add_typemapping_name)(w2c_typemapper_t *typemapper,
           const axutil_env_t *env,
-          axis2_qname_t *qname,
+          axutil_qname_t *qname,
           axis2_char_t *name);
 
    /**
@@ -111,7 +111,7 @@
     * @param  env Environment. MUST NOT be NULL
     * @param the dafault qname ( defined in wsdl)
     */
-    axis2_qname_t* (AXIS2_CALL *
+    axutil_qname_t* (AXIS2_CALL *
     get_default_qname)(w2c_typemapper_t *typemapper,
           const axutil_env_t *env);
 
@@ -135,7 +135,7 @@
     axis2_bool_t (AXIS2_CALL *
     is_primitive)(w2c_typemapper_t *typemapper,
           const axutil_env_t *env,
-          axis2_qname_t *qname);
+          axutil_qname_t *qname);
 
 };
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_xslt_utils.h Fri Mar 30 12:24:00 2007
@@ -24,7 +24,7 @@
  */
 
 #include <stdio.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
 #include <axis2_utils.h>
 #include <axiom.h>
 

Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c Fri Mar 30 12:24:00 2007
@@ -54,22 +54,22 @@
 void axis2_stub_calculator_populate_services(axis2_stub_t *stub, const axutil_env_t *env)
 {
     axis2_svc_client_t *svc_client = NULL;
-    axis2_qname_t *svc_qname =  NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *svc_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axis2_svc_t *svc = NULL;
     axis2_op_t *op = NULL;
 
     /* Modifying the Service */
     svc_client = axis2_stub_get_svc_client(stub, env);
     svc = (axis2_svc_t*)axis2_svc_client_get_svc(svc_client, env);
-    axis2_qname_create(env, "Calculator" , NULL, NULL);
+    axutil_qname_create(env, "Calculator" , NULL, NULL);
     axis2_svc_set_qname(svc, env, svc_qname);
 
     /* creating the operations*/
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "add" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -81,7 +81,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "sub" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -93,7 +93,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "mul" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -105,7 +105,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "div" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -147,7 +147,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content0;
@@ -171,7 +171,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "add" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -251,7 +251,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content2;
@@ -275,7 +275,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "sub" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -355,7 +355,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content4;
@@ -379,7 +379,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "mul" ,
             "http://localhost/axis/Calculator",
             NULL);
@@ -459,7 +459,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content6;
@@ -483,7 +483,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "div" ,
             "http://localhost/axis/Calculator",
             NULL);

Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c Fri Mar 30 12:24:00 2007
@@ -54,22 +54,22 @@
 void axis2_stub_interop_test_port_type_doc_service_populate_services(axis2_stub_t *stub, const axutil_env_t *env)
 {
     axis2_svc_client_t *svc_client = NULL;
-    axis2_qname_t *svc_qname =  NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *svc_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axis2_svc_t *svc = NULL;
     axis2_op_t *op = NULL;
 
     /* Modifying the Service */
     svc_client = axis2_stub_get_svc_client(stub, env);
     svc = (axis2_svc_t*)axis2_svc_client_get_svc(svc_client, env);
-    axis2_qname_create(env, "InteropTestPortTypeDocService" , NULL, NULL);
+    axutil_qname_create(env, "InteropTestPortTypeDocService" , NULL, NULL);
     axis2_svc_set_qname(svc, env, svc_qname);
 
     /* creating the operations*/
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoString" ,
             "http://soapinterop.org",
             NULL);
@@ -81,7 +81,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoStringArray" ,
             "http://soapinterop.org",
             NULL);
@@ -93,7 +93,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoInteger" ,
             "http://soapinterop.org",
             NULL);
@@ -105,7 +105,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoIntegerArray" ,
             "http://soapinterop.org",
             NULL);
@@ -117,7 +117,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoFloat" ,
             "http://soapinterop.org",
             NULL);
@@ -129,7 +129,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoFloatArray" ,
             "http://soapinterop.org",
             NULL);
@@ -141,7 +141,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoStruct" ,
             "http://soapinterop.org",
             NULL);
@@ -153,7 +153,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoStructArray" ,
             "http://soapinterop.org",
             NULL);
@@ -165,7 +165,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoVoid" ,
             "http://soapinterop.org",
             NULL);
@@ -177,7 +177,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoBase64" ,
             "http://soapinterop.org",
             NULL);
@@ -189,7 +189,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoDate" ,
             "http://soapinterop.org",
             NULL);
@@ -201,7 +201,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoHexBinary" ,
             "http://soapinterop.org",
             NULL);
@@ -213,7 +213,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoDecimal" ,
             "http://soapinterop.org",
             NULL);
@@ -225,7 +225,7 @@
 
 
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoBoolean" ,
             "http://soapinterop.org",
             NULL);
@@ -267,7 +267,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content0;
@@ -291,7 +291,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoString" ,
             "http://soapinterop.org",
             NULL);
@@ -371,7 +371,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content2;
@@ -395,7 +395,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoStringArray" ,
             "http://soapinterop.org",
             NULL);
@@ -475,7 +475,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content4;
@@ -499,7 +499,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoInteger" ,
             "http://soapinterop.org",
             NULL);
@@ -579,7 +579,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content6;
@@ -603,7 +603,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoIntegerArray" ,
             "http://soapinterop.org",
             NULL);
@@ -683,7 +683,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content8;
@@ -707,7 +707,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoFloat" ,
             "http://soapinterop.org",
             NULL);
@@ -787,7 +787,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content10;
@@ -811,7 +811,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoFloatArray" ,
             "http://soapinterop.org",
             NULL);
@@ -891,7 +891,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content12;
@@ -915,7 +915,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoStruct" ,
             "http://soapinterop.org",
             NULL);
@@ -995,7 +995,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content14;
@@ -1019,7 +1019,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoStructArray" ,
             "http://soapinterop.org",
             NULL);
@@ -1099,7 +1099,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content16;
@@ -1123,7 +1123,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoVoid" ,
             "http://soapinterop.org",
             NULL);
@@ -1203,7 +1203,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content18;
@@ -1227,7 +1227,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoBase64" ,
             "http://soapinterop.org",
             NULL);
@@ -1307,7 +1307,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content20;
@@ -1331,7 +1331,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoDate" ,
             "http://soapinterop.org",
             NULL);
@@ -1411,7 +1411,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content22;
@@ -1435,7 +1435,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoHexBinary" ,
             "http://soapinterop.org",
             NULL);
@@ -1515,7 +1515,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content24;
@@ -1539,7 +1539,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoDecimal" ,
             "http://soapinterop.org",
             NULL);
@@ -1619,7 +1619,7 @@
     axiom_node_t *ret_node = NULL;
 
     const axis2_char_t *soap_action = NULL;
-    axis2_qname_t *op_qname =  NULL;
+    axutil_qname_t *op_qname =  NULL;
     axiom_node_t *payload = NULL;
 
     payload = content26;
@@ -1643,7 +1643,7 @@
 
     axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
 
-    op_qname = axis2_qname_create(env,
+    op_qname = axutil_qname_create(env,
             "echoBoolean" ,
             "http://soapinterop.org",
             NULL);



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