axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524243 [3/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...
Date Fri, 30 Mar 2007 19:24:23 GMT
Modified: webservices/axis2/trunk/c/include/axis2_http_transport_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_transport_utils.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_transport_utils.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_transport_utils.h Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
 #include <axis2_conf_ctx.h>
 #include <axutil_hash.h>
 #include <axiom_element.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
 #include <axiom_soap_envelope.h>
 #include <axis2_http_chunked_stream.h>
 
@@ -64,21 +64,21 @@
     axis2_http_transport_utils_process_http_post_request(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
-        axis2_stream_t *in_stream,
-        axis2_stream_t *out_stream,
+        axutil_stream_t *in_stream,
+        axutil_stream_t *out_stream,
         const axis2_char_t *content_type,
         const int content_length,
-        axis2_string_t *soap_action_header,
+        axutil_string_t *soap_action_header,
         const axis2_char_t *request_uri);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axis2_http_transport_utils_process_http_get_request(
         const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
-        axis2_stream_t *in_stream,
-        axis2_stream_t *out_stream,
+        axutil_stream_t *in_stream,
+        axutil_stream_t *out_stream,
         const axis2_char_t *content_type,
-        axis2_string_t *soap_action_header,
+        axutil_string_t *soap_action_header,
         const axis2_char_t *request_uri,
         axis2_conf_ctx_t *conf_ctx,
         axutil_hash_t *request_params);
@@ -88,7 +88,7 @@
         const axutil_env_t *env, 
         axis2_char_t *request_uri,
         axis2_msg_ctx_t *msg_ctx, 
-        axis2_stream_t *in_stream,
+        axutil_stream_t *in_stream,
         axis2_char_t *content_type);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL

Modified: webservices/axis2/trunk/c/include/axis2_module.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_module.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module.h Fri Mar 30 12:24:00 2007
@@ -41,7 +41,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_conf.h>
 #include <axis2_module_desc.h>
 #include <axutil_hash.h>

Modified: webservices/axis2/trunk/c/include/axis2_module_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_module_desc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module_desc.h Fri Mar 30 12:24:00 2007
@@ -33,11 +33,11 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_array_list.h>
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
 #include <axis2_flow_container.h>
-#include <axis2_param.h>
+#include <axutil_param.h>
 #include <axis2_op.h>
 #include <axis2_conf.h>
 
@@ -164,7 +164,7 @@
      * @param env pointer to environment struct
      * @return pointer to QName
      */
-    AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
     axis2_module_desc_get_qname(const axis2_module_desc_t *module_desc,
         const axutil_env_t *env);
 
@@ -178,7 +178,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_module_desc_set_qname(axis2_module_desc_t *module_desc,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
     /**
      * Adds given operation to module.
@@ -236,7 +236,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_module_desc_add_param(axis2_module_desc_t *module_desc,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets parameter with given name.
@@ -245,7 +245,7 @@
      * @param name parameter name string
      * @return pointer to parameter corresponding to given name
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_module_desc_get_param(const axis2_module_desc_t *module_desc,
         const axutil_env_t *env,
         const axis2_char_t *name);
@@ -294,7 +294,7 @@
         const axutil_env_t *env,
         struct axis2_module *module);
 
-    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
     axis2_module_desc_get_param_container(const axis2_module_desc_t *module_desc,
         const axutil_env_t *env);
 
@@ -318,7 +318,7 @@
      */
     AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
     axis2_module_desc_create_with_qname(const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
     /**
      * Frees module description passed as void pointer. This method will cast 

Modified: webservices/axis2/trunk/c/include/axis2_msg.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
  * @{
  */
 
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
 #include <axis2_op.h>
 #include <axutil_array_list.h>
 #include <axis2_description.h>
@@ -77,7 +77,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_add_param(axis2_msg_t *msg,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets the named parameter.
@@ -87,7 +87,7 @@
      * @return pointer to parameter corresponding to the same name, returns
      * a reference, not a cloned copy
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_msg_get_param(const axis2_msg_t *msg,
         const axutil_env_t *env,
         const axis2_char_t *name);
@@ -191,7 +191,7 @@
      * @param env pointer to environment struct
      * @return pointer to QName, returns a reference, not a cloned copy
      */
-    AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
     axis2_msg_get_element_qname(const axis2_msg_t *msg,
         const axutil_env_t *env);
 
@@ -206,7 +206,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_set_element_qname(axis2_msg_t *msg,
         const axutil_env_t *env,
-        const axis2_qname_t *element_qname);
+        const axutil_qname_t *element_qname);
 
     /** 
      * Gets message name.

Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Fri Mar 30 12:24:00 2007
@@ -44,10 +44,10 @@
 #include <axutil_env.h>
 #include <axis2_ctx.h>
 #include <axis2_relates_to.h>
-#include <axis2_param.h>
+#include <axutil_param.h>
 #include <axis2_handler_desc.h>
-#include <axis2_qname.h>
-#include <axis2_stream.h>
+#include <axutil_qname.h>
+#include <axutil_stream.h>
 #include <axis2_msg_info_headers.h>
 
 #ifdef __cplusplus
@@ -811,7 +811,7 @@
      * @param key parameter key  
      * @return pointer to parameter struct corresponding to the given key
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_msg_ctx_get_parameter(const axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
         const axis2_char_t *key);
@@ -836,7 +836,7 @@
      * @param handler_desc pointer to handler description
      * @return pointer to parameter 
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_msg_ctx_get_module_parameter(const axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
         const axis2_char_t *key,
@@ -853,7 +853,7 @@
      * non-persistent map
      * @return pointer to property struct
      */
-    AXIS2_EXTERN axis2_property_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_property_t *AXIS2_CALL
     axis2_msg_ctx_get_property(const axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
         const axis2_char_t *key);
@@ -873,14 +873,14 @@
     axis2_msg_ctx_set_property(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
         const axis2_char_t *key,
-        axis2_property_t *value);
+        axutil_property_t *value);
     /**
      * Gets the QName of the handler at which invocation was paused.
      * @param msg_ctx message context
      * @param env pointer to environment struct
      * @return pointer to QName of the paused handler
      */
-    AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_string_t *AXIS2_CALL
     axis2_msg_ctx_get_paused_handler_name(const axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env);
 
@@ -912,7 +912,7 @@
      * @param env pointer to environment struct
      * @return SOAP action string
      */
-    AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t *AXIS2_CALL
       axis2_msg_ctx_get_soap_action(const axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env);
 
@@ -926,7 +926,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_ctx_set_soap_action(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
-        axis2_string_t *soap_action);
+        axutil_string_t *soap_action);
 
     /**
      * Gets the boolean value indicating if MTOM is enabled or not.
@@ -1132,7 +1132,7 @@
      * @param env pointer to environment struct
      * @return service group context ID string
      */
-    AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_string_t *AXIS2_CALL
     axis2_msg_ctx_get_svc_grp_ctx_id(const axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env);
 
@@ -1146,7 +1146,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_ctx_set_svc_grp_ctx_id(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
-        axis2_string_t *svc_grp_ctx_id);
+        axutil_string_t *svc_grp_ctx_id);
 
     /**
      * Finds the service to be invoked. This function is used by dispatchers 
@@ -1352,7 +1352,7 @@
      * @param env pointer to environment struct
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t* AXIS2_CALL
     axis2_msg_ctx_get_charset_encoding(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env);
 
@@ -1366,16 +1366,16 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_ctx_set_charset_encoding(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
-        axis2_string_t *str);
+        axutil_string_t *str);
 
-    AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
     axis2_msg_ctx_get_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_ctx_set_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
         const axutil_env_t *env,
-        axis2_stream_t *stream);
+        axutil_stream_t *stream);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_msg_ctx_reset_transport_out_stream(axis2_msg_ctx_t *msg_ctx,

Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
  * @{
  */
 
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
 #include <axis2_svc.h>
 #include <axis2_msg_recv.h>
 #include <axutil_array_list.h>
@@ -58,7 +58,7 @@
 
     struct axis2_svc;
     struct axis2_msg_recv;
-    struct axis2_param_container;
+    struct axutil_param_container;
     struct axis2_module_desc;
     struct axis2_op;
     struct axis2_relates_to;
@@ -113,7 +113,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_op_add_param(axis2_op_t *op,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets named parameter.
@@ -123,7 +123,7 @@
      * @return pointer to named parameter if exists, else NULL. Returns a
      * reference, not a cloned copy
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_op_get_param(const axis2_op_t *op,
         const axutil_env_t *env,
         const axis2_char_t *name);
@@ -187,7 +187,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_op_set_qname(axis2_op_t *op,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
     /**
      * Gets operation QName.
@@ -195,7 +195,7 @@
      * @param env pointer to environment struct
      * @return pointer to QName, returns a reference, not a cloned copy
      */
-    AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
     axis2_op_get_qname(void *op,
         const axutil_env_t *env);
 
@@ -437,7 +437,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_op_add_module_qname(axis2_op_t *op,
         const axutil_env_t *env,
-        const axis2_qname_t *module_qname);
+        const axutil_qname_t *module_qname);
 
     /**
      * Gets all module QNames as a list.
@@ -558,7 +558,7 @@
     axis2_op_get_wsamapping_list(axis2_op_t *op,
         const axutil_env_t *env);
 
-    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
     axis2_op_get_param_container(const axis2_op_t *op,
         const axutil_env_t *env);
 
@@ -578,7 +578,7 @@
      */
     AXIS2_EXTERN axis2_op_t *AXIS2_CALL
     axis2_op_create_with_qname(const axutil_env_t *env,
-        const axis2_qname_t *name);
+        const axutil_qname_t *name);
 
     /**
      * Frees the operation given as a void pointer. This method would cast the 

Modified: webservices/axis2/trunk/c/include/axis2_op_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op_client.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op_client.h Fri Mar 30 12:24:00 2007
@@ -253,7 +253,7 @@
      * @param env pointer to environment struct
      * @return a pointer to SOAP action string
      */
-    AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t *AXIS2_CALL
     axis2_op_client_get_soap_action(const axis2_op_client_t *op_client,
         const axutil_env_t *env);
     
@@ -322,7 +322,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_op_client_engage_module(axis2_op_client_t *op_client,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
     
     /**
      * Sets SOAP version URI.
@@ -346,7 +346,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_op_client_set_soap_action(axis2_op_client_t *op_client,
         const axutil_env_t *env,
-        axis2_string_t *soap_action);
+        axutil_string_t *soap_action);
     
     /**
      * Sets WSA action.

Modified: webservices/axis2/trunk/c/include/axis2_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_options.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_options.h (original)
+++ webservices/axis2/trunk/c/include/axis2_options.h Fri Mar 30 12:24:00 2007
@@ -608,7 +608,7 @@
      * @param env pointer to environment struct
      * @return SOAP Action string if set, else NULL
      */
-    AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+    AXIS2_EXTERN axutil_string_t* AXIS2_CALL
     axis2_options_get_soap_action(const axis2_options_t *options,
         const axutil_env_t *env);
 
@@ -622,7 +622,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_options_set_soap_action(axis2_options_t *options,
         const axutil_env_t *env,
-        axis2_string_t *soap_action);
+        axutil_string_t *soap_action);
 
     /**
      * Sets xml parser reset

Modified: webservices/axis2/trunk/c/include/axis2_phase.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase.h Fri Mar 30 12:24:00 2007
@@ -40,7 +40,7 @@
 #include <axis2_handler.h>
 #include <axis2_handler_desc.h>
 #include <axutil_array_list.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** 
  * A given handler's location within the list of handlers is before a particular

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

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

Modified: webservices/axis2/trunk/c/include/axis2_phase_rule.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase_rule.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase_rule.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase_rule.h Fri Mar 30 12:24:00 2007
@@ -34,8 +34,8 @@
  */
 
 #include <axis2_defines.h>
-#include <axis2_qname.h>
-#include <axis2_param.h>
+#include <axutil_qname.h>
+#include <axutil_param.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: webservices/axis2/trunk/c/include/axis2_phases_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phases_info.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phases_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phases_info.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_array_list.h>
 #include <axis2_op.h>
 #include <axis2_phase.h>

Modified: webservices/axis2/trunk/c/include/axis2_raw_xml_in_out_msg_recv.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_raw_xml_in_out_msg_recv.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_raw_xml_in_out_msg_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_raw_xml_in_out_msg_recv.h Fri Mar 30 12:24:00 2007
@@ -33,7 +33,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/include/axis2_simple_http_svr_conn.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h (original)
+++ webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h Fri Mar 30 12:24:00 2007
@@ -96,7 +96,7 @@
          * @param svr_conn pointer to server connection struct
          * @param env pointer to environment struct
          */
-        axis2_stream_t* (AXIS2_CALL *
+        axutil_stream_t* (AXIS2_CALL *
                 get_stream)(
                     const axis2_simple_http_svr_conn_t *svr_conn,
                     const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/include/axis2_stub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_stub.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stub.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stub.h Fri Mar 30 12:24:00 2007
@@ -34,7 +34,7 @@
 #include <axis2_svc_client.h>
 #include <axis2_options.h>
 #include <axiom_xml_reader.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
 
 /** Constant value representing SOAP version 1.1 */
 #define AXIOM_SOAP_11 0

Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Fri Mar 30 12:24:00 2007
@@ -43,19 +43,19 @@
  * @file axis2_svc.h
  */
 
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
 #include <axis2_flow_container.h>
 #include <axis2_op.h>
 #include <axis2_svc_grp.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axutil_error.h>
 #include <axutil_array_list.h>
 #include <axis2_const.h>
 #include <axis2_phase_resolver.h>
 #include <axis2_module_desc.h>
 #include <axis2_conf.h>
-#include <axis2_string.h>
-#include <axis2_stream.h>
+#include <axutil_string.h>
+#include <axutil_stream.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -68,7 +68,7 @@
 
     struct axis2_svc_grp;
     struct axis2_flow_container;
-    struct axis2_param_container;
+    struct axutil_param_container;
     struct axis2_module_desc;
     struct axis2_conf;
 
@@ -105,7 +105,7 @@
     AXIS2_EXTERN struct axis2_op *AXIS2_CALL
     axis2_svc_get_op_with_qname(const axis2_svc_t *svc,
         const axutil_env_t *env,
-        const axis2_qname_t *op_qname);
+        const axutil_qname_t *op_qname);
 
     /**
      * Gets operation corresponding to the name.
@@ -161,7 +161,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_set_qname(axis2_svc_t *svc,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
     /**
      * Gets QName.
@@ -169,7 +169,7 @@
      * @param env pointer to environment struct
      * @return pointer to QName
      */
-    AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
     axis2_svc_get_qname(const axis2_svc_t *svc,
         const axutil_env_t *env);
 
@@ -184,7 +184,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_add_param(axis2_svc_t *svc,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets named parameter.         
@@ -194,7 +194,7 @@
      * @return pointer to named parameter if exists, else NULL. Returns a 
      * reference, not a cloned copy         
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_svc_get_param(const axis2_svc_t *svc,
         const axutil_env_t *env,
         const axis2_char_t *name);
@@ -248,7 +248,7 @@
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
     axis2_svc_is_module_engaged (axis2_svc_t *svc,
         const axutil_env_t *env,
-        axis2_qname_t *module_qname);
+        axutil_qname_t *module_qname);
 
     /**
      * Adds operations defined in a module to this service. It is possible 
@@ -445,7 +445,7 @@
                 const axis2_svc_t *svc,
                 const axutil_env_t *env,
                 const axis2_char_t *soap_action,
-                const axis2_qname_t *endpoint);*/
+                const axutil_qname_t *endpoint);*/
 
     /**
      * Gets service name.
@@ -605,7 +605,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_add_module_qname(axis2_svc_t *svc,
         const axutil_env_t *env,
-        const axis2_qname_t *module_qname);
+        const axutil_qname_t *module_qname);
 
     /**
      * Gets all module QNames associated with the service as a list.
@@ -731,7 +731,7 @@
             axis2_svc_print_schema(
                 axis2_svc_t *svc,
                 const axutil_env_t *env,
-                axis2_stream_t *out_stream);*/
+                axutil_stream_t *out_stream);*/
 
     /**
      * Gets the XML schema at the given index of XML schema array list.
@@ -907,7 +907,7 @@
             axis2_svc_get_schema_element(
                 const axis2_svc_t *svc,
                 const axutil_env_t *env,
-                const axis2_qname_t *qname);*/
+                const axutil_qname_t *qname);*/
 
     /**
      * Gets the namespace map with all namespaces related to service.
@@ -945,7 +945,7 @@
                 axis2_svc_t *svc,
                 const axutil_env_t *env);*/
 
-    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
     axis2_svc_get_param_container(const axis2_svc_t *svc,
         const axutil_env_t *env);
 
@@ -969,7 +969,7 @@
      */
     AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
     axis2_svc_create_with_qname(const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
     AXIS2_EXTERN void *AXIS2_CALL
     axis2_svc_get_impl_class(const axis2_svc_t *svc,

Modified: webservices/axis2/trunk/c/include/axis2_svc_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_client.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_client.h Fri Mar 30 12:24:00 2007
@@ -45,7 +45,7 @@
 #include <axis2_uri.h>
 #include <axis2_svc.h>
 #include <axis2_options.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axiom_element.h>
 #include <axis2_callback.h>
 #include <axis2_endpoint_ref.h>
@@ -205,7 +205,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_client_send_robust_with_op_qname(axis2_svc_client_t *svc_client,
         const axutil_env_t *env,
-        const axis2_qname_t *op_qname,
+        const axutil_qname_t *op_qname,
         const axiom_node_t *payload);
 
     /**
@@ -239,7 +239,7 @@
     AXIS2_EXTERN void AXIS2_CALL
     axis2_svc_client_fire_and_forget_with_op_qname(axis2_svc_client_t *svc_client,
         const axutil_env_t *env,
-        const axis2_qname_t *op_qname,
+        const axutil_qname_t *op_qname,
         const axiom_node_t *payload);
 
     /**
@@ -270,7 +270,7 @@
     AXIS2_EXTERN axiom_node_t *AXIS2_CALL
     axis2_svc_client_send_receive_with_op_qname(axis2_svc_client_t *svc_client,
         const axutil_env_t *env,
-        const axis2_qname_t *op_qname,
+        const axutil_qname_t *op_qname,
         const axiom_node_t *payload);
 
     /**
@@ -301,7 +301,7 @@
     AXIS2_EXTERN void AXIS2_CALL
     axis2_svc_client_send_receive_non_blocking_with_op_qname(axis2_svc_client_t *svc_client,
         const axutil_env_t *env,
-        const axis2_qname_t *op_qname,
+        const axutil_qname_t *op_qname,
         const axiom_node_t *payload,
         axis2_callback_t *callback);
 
@@ -326,13 +326,13 @@
      * messages for this specific operation.
      * @param svc_client pointer to service client struct
      * @param env pointer to environment struct
-     * @param op_qname axis2_qname_t of the operation
+     * @param op_qname axutil_qname_t of the operation
      * @return pointer to newly created op_client configured for the given operation
      */
     AXIS2_EXTERN axis2_op_client_t *AXIS2_CALL
     axis2_svc_client_create_op_client(axis2_svc_client_t *svc_client,
         const axutil_env_t *env,
-        const axis2_qname_t *op_qname);
+        const axutil_qname_t *op_qname);
 
     /**
      * Cleans up service client invocation. This will close the output 
@@ -465,7 +465,7 @@
     axis2_svc_client_create_for_dynamic_invocation(const axutil_env_t *env,
         axis2_conf_ctx_t *conf_ctx,
         const axis2_uri_t *wsdl_uri,
-        const axis2_qname_t *wsdl_svc_qname,
+        const axutil_qname_t *wsdl_svc_qname,
         const axis2_char_t *endpoint_name,
         const axis2_char_t *client_home);
 

Modified: webservices/axis2/trunk/c/include/axis2_svc_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_ctx.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_ctx.h Fri Mar 30 12:24:00 2007
@@ -179,7 +179,7 @@
     AXIS2_EXTERN struct axis2_op_ctx *AXIS2_CALL
     axis2_svc_ctx_create_op_ctx(struct axis2_svc_ctx *svc_ctx,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_svc_grp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_grp.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_grp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_grp.h Fri Mar 30 12:24:00 2007
@@ -44,7 +44,7 @@
  * @file axis2_svc_grp.h
  */
 
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
 #include <axis2_svc.h>
 #include <axis2_svc_grp_ctx.h>
 
@@ -115,7 +115,7 @@
     AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
     axis2_svc_grp_get_svc(const axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
-        const axis2_qname_t *svc_qname);
+        const axutil_qname_t *svc_qname);
 
     /**
      * Gets all services associated with service group. 
@@ -138,7 +138,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_grp_remove_svc(axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
-        const axis2_qname_t *svc_qname);
+        const axutil_qname_t *svc_qname);
 
     /**
      * Adds parameter.
@@ -151,7 +151,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_grp_add_param(axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets named parameter.
@@ -161,7 +161,7 @@
      * @return pointer to named parameter if exists, else NULL. Returns a 
      * reference, not a cloned copy
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_svc_grp_get_param(const axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
         const axis2_char_t *name);
@@ -199,7 +199,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_grp_add_module_qname(axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
-        const axis2_qname_t *module_qname);
+        const axutil_qname_t *module_qname);
 
     /**
      * Gets parent which is of type configuration.
@@ -237,7 +237,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_grp_engage_module(axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
-        const axis2_qname_t *module_qname);
+        const axutil_qname_t *module_qname);
 
     /**
      * Gets all module QNames associated with service group.
@@ -260,7 +260,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_grp_add_module_ref(axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env,
-        const axis2_qname_t *moduleref);
+        const axutil_qname_t *moduleref);
 
     /**
      * Gets all module references.
@@ -287,7 +287,7 @@
         const axutil_env_t *env,
         struct axis2_conf_ctx *parent);
 
-    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
     axis2_svc_grp_get_param_container(const axis2_svc_grp_t *svc_grp,
         const axutil_env_t *env);
 

Modified: webservices/axis2/trunk/c/include/axis2_svc_name.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_name.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_name.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_name.h Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axis2_const.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -56,7 +56,7 @@
     AXIS2_EXTERN axis2_svc_name_t *AXIS2_CALL
     axis2_svc_name_create(
         const axutil_env_t *env,
-        const axis2_qname_t *qname,
+        const axutil_qname_t *qname,
         const axis2_char_t *endpoint_name) ;
 
     /**
@@ -67,7 +67,7 @@
      * @return pointer to QName struct, returns a reference, not a cloned 
      * copy
      */
-    AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+    AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
     axis2_svc_name_get_qname(const axis2_svc_name_t *svc_name,
         const axutil_env_t *env);
 
@@ -82,7 +82,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_svc_name_set_qname(struct axis2_svc_name *svc_name,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
     /**
      * Gets endpoint name. Endpoint name is a non-qualified name that 

Modified: webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_in_desc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_in_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_in_desc.h Fri Mar 30 12:24:00 2007
@@ -233,7 +233,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_transport_in_desc_add_param(axis2_transport_in_desc_t *transport_in_desc,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets named parameter.
@@ -243,7 +243,7 @@
      * @return pointer to named parameter if it exists, else NULL. Returns
      * a reference, not a cloned copy
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_transport_in_desc_get_param(const axis2_transport_in_desc_t *transport_in_desc,
         const axutil_env_t *env,
         const axis2_char_t *param_name);
@@ -260,7 +260,7 @@
         const axutil_env_t *env,
         const axis2_char_t *param_name);
 
-    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
     axis2_transport_in_desc_param_container(const axis2_transport_in_desc_t *transport_in_desc,
         const axutil_env_t *env);
 

Modified: webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_out_desc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_out_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_out_desc.h Fri Mar 30 12:24:00 2007
@@ -233,7 +233,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_transport_out_desc_add_param(axis2_transport_out_desc_t *transport_out_desc,
         const axutil_env_t *env,
-        axis2_param_t *param);
+        axutil_param_t *param);
 
     /**
      * Gets named parameter. 
@@ -241,7 +241,7 @@
      * @param env pointer to environment struct
      * @param param_name parameter name string
      */
-    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_t *AXIS2_CALL
     axis2_transport_out_desc_get_param(const axis2_transport_out_desc_t *transport_out_desc,
         const axutil_env_t *env,
         const axis2_char_t *param_name);
@@ -257,7 +257,7 @@
         const axutil_env_t *env,
         const axis2_char_t *param_name);
 
-    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
     axis2_transport_out_desc_param_container(const axis2_transport_out_desc_t *transport_out_desc,
         const axutil_env_t *env);
 

Modified: webservices/axis2/trunk/c/include/axis2_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_util.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Fri Mar 30 12:24:00 2007
@@ -30,15 +30,15 @@
 #include <axutil_hash.h>
 #include <axutil_linked_list.h>
 #include <axutil_log.h>
-#include <axis2_network_handler.h>
-#include <axis2_param.h>
-#include <axis2_param_container.h>
-#include <axis2_property.h>
-#include <axis2_qname.h>
-#include <axis2_stack.h>
-#include <axis2_stream.h>
-#include <axis2_string.h>
-#include <axis2_string_util.h>
+#include <axutil_network_handler.h>
+#include <axutil_param.h>
+#include <axutil_param_container.h>
+#include <axutil_property.h>
+#include <axutil_qname.h>
+#include <axutil_stack.h>
+#include <axutil_stream.h>
+#include <axutil_string.h>
+#include <axutil_string_util.h>
 #include <axis2_thread_pool.h>
 #include <axis2_types.h>
 #include <axis2_url.h>

Modified: webservices/axis2/trunk/c/modules/core/addr/any_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/any_content_type.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/any_content_type.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/any_content_type.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axis2_any_content_type.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 struct axis2_any_content_type
 {
@@ -56,7 +56,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_any_content_type_add_value(axis2_any_content_type_t *any_content_type,
     const axutil_env_t *env,
-    const axis2_qname_t *qname,
+    const axutil_qname_t *qname,
     const axis2_char_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -65,7 +65,7 @@
     {
         axis2_char_t *name = NULL;
 
-        name = axis2_qname_to_string((axis2_qname_t *)qname, env);
+        name = axutil_qname_to_string((axutil_qname_t *)qname, env);
         axutil_hash_set(any_content_type->value_map, name,
 		    AXIS2_HASH_KEY_STRING, value);
     }
@@ -75,13 +75,13 @@
 AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
 axis2_any_content_type_get_value(const axis2_any_content_type_t *any_content_type,
     const axutil_env_t *env,
-    const axis2_qname_t *qname)
+    const axutil_qname_t *qname)
 {
     if (any_content_type->value_map)
     {
         axis2_char_t *name = NULL;
 
-        name = axis2_qname_to_string((axis2_qname_t *)qname, env);
+        name = axutil_qname_to_string((axutil_qname_t *)qname, env);
         return axutil_hash_get(any_content_type->value_map, name,
             AXIS2_HASH_KEY_STRING);
     }

Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axis2_endpoint_ref.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_array_list.h>
 
 struct axis2_endpoint_ref
@@ -24,7 +24,7 @@
     /** endpoint address */
     axis2_char_t *address;
     /** interface qname */
-    axis2_qname_t *interface_qname;
+    axutil_qname_t *interface_qname;
     /** reference parameters */
     axutil_array_list_t *ref_param_list;
     /** meta data */
@@ -100,7 +100,7 @@
     return AXIS2_SUCCESS;
 }
 
-const axis2_qname_t *AXIS2_CALL
+const axutil_qname_t *AXIS2_CALL
 axis2_endpoint_ref_get_interface_qname(const axis2_endpoint_ref_t *endpoint_ref,
     const axutil_env_t *env)
 {
@@ -110,11 +110,11 @@
 axis2_status_t AXIS2_CALL
 axis2_endpoint_ref_set_interface_qname(axis2_endpoint_ref_t *endpoint_ref,
     const axutil_env_t *env,
-    const axis2_qname_t *interface_qname)
+    const axutil_qname_t *interface_qname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     endpoint_ref->interface_qname =
-        axis2_qname_clone((axis2_qname_t *)interface_qname, env);
+        axutil_qname_clone((axutil_qname_t *)interface_qname, env);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axis2_msg_info_headers.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 struct axis2_msg_info_headers
 {

Modified: webservices/axis2/trunk/c/modules/core/addr/relates_to.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/relates_to.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/relates_to.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/relates_to.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
  */
 
 #include <axis2_relates_to.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 struct axis2_relates_to
 {

Modified: webservices/axis2/trunk/c/modules/core/addr/svc_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/svc_name.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/svc_name.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/svc_name.c Fri Mar 30 12:24:00 2007
@@ -17,19 +17,19 @@
 
 
 #include <axis2_svc_name.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 struct axis2_svc_name
 {
     /** service QName */
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
     /** service endpoint name */
     axis2_char_t *endpoint_name;
 };
 
 axis2_svc_name_t *AXIS2_CALL
 axis2_svc_name_create(const axutil_env_t *env,
-    const axis2_qname_t *qname,
+    const axutil_qname_t *qname,
     const axis2_char_t *endpoint_name)
 {
     axis2_svc_name_t *svc_name = NULL;
@@ -49,7 +49,7 @@
 
     if (qname)
     {
-        svc_name->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+        svc_name->qname = axutil_qname_clone((axutil_qname_t *)qname, env);
         if (!(svc_name->qname))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -72,7 +72,7 @@
     return svc_name;
 }
 
-const axis2_qname_t *AXIS2_CALL
+const axutil_qname_t *AXIS2_CALL
 axis2_svc_name_get_qname(const axis2_svc_name_t *svc_name,
     const axutil_env_t *env)
 {
@@ -82,18 +82,18 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_name_set_qname(struct axis2_svc_name *svc_name,
     const axutil_env_t *env,
-    const axis2_qname_t *qname)
+    const axutil_qname_t *qname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (svc_name->qname)
     {
-        axis2_qname_free(svc_name->qname, env);
+        axutil_qname_free(svc_name->qname, env);
     }
 
     if (qname)
     {
-        svc_name->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
+        svc_name->qname = axutil_qname_clone((axutil_qname_t *)qname, env);
         if (!(svc_name->qname))
             return AXIS2_FAILURE;
     }
@@ -138,7 +138,7 @@
 
     if (svc_name->qname)
     {
-        axis2_qname_free(svc_name->qname, env);
+        axutil_qname_free(svc_name->qname, env);
     }
 
     if (svc_name->endpoint_name)

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Fri Mar 30 12:24:00 2007
@@ -50,7 +50,7 @@
     /** SOAP version URI */
     axis2_char_t *soap_version_uri;
     /** SOAP action */
-    axis2_string_t *soap_action;
+    axutil_string_t *soap_action;
     /** WSA action  */
     axis2_char_t *wsa_action;
 
@@ -213,7 +213,7 @@
 
     if(out_msg_ctx && !mc)
     {
-        axis2_property_t *dump_property;
+        axutil_property_t *dump_property;
         axis2_char_t *dump_value = NULL;
         if(! axis2_msg_ctx_get_doing_rest(out_msg_ctx, env))
         {
@@ -221,7 +221,7 @@
                 AXIS2_DUMP_INPUT_MSG_TRUE);
             if(dump_property)
 	    {
-                dump_value = (axis2_char_t *) axis2_property_get_value (
+                dump_value = (axis2_char_t *) axutil_property_get_value (
                     dump_property, env);
             }
 	}
@@ -331,12 +331,12 @@
     if(!transport_out)
     {
         axis2_endpoint_ref_t *to_epr = NULL;
-        axis2_property_t *property = NULL;
+        axutil_property_t *property = NULL;
         property = axis2_options_get_property(op_client->options, env, 
             AXIS2_TARGET_EPR);
         if(property)
 	{
-            to_epr = axis2_property_get_value(property, env);
+            to_epr = axutil_property_get_value(property, env);
 	}
         if(!to_epr)
 	{
@@ -637,7 +637,7 @@
 }
 
 
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
 axis2_op_client_get_soap_action(
     const axis2_op_client_t *op_client,
     const axutil_env_t *env)
@@ -684,7 +684,7 @@
         if (svc)
         {
             axis2_op_t *temp_op = NULL;
-            const axis2_qname_t *op_qname = axis2_op_get_qname(op, env);
+            const axutil_qname_t *op_qname = axis2_op_get_qname(op, env);
             temp_op = axis2_svc_get_op_with_qname(svc, env, op_qname);
             if (!temp_op)
             {
@@ -843,7 +843,7 @@
 axis2_op_client_engage_module(
     axis2_op_client_t *op_client,
     const axutil_env_t *env,
-    const axis2_qname_t *qname)
+    const axutil_qname_t *qname)
 {
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_conf_t *conf = NULL;
@@ -901,19 +901,19 @@
 axis2_op_client_set_soap_action(
     axis2_op_client_t *op_client,
     const axutil_env_t *env,
-    axis2_string_t *soap_action)
+    axutil_string_t *soap_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (op_client->soap_action)
     {
-        axis2_string_free(op_client->soap_action, env);
+        axutil_string_free(op_client->soap_action, env);
         op_client->soap_action = NULL;
     }
 
     if (soap_action)
     {
-        op_client->soap_action = axis2_string_clone(soap_action, env);
+        op_client->soap_action = axutil_string_clone(soap_action, env);
         if (!(op_client->soap_action))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1003,7 +1003,7 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_op_t *op = NULL;
     axiom_soap_envelope_t *response_envelope = NULL;
-    axis2_property_t *property = NULL;
+    axutil_property_t *property = NULL;
     long index = -1;
     axis2_bool_t wait_indefinitely = AXIS2_FALSE;
 
@@ -1016,7 +1016,7 @@
     property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TIMEOUT_IN_SECONDS);
     if(property)
     {
-        axis2_char_t *value = axis2_property_get_value(property, env);
+        axis2_char_t *value = axutil_property_get_value(property, env);
         if(value)
             index = AXIS2_ATOI(value);
         if(index == -1)
@@ -1112,7 +1112,7 @@
                 AXIS2_HANDLER_ALREADY_VISITED);
             if(property)
             {
-                axis2_char_t *value = axis2_property_get_value(property, env);
+                axis2_char_t *value = axutil_property_get_value(property, env);
                 if(0 == axis2_strcmp(AXIS2_VALUE_TRUE, value))
                 {
                     return response;
@@ -1165,7 +1165,7 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_op_t *op = NULL;
     axiom_soap_envelope_t *response_envelope = NULL;
-    axis2_property_t *property = NULL;
+    axutil_property_t *property = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 

Modified: webservices/axis2/trunk/c/modules/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/options.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Fri Mar 30 12:24:00 2007
@@ -53,7 +53,7 @@
 
     axis2_bool_t manage_session;
     axis2_bool_t enable_mtom;
-    axis2_string_t *soap_action;
+    axutil_string_t *soap_action;
     axis2_bool_t xml_parser_reset;
 };
 
@@ -698,14 +698,14 @@
         for (hi = axutil_hash_first(options->properties, env);
             hi; hi = axutil_hash_next(env, hi))
         {
-            axis2_property_t *property = NULL;
+            axutil_property_t *property = NULL;
 
             axutil_hash_this(hi, &key, NULL, &val);
-            property = (axis2_property_t *) val;
+            property = (axutil_property_t *) val;
 
             if (property)
             {
-                axis2_property_free(property, env);
+                axutil_property_free(property, env);
             }
         }
         axutil_hash_free(options->properties, env);
@@ -723,7 +723,7 @@
 
     if (options->soap_action)
     {
-        axis2_string_free(options->soap_action, env);
+        axutil_string_free(options->soap_action, env);
     }
 
     AXIS2_FREE(env->allocator, options);
@@ -770,11 +770,11 @@
 
     if (enable_mtom)
     {
-        axis2_property_t *property = axis2_property_create(env);
+        axutil_property_t *property = axutil_property_create(env);
         if (property)
         {
-            axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
-            axis2_property_set_value(property, env, axis2_strdup(env, AXIS2_VALUE_TRUE));
+            axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+            axutil_property_set_value(property, env, axis2_strdup(env, AXIS2_VALUE_TRUE));
             axis2_options_set_property(options, env, AXIS2_ENABLE_MTOM, property);
         }
     }
@@ -788,7 +788,7 @@
     return options->enable_mtom;
 }
 
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
 axis2_options_get_soap_action(const axis2_options_t *options,
     const axutil_env_t *env)
 {
@@ -800,19 +800,19 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axis2_options_set_soap_action(axis2_options_t *options,
     const axutil_env_t *env,
-    axis2_string_t *soap_action)
+    axutil_string_t *soap_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (options->soap_action)
     {
-        axis2_string_free(options->soap_action, env);
+        axutil_string_free(options->soap_action, env);
         options->soap_action = NULL;
     }
 
     if (soap_action)
     {
-        options->soap_action = axis2_string_clone(soap_action, env);
+        options->soap_action = axutil_string_clone(soap_action, env);
     }
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Fri Mar 30 12:24:00 2007
@@ -103,7 +103,7 @@
 axis2_svc_client_create_for_dynamic_invocation(const axutil_env_t *env,
     axis2_conf_ctx_t *conf_ctx,
     const axis2_uri_t *wsdl_uri,
-    const axis2_qname_t *wsdl_svc_qname,
+    const axutil_qname_t *wsdl_svc_qname,
     const axis2_char_t *endpoint_name,
     const axis2_char_t *client_home)
 {
@@ -378,18 +378,18 @@
     const axis2_char_t *module_name)
 {
     axis2_module_desc_t *module = NULL;
-    axis2_qname_t *mod_qname = NULL;
+    axutil_qname_t *mod_qname = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
 
-    mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
+    mod_qname = axutil_qname_create(env, module_name, NULL, NULL);
 
     if (mod_qname)
     {
         module =  axis2_conf_get_module(svc_client->conf, env, mod_qname);
 
-        axis2_qname_free(mod_qname, env);
+        axutil_qname_free(mod_qname, env);
         mod_qname = NULL;
     }
     else
@@ -411,12 +411,12 @@
     const axis2_char_t *module_name)
 {
     axis2_module_desc_t *module = NULL;
-    axis2_qname_t *mod_qname = NULL;
+    axutil_qname_t *mod_qname = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
 
-    mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
+    mod_qname = axutil_qname_create(env, module_name, NULL, NULL);
 
     module =  axis2_conf_get_module(svc_client->conf, env, mod_qname);
 
@@ -484,7 +484,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_svc_client_send_robust_with_op_qname(axis2_svc_client_t *svc_client,
     const axutil_env_t *env,
-    const axis2_qname_t *op_qname,
+    const axutil_qname_t *op_qname,
     const axiom_node_t *payload)
 {
     axis2_msg_ctx_t *msg_ctx = NULL;
@@ -495,7 +495,7 @@
 
     if (!op_qname)
     {
-        op_qname = axis2_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
+        op_qname = axutil_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
         qname_free_flag = AXIS2_TRUE;
     }
 
@@ -516,7 +516,7 @@
     
     if (qname_free_flag)
     {
-        axis2_qname_free((axis2_qname_t *) op_qname, env);
+        axutil_qname_free((axutil_qname_t *) op_qname, env);
     }
 
     return status;
@@ -533,7 +533,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_fire_and_forget_with_op_qname(axis2_svc_client_t *svc_client,
     const axutil_env_t *env,
-    const axis2_qname_t *op_qname,
+    const axutil_qname_t *op_qname,
     const axiom_node_t *payload)
 {
     axis2_op_client_t *op_client = NULL;
@@ -547,7 +547,7 @@
 
     if (!op_qname)
     {
-        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);
         qname_free_flag = AXIS2_TRUE;
     }
 
@@ -568,7 +568,7 @@
     
     if (qname_free_flag)
     {
-        axis2_qname_free((axis2_qname_t *) op_qname, env);
+        axutil_qname_free((axutil_qname_t *) op_qname, env);
     }
 
     return;
@@ -586,14 +586,14 @@
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axis2_svc_client_send_receive_with_op_qname(axis2_svc_client_t *svc_client,
     const axutil_env_t *env,
-    const axis2_qname_t *op_qname,
+    const axutil_qname_t *op_qname,
     const axiom_node_t *payload)
 {
     axiom_soap_envelope_t *soap_envelope = NULL;
     axiom_soap_body_t *soap_body = NULL;
     axiom_node_t *soap_node = NULL;
     axis2_op_t *op = NULL;
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
     axis2_uri_t *action_uri = NULL;
     axis2_char_t *action_str = NULL;
     axis2_bool_t qname_free_flag = AXIS2_FALSE;
@@ -609,7 +609,7 @@
         param = axis2_op_get_param(op, env, AXIS2_SOAP_ACTION);
         if (param)
         {
-            action_uri = (axis2_uri_t *) axis2_param_get_value(param, env);
+            action_uri = (axis2_uri_t *) axutil_param_get_value(param, env);
             action_str = axis2_uri_to_string(action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
             axis2_options_set_action(svc_client->options, env, action_str);
         }
@@ -618,7 +618,7 @@
     if (!op_qname)
     {
         qname_free_flag = AXIS2_TRUE;
-        op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
+        op_qname = axutil_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
     }
 
     if (axis2_options_get_use_separate_listener(svc_client->options, env))
@@ -743,7 +743,7 @@
 
     if (qname_free_flag)
     {
-        axis2_qname_free((axis2_qname_t *) op_qname, env);
+        axutil_qname_free((axutil_qname_t *) op_qname, env);
     }
 
     if (!soap_envelope)
@@ -787,7 +787,7 @@
 AXIS2_EXTERN void AXIS2_CALL
 axis2_svc_client_send_receive_non_blocking_with_op_qname(axis2_svc_client_t *svc_client,
     const axutil_env_t *env,
-    const axis2_qname_t *op_qname,
+    const axutil_qname_t *op_qname,
     const axiom_node_t *payload,
     axis2_callback_t *callback)
 {
@@ -797,7 +797,7 @@
 
     if (!op_qname)
     {
-        op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
+        op_qname = axutil_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
         qname_free_flag = AXIS2_TRUE;
     }
 
@@ -840,7 +840,7 @@
     
     if (qname_free_flag)
     {
-        axis2_qname_free((axis2_qname_t *) op_qname, env);
+        axutil_qname_free((axutil_qname_t *) op_qname, env);
         op_qname = NULL;
     }
 
@@ -860,7 +860,7 @@
 AXIS2_EXTERN axis2_op_client_t *AXIS2_CALL
 axis2_svc_client_create_op_client(axis2_svc_client_t *svc_client,
     const axutil_env_t *env,
-    const axis2_qname_t *op_qname)
+    const axutil_qname_t *op_qname)
 {
     axis2_op_t *op = NULL;
 
@@ -1039,12 +1039,12 @@
      later in the convenience API; if you use
      this constructor then you can't expect any magic!
     */
-    axis2_qname_t *tmp_qname;
+    axutil_qname_t *tmp_qname;
     axis2_svc_t *svc;
     axis2_op_t *op_out_in, *op_out_only, *op_robust_out_only;
     axis2_phases_info_t *info = NULL;
 
-    tmp_qname = axis2_qname_create(env, AXIS2_ANON_SERVICE, NULL, NULL);
+    tmp_qname = axutil_qname_create(env, AXIS2_ANON_SERVICE, NULL, NULL);
 
     if (!tmp_qname)
     {
@@ -1059,9 +1059,9 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_qname_free(tmp_qname, env);
+    axutil_qname_free(tmp_qname, env);
 
-    tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
+    tmp_qname = axutil_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
 
     if (!tmp_qname)
     {
@@ -1069,10 +1069,10 @@
         return NULL;
     }
     op_out_in = axis2_op_create_with_qname(env, tmp_qname);
-    axis2_qname_free(tmp_qname, env);
+    axutil_qname_free(tmp_qname, env);
 
 
-    tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
+    tmp_qname = axutil_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
 
     if (!tmp_qname)
     {
@@ -1080,9 +1080,9 @@
         return NULL;
     }
     op_out_only = axis2_op_create_with_qname(env, tmp_qname);
-    axis2_qname_free(tmp_qname, env);
+    axutil_qname_free(tmp_qname, env);
 
-    tmp_qname = axis2_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
+    tmp_qname = axutil_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
 
     if (!tmp_qname)
     {
@@ -1090,7 +1090,7 @@
         return NULL;
     }
     op_robust_out_only = axis2_op_create_with_qname(env, tmp_qname);
-    axis2_qname_free(tmp_qname, env);
+    axutil_qname_free(tmp_qname, env);
 
     if (!op_out_in || !op_out_only || !op_robust_out_only)
     {

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Fri Mar 30 12:24:00 2007
@@ -450,7 +450,7 @@
     axis2_svc_ctx_t *svc_ctx = NULL;
     axis2_svc_t *svc = NULL;
     axis2_svc_grp_t *svc_grp = NULL;
-    const axis2_qname_t *qname = NULL;
+    const axutil_qname_t *qname = NULL;
     axis2_char_t *svc_id = NULL;
     axis2_op_ctx_t *op_ctx = NULL;
 
@@ -475,7 +475,7 @@
         return NULL;
     }
 
-    svc_id = axis2_qname_get_localpart(qname, env);
+    svc_id = axutil_qname_get_localpart(qname, env);
     if (!svc_id)
     {
         AXIS2_ERROR_SET(env->error,
@@ -491,7 +491,7 @@
 
     if (!svc_grp_ctx_id)
     {
-        svc_grp_ctx_id = (axis2_char_t*)axis2_string_get_buffer(
+        svc_grp_ctx_id = (axis2_char_t*)axutil_string_get_buffer(
              axis2_msg_ctx_get_svc_grp_ctx_id(msg_ctx, env), env);
     }
 
@@ -519,10 +519,10 @@
         svc_grp_ctx_id = axis2_uuid_gen(env);
         if (svc_grp_ctx_id)
         {
-            axis2_string_t *svc_grp_ctx_id_str = 
-                axis2_string_create_assume_ownership(env, &svc_grp_ctx_id);
+            axutil_string_t *svc_grp_ctx_id_str = 
+                axutil_string_create_assume_ownership(env, &svc_grp_ctx_id);
              axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
-            axis2_string_free(svc_grp_ctx_id_str, env);
+            axutil_string_free(svc_grp_ctx_id_str, env);
         }
     }
 

Modified: webservices/axis2/trunk/c/modules/core/context/ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/ctx.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/ctx.c Fri Mar 30 12:24:00 2007
@@ -58,7 +58,7 @@
 axis2_ctx_set_property(struct axis2_ctx *ctx,
     const axutil_env_t *env,
     const axis2_char_t *key,
-    axis2_property_t *value)
+    axutil_property_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -66,16 +66,16 @@
     {
         /* handle the case where we are setting a new value with the 
            same key, we would have to free the existing value */
-        axis2_property_t *temp_value = axutil_hash_get(ctx->property_map, 
+        axutil_property_t *temp_value = axutil_hash_get(ctx->property_map, 
             key, 
             AXIS2_HASH_KEY_STRING);
 		if (temp_value)
 		{
-			void *temp_value_value =  axis2_property_get_value (temp_value, env);
-			void *value_value =  axis2_property_get_value (value, env);
+			void *temp_value_value =  axutil_property_get_value (temp_value, env);
+			void *value_value =  axutil_property_get_value (value, env);
 			if (temp_value_value != value_value)
 			{
-				axis2_property_free(temp_value, env);
+				axutil_property_free(temp_value, env);
 			}
 		}
     }
@@ -88,12 +88,12 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_property_t *AXIS2_CALL
+AXIS2_EXTERN axutil_property_t *AXIS2_CALL
 axis2_ctx_get_property(const axis2_ctx_t *ctx,
     const axutil_env_t *env,
     const axis2_char_t *key)
 {
-    axis2_property_t *ret = NULL;
+    axutil_property_t *ret = NULL;
 
     if (ctx->property_map)
     {
@@ -137,14 +137,14 @@
         for (hi = axutil_hash_first(ctx->property_map, env);
             hi; hi = axutil_hash_next(env, hi))
         {
-            axis2_property_t *property = NULL;
+            axutil_property_t *property = NULL;
 
             axutil_hash_this(hi, &key, NULL, &val);
-            property = (axis2_property_t *) val;
+            property = (axutil_property_t *) val;
 
             if (property)
             {
-                axis2_property_free(property, env);
+                axutil_property_free(property, env);
             }
         }
         axutil_hash_free(ctx->property_map, env);
@@ -170,14 +170,14 @@
         for (hi = axutil_hash_first(ctx->property_map, env);
             hi; hi = axutil_hash_next(env, hi))
         {
-            axis2_property_t *property = NULL;
+            axutil_property_t *property = NULL;
 
             axutil_hash_this(hi, &key, NULL, &val);
-            property = (axis2_property_t *) val;
+            property = (axutil_property_t *) val;
 
             if (property)
             {
-                axis2_property_free(property, env);
+                axutil_property_free(property, env);
             }
         }
         if (ctx->property_map != map) /* handle repeated invocation case */

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Fri Mar 30 12:24:00 2007
@@ -84,9 +84,9 @@
     /** paused phase name */
     axis2_char_t *paused_phase_name;
     /** paused handler name */
-    axis2_string_t *paused_handler_name;
+    axutil_string_t *paused_handler_name;
     /** SOAP action */
-    axis2_string_t *soap_action;
+    axutil_string_t *soap_action;
     /** are we doing MTOM now? */
     axis2_bool_t doing_mtom;
     /** are we doing REST now? */
@@ -96,7 +96,7 @@
     /** use SOAP 1.1? */
     axis2_bool_t is_soap_11;
     /** service group context id */
-    axis2_string_t *svc_grp_ctx_id;
+    axutil_string_t *svc_grp_ctx_id;
     /** qname of transport in */
     AXIS2_TRANSPORT_ENUMS transport_in_desc_enum;
     /** qname of transport out */
@@ -104,9 +104,9 @@
     /** service group id */
     axis2_char_t *svc_grp_id;
     /** service description qname */
-    axis2_qname_t *svc_qname;
+    axutil_qname_t *svc_qname;
     /** op qname */
-    axis2_qname_t *op_qname;
+    axutil_qname_t *op_qname;
     /* To keep track of the direction */
     int flow;
     /** The chain of Handlers/Phases for processing this message */
@@ -143,8 +143,8 @@
                 const axutil_env_t *env,
                 struct axis2_svc *svc);
 
-    axis2_string_t *charset_encoding;
-    axis2_stream_t *transport_out_stream;
+    axutil_string_t *charset_encoding;
+    axutil_stream_t *transport_out_stream;
     axis2_http_out_transport_info_t *http_out_transport_info;
     axutil_hash_t *transport_headers;
     axis2_char_t *transfer_encoding;
@@ -314,12 +314,12 @@
 
     if (msg_ctx->soap_action)
     {
-        axis2_string_free(msg_ctx->soap_action, env);
+        axutil_string_free(msg_ctx->soap_action, env);
     }
 
     if (msg_ctx->svc_grp_ctx_id)
     {
-        axis2_string_free(msg_ctx->svc_grp_ctx_id, env);
+        axutil_string_free(msg_ctx->svc_grp_ctx_id, env);
     }
 
     if (msg_ctx->soap_envelope)
@@ -335,7 +335,7 @@
 
     if (msg_ctx->charset_encoding)
     {
-        axis2_string_free(msg_ctx->charset_encoding, env);
+        axutil_string_free(msg_ctx->charset_encoding, env);
     }
     
     if (msg_ctx->transport_out_stream)
@@ -387,7 +387,7 @@
     if (msg_ctx->svc_qname)
     {
         msg_ctx->svc = axis2_conf_get_svc(conf, env,
-                axis2_qname_get_localpart(msg_ctx->svc_qname, env));
+                axutil_qname_get_localpart(msg_ctx->svc_qname, env));
     }
 
     if (msg_ctx->op_qname)
@@ -1093,13 +1093,13 @@
 }
 
 
-axis2_param_t *AXIS2_CALL
+axutil_param_t *AXIS2_CALL
 axis2_msg_ctx_get_parameter(
     const axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env,
     const axis2_char_t *key)
 {
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -1139,7 +1139,7 @@
     return param;
 }
 
-axis2_property_t *AXIS2_CALL
+axutil_property_t *AXIS2_CALL
 axis2_msg_ctx_get_property(
     const axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env,
@@ -1217,14 +1217,14 @@
     struct axis2_msg_ctx *msg_ctx,
     const axutil_env_t *env,
     const axis2_char_t *key,
-    axis2_property_t *value)
+    axutil_property_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     return axis2_ctx_set_property(msg_ctx->base, env, key, value);
 }
 
-const axis2_string_t *AXIS2_CALL
+const axutil_string_t *AXIS2_CALL
 axis2_msg_ctx_get_paused_handler_name(
     const axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env)
@@ -1251,7 +1251,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_string_t *AXIS2_CALL
+axutil_string_t *AXIS2_CALL
   axis2_msg_ctx_get_soap_action(
     const axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env)
@@ -1263,18 +1263,18 @@
 axis2_msg_ctx_set_soap_action(
     struct axis2_msg_ctx *msg_ctx,
     const axutil_env_t *env,
-    axis2_string_t *soap_action)
+    axutil_string_t *soap_action)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (msg_ctx->soap_action)
     {
-        axis2_string_free(msg_ctx->soap_action, env);
+        axutil_string_free(msg_ctx->soap_action, env);
     }
 
     if (soap_action)
     {
-        msg_ctx->soap_action = axis2_string_clone(soap_action, env);
+        msg_ctx->soap_action = axutil_string_clone(soap_action, env);
         if (!(msg_ctx->soap_action))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1406,7 +1406,7 @@
     if (op)
     {
         msg_ctx->op = op;
-        msg_ctx->op_qname = (axis2_qname_t *)axis2_op_get_qname(op, env);
+        msg_ctx->op_qname = (axutil_qname_t *)axis2_op_get_qname(op, env);
     }
 
     return AXIS2_SUCCESS;
@@ -1432,7 +1432,7 @@
     {
         axis2_svc_grp_t *svc_grp = NULL;
         msg_ctx->svc = svc;
-        msg_ctx->svc_qname = (axis2_qname_t *)axis2_svc_get_qname(svc, env);
+        msg_ctx->svc_qname = (axutil_qname_t *)axis2_svc_get_qname(svc, env);
 
         svc_grp = axis2_svc_get_parent(svc, env);
         if (svc_grp)
@@ -1472,7 +1472,7 @@
     return AXIS2_SUCCESS;
 }
 
-const axis2_string_t *AXIS2_CALL
+const axutil_string_t *AXIS2_CALL
 axis2_msg_ctx_get_svc_grp_ctx_id(
     const axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env)
@@ -1484,19 +1484,19 @@
 axis2_msg_ctx_set_svc_grp_ctx_id(
     struct axis2_msg_ctx *msg_ctx,
     const axutil_env_t *env,
-    axis2_string_t *svc_grp_ctx_id)
+    axutil_string_t *svc_grp_ctx_id)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (msg_ctx->svc_grp_ctx_id)
     {
-        axis2_string_free(msg_ctx->svc_grp_ctx_id, env);
+        axutil_string_free(msg_ctx->svc_grp_ctx_id, env);
         msg_ctx->svc_grp_ctx_id = NULL;
     }
 
     if (svc_grp_ctx_id)
     {
-        msg_ctx->svc_grp_ctx_id = axis2_string_clone(svc_grp_ctx_id, env);
+        msg_ctx->svc_grp_ctx_id = axutil_string_clone(svc_grp_ctx_id, env);
     }
     return AXIS2_SUCCESS;
 }
@@ -1553,9 +1553,9 @@
     const axutil_env_t *env,
     axis2_options_t *options)
 {
-    axis2_property_t *rest_val = NULL;
+    axutil_property_t *rest_val = NULL;
 	axis2_char_t *value;
-	axis2_string_t *soap_action = NULL;;
+	axutil_string_t *soap_action = NULL;;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, options, AXIS2_FAILURE);
@@ -1573,11 +1573,11 @@
 
      axis2_ctx_set_property_map(msg_ctx->base, env,
             axis2_options_get_properties(options, env));
-    rest_val = (axis2_property_t *)  axis2_msg_ctx_get_property(msg_ctx, env,
+    rest_val = (axutil_property_t *)  axis2_msg_ctx_get_property(msg_ctx, env,
             AXIS2_ENABLE_REST);
     if (rest_val)
     {
-		value = (axis2_char_t *)axis2_property_get_value(rest_val, env);
+		value = (axis2_char_t *)axutil_property_get_value(rest_val, env);
 		if (value)
 		{
 			if (axis2_strcmp(value, AXIS2_VALUE_TRUE) == 0)
@@ -1587,13 +1587,13 @@
 
     if (msg_ctx->soap_action)
     {
-        axis2_string_free(msg_ctx->soap_action, env);
+        axutil_string_free(msg_ctx->soap_action, env);
     }
     
     soap_action = axis2_options_get_soap_action(options, env);
     if (soap_action)
     {
-        msg_ctx->soap_action = axis2_string_clone(soap_action, env);
+        msg_ctx->soap_action = axutil_string_clone(soap_action, env);
     }
 
     return AXIS2_SUCCESS;
@@ -1656,7 +1656,7 @@
         if (handler)
         {
             msg_ctx->paused_handler_name =
-                (axis2_string_t *)AXIS2_HANDLER_GET_NAME(handler, env);
+                (axutil_string_t *)AXIS2_HANDLER_GET_NAME(handler, env);
         }
     }
     return AXIS2_SUCCESS;
@@ -1721,7 +1721,7 @@
 }
 
 
-AXIS2_EXTERN axis2_string_t* AXIS2_CALL
+AXIS2_EXTERN axutil_string_t* AXIS2_CALL
 axis2_msg_ctx_get_charset_encoding(axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env)
 {    
@@ -1734,18 +1734,18 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_charset_encoding(axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env,
-    axis2_string_t *str)
+    axutil_string_t *str)
 {    
     if (msg_ctx)
     {
         if (msg_ctx->charset_encoding)
         {
-            axis2_string_free(msg_ctx->charset_encoding, env);
+            axutil_string_free(msg_ctx->charset_encoding, env);
             msg_ctx->charset_encoding = NULL;
         }
         if (str)
         {
-            msg_ctx->charset_encoding = axis2_string_clone(str, env);
+            msg_ctx->charset_encoding = axutil_string_clone(str, env);
         }
     }
     else
@@ -1756,7 +1756,7 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
 axis2_msg_ctx_get_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env)
 {
@@ -1773,7 +1773,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_msg_ctx_set_transport_out_stream(axis2_msg_ctx_t *msg_ctx,
     const axutil_env_t *env,
-    axis2_stream_t *stream)
+    axutil_stream_t *stream)
 {
     if (msg_ctx)
     {

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Fri Mar 30 12:24:00 2007
@@ -43,9 +43,9 @@
      */
     axutil_hash_t *op_ctx_map;
     /** op qname */
-    axis2_qname_t *op_qname;
+    axutil_qname_t *op_qname;
     /** service qname */
-    axis2_qname_t *svc_qname;
+    axutil_qname_t *svc_qname;
     /* mutex to synchronize the read/write operations */
     axis2_thread_mutex_t *mutex;
     axis2_bool_t response_written;
@@ -105,7 +105,7 @@
 
     if (op_ctx->op)
     {
-        op_ctx->op_qname = (axis2_qname_t *)axis2_op_get_qname(op_ctx->op, env);
+        op_ctx->op_qname = (axutil_qname_t *)axis2_op_get_qname(op_ctx->op, env);
         op_ctx->op_mep = axis2_op_get_axis_specific_mep_const(op_ctx->op, env);
     }
 
@@ -170,7 +170,7 @@
         axis2_svc_t *svc = NULL;
         axis2_char_t *svc_name = NULL;
 
-        svc_name = axis2_qname_get_localpart(op_ctx->svc_qname, env);
+        svc_name = axutil_qname_get_localpart(op_ctx->svc_qname, env);
 
         if (svc_name)
         {
@@ -326,7 +326,7 @@
                  axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
         }
         op_ctx->svc_qname =
-            (axis2_qname_t *)axis2_svc_get_qname( axis2_svc_ctx_get_svc(op_ctx->parent, env), env);
+            (axutil_qname_t *)axis2_svc_get_qname( axis2_svc_ctx_get_svc(op_ctx->parent, env), env);
     }
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Fri Mar 30 12:24:00 2007
@@ -31,7 +31,7 @@
     /** id of the service associated with this context */
     axis2_char_t *svc_id;
     /** service qname */
-    axis2_qname_t *svc_qname;
+    axutil_qname_t *svc_qname;
 };
 
 AXIS2_EXTERN axis2_svc_ctx_t *AXIS2_CALL
@@ -67,10 +67,10 @@
     if (svc)
     {
         svc_ctx->svc = svc;
-        svc_ctx->svc_qname = (axis2_qname_t *)axis2_svc_get_qname(svc, env);
+        svc_ctx->svc_qname = (axutil_qname_t *)axis2_svc_get_qname(svc, env);
         if (svc_ctx->svc_qname)
         {
-            svc_ctx->svc_id = axis2_qname_get_localpart(svc_ctx->svc_qname, env);
+            svc_ctx->svc_id = axutil_qname_get_localpart(svc_ctx->svc_qname, env);
         }
     }
 
@@ -135,7 +135,7 @@
 
     if (svc_ctx->svc_qname)
     {
-        axis2_char_t *svc_name = axis2_qname_get_localpart(svc_ctx->svc_qname, env);
+        axis2_char_t *svc_name = axutil_qname_get_localpart(svc_ctx->svc_qname, env);
         svc_ctx->svc = axis2_conf_get_svc(conf, env, svc_name);
     }
 
@@ -169,10 +169,10 @@
     AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
 
     svc_ctx->svc = svc;
-    svc_ctx->svc_qname = (axis2_qname_t *)axis2_svc_get_qname(svc, env);
+    svc_ctx->svc_qname = (axutil_qname_t *)axis2_svc_get_qname(svc, env);
     if (svc_ctx->svc_qname)
     {
-        svc_ctx->svc_id = axis2_qname_get_localpart(svc_ctx->
+        svc_ctx->svc_id = axutil_qname_get_localpart(svc_ctx->
                 svc_qname, env);
     }
     return AXIS2_SUCCESS;
@@ -191,7 +191,7 @@
 axis2_svc_ctx_create_op_ctx(
     struct axis2_svc_ctx *svc_ctx,
     const axutil_env_t *env,
-    const axis2_qname_t *qname)
+    const axutil_qname_t *qname)
 {
     axis2_op_t *op = NULL;
 

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Fri Mar 30 12:24:00 2007
@@ -231,7 +231,7 @@
                     axis2_char_t *svc_name = NULL;
                     svc = (axis2_svc_t*) next_svc;
                     svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
-                    svc_name = axis2_qname_get_localpart(axis2_svc_get_qname(svc, env), env);
+                    svc_name = axutil_qname_get_localpart(axis2_svc_get_qname(svc, env), env);
                     if (svc_name)
                         axutil_hash_set(svc_grp_ctx->svc_ctx_map, svc_name, AXIS2_HASH_KEY_STRING, svc_ctx);
                 }

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Fri Mar 30 12:24:00 2007
@@ -298,13 +298,13 @@
     const axutil_env_t *env,
     axis2_svc_t *svc_desc)
 {
-    const axis2_qname_t *svc_qname = NULL;
+    const axutil_qname_t *svc_qname = NULL;
     axis2_char_t *svc_name = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, svc_desc, AXIS2_FAILURE);
 
     svc_qname = axis2_svc_get_qname(svc_desc, env);
-    svc_name = axis2_qname_to_string((axis2_qname_t *)svc_qname, env);
+    svc_name = axutil_qname_to_string((axutil_qname_t *)svc_qname, env);
     if (!arch_file_data->svc_map)
     {
         arch_file_data->svc_map = axutil_hash_make(env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Fri Mar 30 12:24:00 2007
@@ -176,12 +176,12 @@
         svc = axis2_arch_file_data_get_svc(file_data, env, svc_name);
         if (!svc)
         {
-            axis2_qname_t *svc_qname = NULL;
+            axutil_qname_t *svc_qname = NULL;
 
-            svc_qname = axis2_qname_create(env, svc_name, NULL, NULL);
+            svc_qname = axutil_qname_create(env, svc_name, NULL, NULL);
             svc = axis2_svc_create_with_qname(env, svc_qname);
             status = axis2_arch_file_data_add_svc(file_data, env, svc);
-            axis2_qname_free(svc_qname, env);
+            axutil_qname_free(svc_qname, env);
             if (AXIS2_SUCCESS != status)
             {
                 axis2_svc_free(svc, env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_conf.h>
 #include <axutil_array_list.h>
 #include <axutil_dir_handler.h>

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_conf.h>
 #include <axis2_deployment.h>
 #include <axis2_arch_file_data.h>

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include "axis2_desc_builder.h"
 #include <axis2_conf.h>
 #include "axis2_dep_engine.h"

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Fri Mar 30 12:24:00 2007
@@ -79,7 +79,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_dep_engine_add_module(axis2_dep_engine_t *dep_engine,
         const axutil_env_t *env,
-        axis2_qname_t *module_qname);
+        axutil_qname_t *module_qname);
 
     /** 
      * @param dep_engine pointer to deployment engine
@@ -89,7 +89,7 @@
     AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
     axis2_dep_engine_get_module(const axis2_dep_engine_t *dep_engine,
         const axutil_env_t *env,
-        axis2_qname_t *module_name);
+        axutil_qname_t *module_name);
 
     /** 
      * @param dep_engine pointer to deployment engine

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
 #include <axis2_defines.h>
 #include <axutil_env.h>
 #include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_hash.h>
 
 #ifdef __cplusplus



---------------------------------------------------------------------
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