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

svn commit: r524243 [11/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/ mod...

Modified: webservices/axis2/trunk/c/util/src/param.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Fri Mar 30 12:24:00 2007
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-#include <axis2_param.h>
+#include <axutil_param.h>
 #include <axis2_utils.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_generic_obj.h>
 
-struct axis2_param
+struct axutil_param
 {
     /** Parameter name */
     axis2_char_t *name;
@@ -37,16 +37,16 @@
         const axutil_env_t *env);
 };
 
-AXIS2_EXTERN axis2_param_t* AXIS2_CALL
-axis2_param_create(const axutil_env_t *env,
+AXIS2_EXTERN axutil_param_t* AXIS2_CALL
+axutil_param_create(const axutil_env_t *env,
     axis2_char_t *name, 
     void *value)
 {
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    param = AXIS2_MALLOC(env->allocator, sizeof(axis2_param_t));
+    param = AXIS2_MALLOC(env->allocator, sizeof(axutil_param_t));
     if (!param)
     {
         AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
@@ -66,21 +66,21 @@
 }
 
 axis2_char_t* AXIS2_CALL
-axis2_param_get_name(axis2_param_t *param,
+axutil_param_get_name(axutil_param_t *param,
     const axutil_env_t *env)
 {
     return param->name;
 }
 
 void* AXIS2_CALL
-axis2_param_get_value(axis2_param_t *param,
+axutil_param_get_value(axutil_param_t *param,
     const axutil_env_t *env)
 {
     return param->value;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_param_set_name(axis2_param_t *param,
+axutil_param_set_name(axutil_param_t *param,
     const axutil_env_t *env,
     const axis2_char_t *name)
 {
@@ -91,14 +91,14 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_param_set_value(axis2_param_t *param,
+axutil_param_set_value(axutil_param_t *param,
     const axutil_env_t *env,
     const void *value)
 {
     void *param_value = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    param_value = axis2_param_get_value(param, env);
+    param_value = axutil_param_get_value(param, env);
     if (param_value)
     {
         if (param && param->value_free)
@@ -115,7 +115,7 @@
 }
 
 axis2_bool_t AXIS2_CALL
-axis2_param_is_locked(axis2_param_t *param,
+axutil_param_is_locked(axutil_param_t *param,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -123,7 +123,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_param_set_locked(axis2_param_t *param,
+axutil_param_set_locked(axutil_param_t *param,
     const axutil_env_t *env,
     axis2_bool_t value)
 {
@@ -134,14 +134,14 @@
 }
 
 int AXIS2_CALL
-axis2_param_get_param_type(axis2_param_t *param,
+axutil_param_get_param_type(axutil_param_t *param,
     const axutil_env_t *env)
 {
     return param->type;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_param_set_param_type(axis2_param_t *param,
+axutil_param_set_param_type(axutil_param_t *param,
     const axutil_env_t *env,
     int type)
 {
@@ -152,7 +152,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_param_set_attributes(axis2_param_t *param,
+axutil_param_set_attributes(axutil_param_t *param,
     const axutil_env_t *env,
     axutil_hash_t *attrs)
 {
@@ -178,14 +178,14 @@
 }
 
 axutil_hash_t* AXIS2_CALL
-axis2_param_get_attributes(axis2_param_t *param,
+axutil_param_get_attributes(axutil_param_t *param,
     const axutil_env_t *env)
 {
     return param->attrs;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_param_set_value_list(axis2_param_t *param,
+axutil_param_set_value_list(axutil_param_t *param,
     const axutil_env_t *env,
     axutil_array_list_t *value_list)
 {
@@ -199,11 +199,11 @@
         size = axutil_array_list_size(param->value_list, env);
         for (i = 0; i < size; i++)
         {
-            axis2_param_t *param = NULL;
+            axutil_param_t *param = NULL;
 
-            param = (axis2_param_t *) axutil_array_list_get(
+            param = (axutil_param_t *) axutil_array_list_get(
                 param->value_list, env, i);
-            axis2_param_free(param, env);
+            axutil_param_free(param, env);
         }
         axutil_array_list_free(param->value_list, env);
     }
@@ -213,14 +213,14 @@
 }
 
 axutil_array_list_t* AXIS2_CALL
-axis2_param_get_value_list(axis2_param_t *param,
+axutil_param_get_value_list(axutil_param_t *param,
     const axutil_env_t *env)
 {
     return param->value_list;
 }
 
 void AXIS2_CALL
-axis2_param_free(axis2_param_t *param,
+axutil_param_free(axutil_param_t *param,
     const axutil_env_t *env)
 {
     void *param_value = NULL;
@@ -228,7 +228,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    param_value = axis2_param_get_value(param, env);
+    param_value = axutil_param_get_value(param, env);
     if (param_value)
     {
         if (param && param->value_free)
@@ -262,25 +262,25 @@
         size = axutil_array_list_size(param->value_list, env);
         for (i = 0; i < size; i++)
         {
-            axis2_param_t *param_l = NULL;
+            axutil_param_t *param_l = NULL;
 
-            param_l = (axis2_param_t *) axutil_array_list_get(
+            param_l = (axutil_param_t *) axutil_array_list_get(
                 param->value_list, env, i);
             if (param_l)
             {
-                axis2_param_free(param_l, env);
+                axutil_param_free(param_l, env);
             }
         }
         axutil_array_list_free(param->value_list, env);
     }
-    param_name = axis2_param_get_name(param, env);
+    param_name = axutil_param_get_name(param, env);
     AXIS2_FREE(env->allocator, param_name);
     AXIS2_FREE(env->allocator, param);
     return;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_param_set_value_free(axis2_param_t *param,
+axutil_param_set_value_free(axutil_param_t *param,
     const axutil_env_t *env,
     void *free_fn)
 {

Modified: webservices/axis2/trunk/c/util/src/param_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param_container.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/param_container.c (original)
+++ webservices/axis2/trunk/c/util/src/param_container.c Fri Mar 30 12:24:00 2007
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
 
-struct axis2_param_container
+struct axutil_param_container
 {
     axutil_hash_t *params;
     axutil_array_list_t *params_list;
 };
 
-AXIS2_EXTERN axis2_param_container_t * AXIS2_CALL
-axis2_param_container_create(const axutil_env_t *env)
+AXIS2_EXTERN axutil_param_container_t * AXIS2_CALL
+axutil_param_container_create(const axutil_env_t *env)
 {
-    axis2_param_container_t *param_container = NULL;
+    axutil_param_container_t *param_container = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    param_container = (axis2_param_container_t *) AXIS2_MALLOC(env->
-        allocator, sizeof(axis2_param_container_t));
+    param_container = (axutil_param_container_t *) AXIS2_MALLOC(env->
+        allocator, sizeof(axutil_param_container_t));
 
     if (!param_container)
     {
@@ -46,7 +46,7 @@
     param_container->params = axutil_hash_make(env);
     if (!param_container->params)
     {
-        axis2_param_container_free(param_container, env);
+        axutil_param_container_free(param_container, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
@@ -55,7 +55,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_param_container_free(axis2_param_container_t *param_container,
+axutil_param_container_free(axutil_param_container_t *param_container,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -67,12 +67,12 @@
         for (hi = axutil_hash_first(param_container->params, env); hi;
             hi = axutil_hash_next(env, hi))
         {
-            axis2_param_t *param = NULL;
+            axutil_param_t *param = NULL;
             axutil_hash_this(hi, NULL, NULL, &val);
-            param = (axis2_param_t *) val;
+            param = (axutil_param_t *) val;
             if (param)
             {
-                axis2_param_free(param, env);
+                axutil_param_free(param, env);
                 param = NULL;
             }
             val = NULL;
@@ -94,21 +94,21 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_param_container_free_void_arg(void *param_container,
+axutil_param_container_free_void_arg(void *param_container,
     const axutil_env_t *env)
 {
-    axis2_param_container_t *param_container_l = NULL;
+    axutil_param_container_t *param_container_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    param_container_l = (axis2_param_container_t *) param_container;
-    axis2_param_container_free(param_container_l, env);
+    param_container_l = (axutil_param_container_t *) param_container;
+    axutil_param_container_free(param_container_l, env);
     return;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_param_container_add_param(axis2_param_container_t *param_container,
+axutil_param_container_add_param(axutil_param_container_t *param_container,
     const axutil_env_t *env,
-    axis2_param_t *param)
+    axutil_param_t *param)
 {
     axis2_char_t *param_name = NULL;
 
@@ -123,7 +123,7 @@
             return AXIS2_FAILURE;
         }
     }
-    param_name = axis2_param_get_name(param, env);
+    param_name = axutil_param_get_name(param, env);
     if (!param_name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
@@ -136,17 +136,17 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_param_t * AXIS2_CALL
-axis2_param_container_get_param(axis2_param_container_t *param_container,
+AXIS2_EXTERN axutil_param_t * AXIS2_CALL
+axutil_param_container_get_param(axutil_param_container_t *param_container,
     const axutil_env_t *env,
     const axis2_char_t *name)
 {
-    return (axis2_param_t *)(axutil_hash_get(param_container->params, 
+    return (axutil_param_t *)(axutil_hash_get(param_container->params, 
         name, AXIS2_HASH_KEY_STRING));
 }
 
 AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
-axis2_param_container_get_params(axis2_param_container_t *param_container,
+axutil_param_container_get_params(axutil_param_container_t *param_container,
     const axutil_env_t *env)
 {
     axutil_hash_index_t *index_i = 0;
@@ -181,21 +181,21 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_param_container_is_param_locked(axis2_param_container_t *param_container,
+axutil_param_container_is_param_locked(axutil_param_container_t *param_container,
     const axutil_env_t *env,
     const axis2_char_t *param_name)
 {
-    axis2_param_t *param = NULL;
+    axutil_param_t *param = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    param = (axis2_param_t *)(axutil_hash_get(param_container->params, 
+    param = (axutil_param_t *)(axutil_hash_get(param_container->params, 
         param_name, AXIS2_HASH_KEY_STRING));
     if (!param)
     {
         /* In this case we consider param is not locked */
         return AXIS2_FALSE;
     }
-    return axis2_param_is_locked(param, env);
+    return axutil_param_is_locked(param, env);
 }
 

Modified: webservices/axis2/trunk/c/util/src/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/properties.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/properties.c (original)
+++ webservices/axis2/trunk/c/util/src/properties.c Fri Mar 30 12:24:00 2007
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <axis2_properties.h>
-#include <axis2_string.h>
+#include <axutil_properties.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 
 
@@ -24,31 +24,31 @@
 #define MAX_ALLOC (MAX_SIZE * 64)
 
 axis2_char_t*
-axis2_properties_read(FILE* input,
+axutil_properties_read(FILE* input,
     const axutil_env_t* env);
 
 axis2_char_t*
-axis2_properties_read_next(axis2_char_t* cur);
+axutil_properties_read_next(axis2_char_t* cur);
 
 axis2_char_t*
-axis2_properties_trunk_and_dup(axis2_char_t* start, 
+axutil_properties_trunk_and_dup(axis2_char_t* start, 
     axis2_char_t* end,
     const axutil_env_t* env);
 
-struct axis2_properties
+struct axutil_properties
 {
     axutil_hash_t *prop_hash;
 };
 
-AXIS2_EXTERN axis2_properties_t *AXIS2_CALL
-axis2_properties_create(const axutil_env_t *env)
+AXIS2_EXTERN axutil_properties_t *AXIS2_CALL
+axutil_properties_create(const axutil_env_t *env)
 {
-    axis2_properties_t *properties = NULL;
+    axutil_properties_t *properties = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    properties= (axis2_properties_t *) AXIS2_MALLOC(env->allocator,
-        sizeof(axis2_properties_t));
+    properties= (axutil_properties_t *) AXIS2_MALLOC(env->allocator,
+        sizeof(axutil_properties_t));
 
     if (!properties)
     {
@@ -61,7 +61,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_properties_free(axis2_properties_t *properties,
+axutil_properties_free(axutil_properties_t *properties,
     const axutil_env_t *env)
 {
     axis2_char_t *key = NULL;
@@ -96,7 +96,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_properties_get_property(axis2_properties_t *properties,
+axutil_properties_get_property(axutil_properties_t *properties,
     const axutil_env_t *env,
     axis2_char_t *key)
 {
@@ -107,7 +107,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_properties_set_property(axis2_properties_t *properties,
+axutil_properties_set_property(axutil_properties_t *properties,
     const axutil_env_t *env,
     axis2_char_t *key,
     axis2_char_t *value)
@@ -121,14 +121,14 @@
 }
 
 AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
-axis2_properties_get_all(axis2_properties_t *properties,
+axutil_properties_get_all(axutil_properties_t *properties,
     const axutil_env_t *env)
 {
     return properties-> prop_hash;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_properties_store(axis2_properties_t *properties,
+axutil_properties_store(axutil_properties_t *properties,
     const axutil_env_t *env,
     FILE *output)
 {
@@ -159,7 +159,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_properties_load(axis2_properties_t *properties,
+axutil_properties_load(axutil_properties_t *properties,
     const axutil_env_t *env,
     axis2_char_t *input_filename)
 {
@@ -187,7 +187,7 @@
     {
         return AXIS2_FAILURE;
     }
-    buffer = axis2_properties_read(input, env);
+    buffer = axutil_properties_read(input, env);
 
     if (!buffer)
     {
@@ -200,8 +200,8 @@
 
 
 
-    for (cur = axis2_properties_read_next(buffer); *cur ;
-        cur = axis2_properties_read_next(++cur))
+    for (cur = axutil_properties_read_next(buffer); *cur ;
+        cur = axutil_properties_read_next(++cur))
     {
         if (*cur == '\r')
         {
@@ -225,7 +225,7 @@
                 return AXIS2_FAILURE;
             }
             status = EQUAL_FOUND;
-            key =  axis2_properties_trunk_and_dup(tag, cur, env);
+            key =  axutil_properties_trunk_and_dup(tag, cur, env);
         }
         /* right next to the equal found */
         else if (status == EQUAL_FOUND)
@@ -239,7 +239,7 @@
             *cur = '\0';
             if (status == LINE_HALFWAY)
             {
-                tag =  axis2_properties_trunk_and_dup(tag, cur, env);
+                tag =  axutil_properties_trunk_and_dup(tag, cur, env);
                 axutil_hash_set(prop_hash,
                     key, AXIS2_HASH_KEY_STRING, tag);
             }
@@ -249,7 +249,7 @@
     if (status == LINE_HALFWAY)
     {
         *cur = '\0';
-        tag =  axis2_properties_trunk_and_dup(tag, cur, env);
+        tag =  axutil_properties_trunk_and_dup(tag, cur, env);
         axutil_hash_set(prop_hash,
             key, AXIS2_HASH_KEY_STRING, tag);
         status = LINE_STARTED;
@@ -272,7 +272,7 @@
 
 
 axis2_char_t*
-axis2_properties_read_next(axis2_char_t* cur)
+axutil_properties_read_next(axis2_char_t* cur)
 {
     /* ignore comment */
     if (*cur == '#')
@@ -290,7 +290,7 @@
 }
 
 axis2_char_t*
-axis2_properties_trunk_and_dup(axis2_char_t* start, 
+axutil_properties_trunk_and_dup(axis2_char_t* start, 
     axis2_char_t* end,
     const axutil_env_t* env)
 {
@@ -302,7 +302,7 @@
 }
 
 axis2_char_t*
-axis2_properties_read(FILE* input,
+axutil_properties_read(FILE* input,
     const axutil_env_t* env)
 {
     int nread = 0;

Modified: webservices/axis2/trunk/c/util/src/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/property.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/property.c (original)
+++ webservices/axis2/trunk/c/util/src/property.c Fri Mar 30 12:24:00 2007
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <axis2_property.h>
+#include <axutil_property.h>
 #include <stdio.h>
 
-struct axis2_property
+struct axutil_property
 {
     axis2_scope_t scope;
     AXIS2_FREE_VOID_ARG free_func;
@@ -26,15 +26,15 @@
     axis2_bool_t own_value;
 };
 
-axis2_property_t *AXIS2_CALL
-axis2_property_create(const axutil_env_t *env)
+axutil_property_t *AXIS2_CALL
+axutil_property_create(const axutil_env_t *env)
 {
-    axis2_property_t *property = NULL;
+    axutil_property_t *property = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    property = (axis2_property_t *) AXIS2_MALLOC(env->allocator,
-        sizeof(axis2_property_t));
+    property = (axutil_property_t *) AXIS2_MALLOC(env->allocator,
+        sizeof(axutil_property_t));
 
     if (!property)
     {
@@ -49,18 +49,18 @@
     return property;
 }
 /*****************************************************************************/
-axis2_property_t *AXIS2_CALL
-axis2_property_create_with_args(const axutil_env_t *env,
+axutil_property_t *AXIS2_CALL
+axutil_property_create_with_args(const axutil_env_t *env,
     axis2_scope_t scope,
     axis2_bool_t own_value,
     AXIS2_FREE_VOID_ARG free_func,
     void *value) 
 {
-    axis2_property_t *property = NULL;
+    axutil_property_t *property = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    property = (axis2_property_t *) axis2_property_create(env);
+    property = (axutil_property_t *) axutil_property_create(env);
 
     if (!property)
     {
@@ -76,7 +76,7 @@
 }
 
 void AXIS2_CALL
-axis2_property_free(axis2_property_t *property,
+axutil_property_free(axutil_property_t *property,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -104,7 +104,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_property_set_scope(axis2_property_t *property,
+axutil_property_set_scope(axutil_property_t *property,
     const axutil_env_t *env,
     axis2_scope_t scope)
 {
@@ -115,7 +115,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_property_set_free_func(axis2_property_t *property,
+axutil_property_set_free_func(axutil_property_t *property,
     const axutil_env_t *env,
     AXIS2_FREE_VOID_ARG free_func)
 {
@@ -126,7 +126,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_property_set_value(axis2_property_t *property,
+axutil_property_set_value(axutil_property_t *property,
     const axutil_env_t *env,
     void *value)
 {
@@ -152,14 +152,14 @@
 }
 
 void *AXIS2_CALL
-axis2_property_get_value(axis2_property_t *property,
+axutil_property_get_value(axutil_property_t *property,
     const axutil_env_t *env)
 {
     return property->value;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_property_set_own_value(axis2_property_t *property,
+axutil_property_set_own_value(axutil_property_t *property,
     const axutil_env_t *env,
     axis2_bool_t own_value)
 {
@@ -170,17 +170,17 @@
 }
 
 
-axis2_property_t* AXIS2_CALL
-axis2_property_clone(axis2_property_t *property,
+axutil_property_t* AXIS2_CALL
+axutil_property_clone(axutil_property_t *property,
     const axutil_env_t *env)
 {
-    axis2_property_t *new_property = NULL;
+    axutil_property_t *new_property = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    new_property = axis2_property_create(env);
-    axis2_property_set_free_func(new_property, env, property->free_func);
-    axis2_property_set_scope(new_property, env, property->scope);
-    axis2_property_set_own_value(new_property, env, property->own_value);
-    axis2_property_set_value(new_property, env, property->value);
+    new_property = axutil_property_create(env);
+    axutil_property_set_free_func(new_property, env, property->free_func);
+    axutil_property_set_scope(new_property, env, property->scope);
+    axutil_property_set_own_value(new_property, env, property->own_value);
+    axutil_property_set_value(new_property, env, property->value);
     return new_property; 
 }
 

Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Fri Mar 30 12:24:00 2007
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axutil_env.h>
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
 #include <string.h>
 #include <stdio.h>
 
-struct axis2_qname
+struct axutil_qname
 {
     /** localpart of qname is mandatory */
     axis2_char_t *localpart;
@@ -35,14 +35,14 @@
     unsigned int ref;
 };
 
-AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
-axis2_qname_create(const axutil_env_t *env,
+AXIS2_EXTERN axutil_qname_t * AXIS2_CALL
+axutil_qname_create(const axutil_env_t *env,
     const axis2_char_t *localpart,
     const axis2_char_t *namespace_uri,
     const axis2_char_t *prefix)
 {
 
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
     /* localpart can't be null */
@@ -53,8 +53,8 @@
         return NULL;
     }
 
-    qname = (axis2_qname_t *) AXIS2_MALLOC(env->allocator,
-            sizeof(axis2_qname_t));
+    qname = (axutil_qname_t *) AXIS2_MALLOC(env->allocator,
+            sizeof(axutil_qname_t));
     if (!qname)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -73,7 +73,7 @@
     {
         AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
         AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
-        axis2_qname_free(qname, env);
+        axutil_qname_free(qname, env);
         return NULL;
     }
     
@@ -86,7 +86,7 @@
     {
         AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
         AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
-        axis2_qname_free(qname, env);
+        axutil_qname_free(qname, env);
         return NULL;
     }
     
@@ -99,7 +99,7 @@
     {
         AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
         AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
-        axis2_qname_free(qname, env);
+        axutil_qname_free(qname, env);
         return NULL;
     }
 
@@ -108,7 +108,7 @@
 
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_qname_free(axis2_qname_t * qname,
+axutil_qname_free(axutil_qname_t * qname,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -144,9 +144,9 @@
 
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_qname_equals(const axis2_qname_t *qname,
+axutil_qname_equals(const axutil_qname_t *qname,
     const axutil_env_t *env,
-    const axis2_qname_t *qname2)
+    const axutil_qname_t *qname2)
 {
     int uris_differ = 0;
     int localparts_differ = 0;
@@ -186,8 +186,8 @@
 }
 
 
-AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
-axis2_qname_clone(axis2_qname_t *qname,
+AXIS2_EXTERN axutil_qname_t* AXIS2_CALL
+axutil_qname_clone(axutil_qname_t *qname,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -203,14 +203,14 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_qname_get_uri(const axis2_qname_t *qname,
+axutil_qname_get_uri(const axutil_qname_t *qname,
     const axutil_env_t *env)
 {
     return qname->namespace_uri;
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_qname_get_prefix(const axis2_qname_t *qname,
+axutil_qname_get_prefix(const axutil_qname_t *qname,
     const axutil_env_t *env)
 {
     return qname->prefix;
@@ -218,14 +218,14 @@
 
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_qname_get_localpart(const axis2_qname_t *qname,
+axutil_qname_get_localpart(const axutil_qname_t *qname,
     const axutil_env_t *env)
 {
     return qname->localpart;
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_qname_to_string(axis2_qname_t *qname,
+axutil_qname_to_string(axutil_qname_t *qname,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -276,8 +276,8 @@
     return qname->qname_string;
 }
 
-AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
-axis2_qname_create_from_string(const axutil_env_t *env,
+AXIS2_EXTERN axutil_qname_t* AXIS2_CALL
+axutil_qname_create_from_string(const axutil_env_t *env,
     const axis2_char_t *qstring)
 {
     axis2_char_t *localpart = NULL;
@@ -286,7 +286,7 @@
     axis2_char_t *index = NULL;
     axis2_char_t *next = NULL;
     axis2_char_t *temp_string = NULL;
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     if (!qstring || axis2_strcmp(qstring, "") == 0)
         return NULL;
 
@@ -308,18 +308,18 @@
             next[index - next] = '\0';
             namespace_uri = next;
 
-            qname = axis2_qname_create(env, localpart, namespace_uri, prefix);
+            qname = axutil_qname_create(env, localpart, namespace_uri, prefix);
         }
         else
         {
             /** only uri and localpart is available */
-            qname = axis2_qname_create(env, localpart, next, NULL);
+            qname = axutil_qname_create(env, localpart, next, NULL);
         }
     }
     else
     {
         /** only localpart is there in this qname */
-        qname = axis2_qname_create(env, temp_string, NULL, NULL);
+        qname = axutil_qname_create(env, temp_string, NULL, NULL);
     }
     if (temp_string)
     {

Modified: webservices/axis2/trunk/c/util/src/rand.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/rand.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/rand.c (original)
+++ webservices/axis2/trunk/c/util/src/rand.c Fri Mar 30 12:24:00 2007
@@ -15,21 +15,21 @@
  */
 
 #include <stdlib.h>
-#include <axis2_rand.h>
-#include <axis2_string.h>
+#include <axutil_rand.h>
+#include <axutil_string.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 #define AXIS2_RAND_MAX 32768
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_rand(unsigned int *seedp)
+axutil_rand(unsigned int *seedp)
 {
     *seedp = *seedp * 1103515245 + 12345;
     return((unsigned)(*seedp/(2 * AXIS2_RAND_MAX)) % AXIS2_RAND_MAX);
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_rand_with_range(unsigned int *seedp,
+axutil_rand_with_range(unsigned int *seedp,
     int start,
     int end)
 {
@@ -40,13 +40,13 @@
     if(end <= start) return -1;
   
     range = end - start;
-    rand = axis2_rand(seedp);
+    rand = axutil_rand(seedp);
     rand = 1+(int) (range * rand / (AXIS2_RAND_MAX + 1.0));
     return rand;
 }
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-axis2_rand_get_seed_value_based_on_time(const axutil_env_t *env)
+axutil_rand_get_seed_value_based_on_time(const axutil_env_t *env)
 {
     axutil_date_time_t *date = axutil_date_time_create(env);
     unsigned int rand_var =  axutil_date_time_get_year(date, env);

Modified: webservices/axis2/trunk/c/util/src/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stack.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/stack.c (original)
+++ webservices/axis2/trunk/c/util/src/stack.c Fri Mar 30 12:24:00 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <axis2_stack.h>
+#include <axutil_stack.h>
 #include <axis2_utils.h>
 #include <axutil_env.h>
 #include <stdlib.h>
@@ -23,7 +23,7 @@
 
 #define AXIS2_STACK_DEFAULT_CAPACITY 10
 
-struct axis2_stack
+struct axutil_stack
 {
     void **data;
     /** current number of elements */
@@ -33,15 +33,15 @@
     axis2_bool_t is_empty_stack;
 };
 
-AXIS2_EXTERN axis2_stack_t * AXIS2_CALL
-axis2_stack_create(const axutil_env_t *env)
+AXIS2_EXTERN axutil_stack_t * AXIS2_CALL
+axutil_stack_create(const axutil_env_t *env)
 {
-    axis2_stack_t *stack = NULL;
+    axutil_stack_t *stack = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    stack = (axis2_stack_t*)AXIS2_MALLOC(env->allocator,
-        sizeof(axis2_stack_t));
+    stack = (axutil_stack_t*)AXIS2_MALLOC(env->allocator,
+        sizeof(axutil_stack_t));
 
     if (!stack)
     {
@@ -59,7 +59,7 @@
     if (!stack->data)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        axis2_stack_free(stack , env);
+        axutil_stack_free(stack , env);
         return NULL;
     }
 
@@ -67,7 +67,7 @@
 }
 
 void AXIS2_CALL
-axis2_stack_free(axis2_stack_t *stack,
+axutil_stack_free(axutil_stack_t *stack,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -81,7 +81,7 @@
 }
 
 void* AXIS2_CALL
-axis2_stack_pop(axis2_stack_t *stack,
+axutil_stack_pop(axutil_stack_t *stack,
     const axutil_env_t *env)
 {
     void *value = NULL;
@@ -106,7 +106,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_stack_push(axis2_stack_t *stack,
+axutil_stack_push(axutil_stack_t *stack,
     const axutil_env_t *env,
     void* value)
 {
@@ -143,7 +143,7 @@
 }
 
 int AXIS2_CALL
-axis2_stack_size(axis2_stack_t *stack,
+axutil_stack_size(axutil_stack_t *stack,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -151,7 +151,7 @@
 }
 
 void * AXIS2_CALL
-axis2_stack_get(axis2_stack_t *stack,
+axutil_stack_get(axutil_stack_t *stack,
     const axutil_env_t *env)
 {
     if (stack->size > 0)
@@ -162,7 +162,7 @@
 }
 
 void* AXIS2_CALL
-axis2_stack_get_at(axis2_stack_t *stack,
+axutil_stack_get_at(axutil_stack_t *stack,
     const axutil_env_t *env,
     int i)
 {

Modified: webservices/axis2/trunk/c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stream.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Fri Mar 30 12:24:00 2007
@@ -17,66 +17,66 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
 
 /** basic stream operatons **/
 int AXIS2_CALL
-axis2_stream_write_basic(axis2_stream_t *stream, 
+axutil_stream_write_basic(axutil_stream_t *stream, 
     const axutil_env_t *env,
     const void *buffer, size_t count);
 
 int AXIS2_CALL
-axis2_stream_read_basic(axis2_stream_t *stream, 
+axutil_stream_read_basic(axutil_stream_t *stream, 
     const axutil_env_t *env,
     void *buffer, size_t count);
 
 int AXIS2_CALL
-axis2_stream_skip_basic(axis2_stream_t *stream, 
+axutil_stream_skip_basic(axutil_stream_t *stream, 
     const axutil_env_t *env, 
     int count);
 
 /** file stream operations **/
 int AXIS2_CALL
-axis2_stream_write_file(axis2_stream_t *stream, 
+axutil_stream_write_file(axutil_stream_t *stream, 
     const axutil_env_t *env,
     const void *buffer, size_t count);
 
 int AXIS2_CALL
-axis2_stream_read_file(axis2_stream_t *stream, 
+axutil_stream_read_file(axutil_stream_t *stream, 
     const axutil_env_t *env,
     void *buffer, size_t count);
 
 int AXIS2_CALL
-axis2_stream_skip_file(axis2_stream_t *stream, 
+axutil_stream_skip_file(axutil_stream_t *stream, 
     const axutil_env_t *env, 
     int count);
 
 /** socket stream operations **/
 int AXIS2_CALL
-axis2_stream_write_socket(axis2_stream_t *stream, 
+axutil_stream_write_socket(axutil_stream_t *stream, 
     const axutil_env_t *env,
     const void *buffer, size_t count);
 
 int AXIS2_CALL
-axis2_stream_read_socket(axis2_stream_t *stream, 
+axutil_stream_read_socket(axutil_stream_t *stream, 
     const axutil_env_t *env,
     void *buffer, size_t count);
 
 int AXIS2_CALL
-axis2_stream_skip_socket(axis2_stream_t *stream, 
+axutil_stream_skip_socket(axutil_stream_t *stream, 
     const axutil_env_t *env,
     int count);
 
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_internal(const axutil_env_t *env)
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_internal(const axutil_env_t *env)
 {
-    axis2_stream_t *stream = NULL;
+    axutil_stream_t *stream = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
-    stream = (axis2_stream_t *)AXIS2_MALLOC(
-        env->allocator, sizeof(axis2_stream_t));
+    stream = (axutil_stream_t *)AXIS2_MALLOC(
+        env->allocator, sizeof(axutil_stream_t));
 
     if (!stream)
     {
@@ -96,7 +96,7 @@
 
 
 void AXIS2_CALL
-axis2_stream_free(axis2_stream_t *stream, 
+axutil_stream_free(axutil_stream_t *stream, 
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -139,19 +139,19 @@
 }
 
 void AXIS2_CALL
-axis2_stream_free_void_arg(void *stream,
+axutil_stream_free_void_arg(void *stream,
     const axutil_env_t *env)
 {
-    axis2_stream_t *stream_l = NULL;
+    axutil_stream_t *stream_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    stream_l = (axis2_stream_t *) stream;
-    axis2_stream_free(stream_l, env);
+    stream_l = (axutil_stream_t *) stream;
+    axutil_stream_free(stream_l, env);
     return;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_stream_flush(axis2_stream_t *stream,
+axutil_stream_flush(axutil_stream_t *stream,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -167,7 +167,7 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_stream_close(axis2_stream_t *stream,
+axutil_stream_close(axutil_stream_t *stream,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -218,25 +218,25 @@
 }
 
 /************************ Basic Stream Operations *****************************/
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_basic(const axutil_env_t *env)
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_basic(const axutil_env_t *env)
 {
-    axis2_stream_t *stream = NULL;
+    axutil_stream_t *stream = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    stream = axis2_stream_create_internal(env);
+    stream = axutil_stream_create_internal(env);
     if (!stream)
     {
         /*
          * We leave the error returned by the 
-         * axis2_stream_create_internal intact
+         * axutil_stream_create_internal intact
          */
         return NULL;
     }
     stream->stream_type = AXIS2_STREAM_BASIC;
-    stream->read = axis2_stream_read_basic;
-    stream->write = axis2_stream_write_basic;
-    stream->skip = axis2_stream_skip_basic;
+    stream->read = axutil_stream_read_basic;
+    stream->write = axutil_stream_write_basic;
+    stream->skip = axutil_stream_skip_basic;
     stream->buffer = (axis2_char_t*)AXIS2_MALLOC(env->allocator,
         AXIS2_STREAM_DEFAULT_BUF_SIZE * sizeof(axis2_char_t));
     stream->buffer_head = stream->buffer;
@@ -245,7 +245,7 @@
 
     if (!stream->buffer)
     {
-        axis2_stream_free(stream, env);
+        axutil_stream_free(stream, env);
         return NULL;
     }
     return stream;
@@ -253,7 +253,7 @@
 
 
 int AXIS2_CALL
-axis2_stream_read_basic(axis2_stream_t *stream, const axutil_env_t *env,
+axutil_stream_read_basic(axutil_stream_t *stream, const axutil_env_t *env,
     void *buffer, size_t count)
 {
     int len = 0;
@@ -290,7 +290,7 @@
 }
 
 int AXIS2_CALL
-axis2_stream_write_basic(axis2_stream_t *stream, 
+axutil_stream_write_basic(axutil_stream_t *stream, 
     const axutil_env_t *env,
     const void *buffer, size_t count)
 {
@@ -300,7 +300,7 @@
     if (!buffer)
         return -1;
 
-    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[axis2_stream_write_basic]  %s %d",(char*)buffer, count);
+    AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[axutil_stream_write_basic]  %s %d",(char*)buffer, count);
     
     stream = stream;
     new_len = stream->len + count;
@@ -333,14 +333,14 @@
 
 
 int AXIS2_CALL
-axis2_stream_get_len(axis2_stream_t *stream, 
+axutil_stream_get_len(axutil_stream_t *stream, 
     const axutil_env_t *env)
 {
     return stream->len;
 }
 
 int AXIS2_CALL
-axis2_stream_skip_basic(axis2_stream_t *stream, 
+axutil_stream_skip_basic(axutil_stream_t *stream, 
     const axutil_env_t *env, 
     int count)
 {
@@ -365,14 +365,14 @@
 }
 
 AXIS2_EXTERN axis2_char_t * AXIS2_CALL
-axis2_stream_get_buffer (const axis2_stream_t *stream, 
+axutil_stream_get_buffer (const axutil_stream_t *stream, 
                          const axutil_env_t *env)
 {
     return stream->buffer;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_stream_flush_buffer (axis2_stream_t *stream, 
+axutil_stream_flush_buffer (axutil_stream_t *stream, 
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -384,34 +384,34 @@
 /********************* End of Basic Stream Operations *************************/
 
 /************************** File Stream Operations ****************************/
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_file(const axutil_env_t *env, FILE *fp)
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_file(const axutil_env_t *env, FILE *fp)
 {
-    axis2_stream_t *stream = NULL;
+    axutil_stream_t *stream = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    stream = axis2_stream_create_internal(env);
+    stream = axutil_stream_create_internal(env);
     if (!stream)
     {
         /*
          * We leave the error returned by the 
-         * axis2_stream_create_internal intact
+         * axutil_stream_create_internal intact
          */
         return NULL;
     }
     stream->stream_type = AXIS2_STREAM_FILE;
     stream->fp = fp;
 
-    stream->read = axis2_stream_read_file;
-    stream->write = axis2_stream_write_file;
-    stream->skip = axis2_stream_skip_file;
+    stream->read = axutil_stream_read_file;
+    stream->write = axutil_stream_write_file;
+    stream->skip = axutil_stream_skip_file;
 
     return stream;
 }
 
 
 int AXIS2_CALL
-axis2_stream_read_file(axis2_stream_t *stream, 
+axutil_stream_read_file(axutil_stream_t *stream, 
     const axutil_env_t *env,
     void *buffer, size_t count)
 {
@@ -432,7 +432,7 @@
 }
 
 int AXIS2_CALL
-axis2_stream_write_file(axis2_stream_t *stream, 
+axutil_stream_write_file(axutil_stream_t *stream, 
     const axutil_env_t *env,
     const void *buffer, size_t count)
 {
@@ -453,7 +453,7 @@
 }
 
 int AXIS2_CALL
-axis2_stream_skip_file(axis2_stream_t *stream, 
+axutil_stream_skip_file(axutil_stream_t *stream, 
     const axutil_env_t *env, 
     int count)
 {
@@ -475,26 +475,26 @@
 /********************** End of File Stream Operations *************************/
 
 /************************** Socket Stream Operations **************************/
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_socket(const axutil_env_t *env, 
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_socket(const axutil_env_t *env, 
     int socket)
 {
-    axis2_stream_t *stream = NULL;
+    axutil_stream_t *stream = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    stream = axis2_stream_create_internal(env);
+    stream = axutil_stream_create_internal(env);
     if (!stream)
     {
         /*
          * We leave the error returned by the 
-         * axis2_stream_create_internal intact
+         * axutil_stream_create_internal intact
          */
         return NULL;
     }
 
-    stream->read = axis2_stream_read_socket;
-    stream->write = axis2_stream_write_socket;
-    stream->skip = axis2_stream_skip_socket;
+    stream->read = axutil_stream_read_socket;
+    stream->write = axutil_stream_write_socket;
+    stream->skip = axutil_stream_skip_socket;
 
     stream->stream_type = AXIS2_STREAM_SOCKET;
     stream->socket = socket;
@@ -505,7 +505,7 @@
 
 
 int AXIS2_CALL
-axis2_stream_read_socket(axis2_stream_t *stream, 
+axutil_stream_read_socket(axutil_stream_t *stream, 
     const axutil_env_t *env,
     void *buffer, size_t count)
 {
@@ -546,7 +546,7 @@
 }
 
 int AXIS2_CALL
-axis2_stream_write_socket(axis2_stream_t *stream, 
+axutil_stream_write_socket(axutil_stream_t *stream, 
     const axutil_env_t *env,
     const void *buffer, size_t count)
 {
@@ -585,7 +585,7 @@
 }
 
 int AXIS2_CALL
-axis2_stream_skip_socket(axis2_stream_t *stream, 
+axutil_stream_skip_socket(axutil_stream_t *stream, 
     const axutil_env_t *env, 
     int count)
 {
@@ -608,7 +608,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_stream_peek_socket(axis2_stream_t *stream, 
+axutil_stream_peek_socket(axutil_stream_t *stream, 
     const axutil_env_t *env,
     void *buffer, size_t count)
 {
@@ -634,8 +634,8 @@
 /********************** End of Socket Stream Operations ***********************/
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_stream_set_read(
-    axis2_stream_t *stream,
+axutil_stream_set_read(
+    axutil_stream_t *stream,
     const axutil_env_t *env, 
     void *func)
 {
@@ -644,8 +644,8 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_stream_set_write(
-    axis2_stream_t *stream,
+axutil_stream_set_write(
+    axutil_stream_t *stream,
     const axutil_env_t *env, 
     void *func)
 {
@@ -654,8 +654,8 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_stream_set_skip(
-    axis2_stream_t *stream,
+axutil_stream_set_skip(
+    axutil_stream_t *stream,
     const axutil_env_t *env, 
     void *func)
 {
@@ -664,7 +664,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_stream_read(axis2_stream_t *stream,
+axutil_stream_read(axutil_stream_t *stream,
     const axutil_env_t *env,
     void *buffer,
     size_t count)
@@ -673,7 +673,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_stream_write(axis2_stream_t *stream,
+axutil_stream_write(axutil_stream_t *stream,
     const axutil_env_t *env,
     const void *buffer,
     size_t count)
@@ -682,7 +682,7 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_stream_skip(axis2_stream_t *stream,
+axutil_stream_skip(axutil_stream_t *stream,
     const axutil_env_t *env,
     int count)
 {

Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Fri Mar 30 12:24:00 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <stdlib.h>
 #include <axis2_utils.h>
 #include <axis2_utils_defines.h>
 #include <stdarg.h> /* NULL */
 
-struct axis2_string
+struct axutil_string
 {
     axis2_char_t *buffer;
     unsigned int length;
@@ -29,11 +29,11 @@
     axis2_bool_t owns_buffer;
 };
 
-AXIS2_EXTERN axis2_string_t * AXIS2_CALL
-axis2_string_create(const axutil_env_t *env,
+AXIS2_EXTERN axutil_string_t * AXIS2_CALL
+axutil_string_create(const axutil_env_t *env,
     const axis2_char_t *str)
 {
-    axis2_string_t *string = NULL;
+    axutil_string_t *string = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
     /* str can't be null */
@@ -44,8 +44,8 @@
         return NULL;
     }
 
-    string = (axis2_string_t *) AXIS2_MALLOC(env->allocator,
-        sizeof(axis2_string_t));
+    string = (axutil_string_t *) AXIS2_MALLOC(env->allocator,
+        sizeof(axutil_string_t));
     if (!string)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -62,7 +62,7 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, 
             AXIS2_FAILURE);
-        axis2_string_free(string, env);
+        axutil_string_free(string, env);
         return NULL;
     }
     
@@ -71,7 +71,7 @@
     if (!(string->buffer))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        axis2_string_free(string, env);
+        axutil_string_free(string, env);
         return NULL;
     }
     memcpy(string->buffer, str, string->length + 1);
@@ -79,11 +79,11 @@
     return string;
 }
 
-AXIS2_EXTERN axis2_string_t * AXIS2_CALL
-axis2_string_create_assume_ownership(const axutil_env_t *env,
+AXIS2_EXTERN axutil_string_t * AXIS2_CALL
+axutil_string_create_assume_ownership(const axutil_env_t *env,
     axis2_char_t **str)
 {
-    axis2_string_t *string = NULL;
+    axutil_string_t *string = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
     /* str can't be null */
@@ -94,8 +94,8 @@
         return NULL;
     }
 
-    string = (axis2_string_t *) AXIS2_MALLOC(env->allocator,
-            sizeof(axis2_string_t));
+    string = (axutil_string_t *) AXIS2_MALLOC(env->allocator,
+            sizeof(axutil_string_t));
     if (!string)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -111,18 +111,18 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, 
             AXIS2_FAILURE);
-        axis2_string_free(string, env);
+        axutil_string_free(string, env);
         return NULL;
     }
     
     return string;
 }
 
-AXIS2_EXTERN axis2_string_t* AXIS2_CALL
-axis2_string_create_const(const axutil_env_t *env,
+AXIS2_EXTERN axutil_string_t* AXIS2_CALL
+axutil_string_create_const(const axutil_env_t *env,
     axis2_char_t **str)
 {
-    axis2_string_t *string = NULL;
+    axutil_string_t *string = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
     /* str can't be null */
@@ -133,8 +133,8 @@
         return NULL;
     }
 
-    string = (axis2_string_t *) AXIS2_MALLOC(env->allocator,
-        sizeof(axis2_string_t));
+    string = (axutil_string_t *) AXIS2_MALLOC(env->allocator,
+        sizeof(axutil_string_t));
     if (!string)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -150,7 +150,7 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, 
             AXIS2_FAILURE);
-        axis2_string_free(string, env);
+        axutil_string_free(string, env);
         return NULL;
     }
     
@@ -158,7 +158,7 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_string_free(struct axis2_string *string,
+axutil_string_free(struct axutil_string *string,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -185,9 +185,9 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_string_equals(const struct axis2_string *string,
+axutil_string_equals(const struct axutil_string *string,
     const axutil_env_t *env,
-    const struct axis2_string *string1)
+    const struct axutil_string *string1)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -199,8 +199,8 @@
     return (string->buffer == string1->buffer);
 }
 
-AXIS2_EXTERN struct axis2_string *AXIS2_CALL
-axis2_string_clone(struct axis2_string *string,
+AXIS2_EXTERN struct axutil_string *AXIS2_CALL
+axutil_string_clone(struct axutil_string *string,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -216,7 +216,7 @@
 }
 
 AXIS2_EXTERN const axis2_char_t* AXIS2_CALL
-axis2_string_get_buffer(const struct axis2_string *string,
+axutil_string_get_buffer(const struct axutil_string *string,
     const axutil_env_t *env)
 {
     if (!string)
@@ -228,7 +228,7 @@
 }
 
 AXIS2_EXTERN unsigned int AXIS2_CALL
-axis2_string_get_length(const struct axis2_string *string,
+axutil_string_get_length(const struct axutil_string *string,
     const axutil_env_t *env)
 {
     if (!string)
@@ -654,7 +654,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_string_replace(axis2_char_t* str, 
+axutil_string_replace(axis2_char_t* str, 
     axis2_char_t old, 
     axis2_char_t new)
 {
@@ -670,7 +670,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_string_substring_starting_at(axis2_char_t* str, 
+axutil_string_substring_starting_at(axis2_char_t* str, 
     int s)
 {
     int len;
@@ -689,7 +689,7 @@
 
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_string_substring_ending_at(axis2_char_t* str, 
+axutil_string_substring_ending_at(axis2_char_t* str, 
     int e)
 {
     axis2_char_t* ptr = NULL;
@@ -708,7 +708,7 @@
 
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_string_tolower(axis2_char_t* str)
+axutil_string_tolower(axis2_char_t* str)
 {
     axis2_char_t* temp_str = NULL;
     for (temp_str = str; *temp_str != '\0' ; temp_str ++)
@@ -719,7 +719,7 @@
 }
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_string_toupper(axis2_char_t* str)
+axutil_string_toupper(axis2_char_t* str)
 {
     axis2_char_t* temp_str = NULL;
     for (temp_str = str; *temp_str != '\0' ; temp_str ++)

Modified: webservices/axis2/trunk/c/util/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Fri Mar 30 12:24:00 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <axis2_string_util.h>
+#include <axutil_string_util.h>
 #include <string.h>
 #include <axis2_utils.h>
 

Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Fri Mar 30 12:24:00 2007
@@ -16,10 +16,10 @@
  */
 
 #include <axis2_url.h>
-#include <axis2_string.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
+#include <axutil_string.h>
 #include <axutil_file_handler.h>
-#include <axis2_network_handler.h>
+#include <axutil_network_handler.h>
 #include <axis2_types.h>
 
 struct axis2_url

Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
 
 #include <axis2_utils.h>
 #include <stdlib.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <string.h>
 #include <platforms/axis2_platform_auto_sense.h>
 

Modified: webservices/axis2/trunk/c/util/test/util/test_string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_string.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_string.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_string.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <axutil_error_default.h>
 #include <axutil_log.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 void test_strltrim(const axutil_env_t *env)
 {

Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <axutil_hash.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axutil_error_default.h>
 #include <axutil_array_list.h>
 #include <platforms/axis2_platform_auto_sense.h>

Modified: webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_attr_extensible.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -80,14 +80,14 @@
     set_ext_attr) (
             void *extensible,
             const axutil_env_t *env,
-            axis2_qname_t *attr_type,
+            axutil_qname_t *attr_type,
             struct woden_xml_attr *attr); 
 
     void *(AXIS2_CALL *
     get_ext_attr) (
             void *extensible,
             const axutil_env_t *env,
-            axis2_qname_t *attr_type); 
+            axutil_qname_t *attr_type); 
 
     axutil_array_list_t *(AXIS2_CALL *
     get_ext_attrs) (

Modified: webservices/axis2/trunk/c/woden/include/woden_binding.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding.h Fri Mar 30 12:24:00 2007
@@ -70,7 +70,7 @@
             void *binding,
             const axutil_env_t *env);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *binding,
             const axutil_env_t *env);
@@ -115,7 +115,7 @@
     get_binding_fault_element) (
             void *binding,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     /*
      * Get the binding operation with the specified 'ref' attribute qname.
@@ -130,7 +130,7 @@
     get_binding_op_element) (
             void *binding,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     axis2_status_t (AXIS2_CALL *
     set_interface_element) (

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_element.h Fri Mar 30 12:24:00 2007
@@ -27,10 +27,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -77,9 +77,9 @@
     set_qname) (
             void *binding_element,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *binding_element,
             const axutil_env_t *env); 
@@ -94,9 +94,9 @@
     set_interface_qname) (
             void *binding_element,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_interface_qname) (
             void *binding_element,
             const axutil_env_t *env); 

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
 #include <woden.h>
 #include <woden_binding_fault_element.h>
 #include <woden_nested_configurable.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** @defgroup woden_binding_fault Binding Fault
   * @ingroup woden

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault_element.h Fri Mar 30 12:24:00 2007
@@ -27,10 +27,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -78,9 +78,9 @@
     set_ref) (
             void *iface_fault_ele,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
     
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ref) (
             void *iface_fault_ele,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref.h Fri Mar 30 12:24:00 2007
@@ -30,7 +30,7 @@
 #include <woden.h>
 #include <woden_binding_fault_ref_element.h>
 #include <woden_nested_configurable.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** @defgroup woden_binding_fault_ref Binding Fault Reference
   * @ingroup woden

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_fault_ref_element.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -77,13 +77,13 @@
     set_ref) (
             void *binding_fault_ref_ele,
             const axutil_env_t *env,
-            axis2_qname_t *fault_qname);
+            axutil_qname_t *fault_qname);
     
     /**
      * Get the QName specified in the 'ref' attribute.
      * @return QName identifies the associated Interface Fault Element. 
      */
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ref) (
             void *binding_fault_ref_ele,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref.h Fri Mar 30 12:24:00 2007
@@ -30,7 +30,7 @@
 #include <woden.h>
 #include <woden_binding_msg_ref_element.h>
 #include <woden_nested_configurable.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** @defgroup woden_binding_msg_ref Binding Message Reference
   * @ingroup woden

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_msg_ref_element.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_op.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_op.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
 #include <woden.h>
 #include <woden_binding_op_element.h>
 #include <woden_nested_configurable.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** @defgroup woden_binding_op Binding Operation
   * @ingroup woden

Modified: webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -79,9 +79,9 @@
     set_ref) (
             void *iface_op_ele,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ref) (
             void *iface_op_ele,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_bool_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_bool_attr.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_bool_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_bool_attr.h Fri Mar 30 12:24:00 2007
@@ -119,7 +119,7 @@
         const axutil_env_t *env,
         struct axiom_element *owner_el,
         struct axiom_node *owner_node,
-        axis2_qname_t *attr_type,
+        axutil_qname_t *attr_type,
         axis2_char_t *attr_value);
 
 

Modified: webservices/axis2/trunk/c/woden/include/woden_component_exts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_component_exts.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_component_exts.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_component_exts.h Fri Mar 30 12:24:00 2007
@@ -43,10 +43,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <woden.h>
 

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

Modified: webservices/axis2/trunk/c/woden/include/woden_configurable_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_configurable_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_configurable_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_configurable_element.h Fri Mar 30 12:24:00 2007
@@ -37,10 +37,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <woden.h>
 #include <woden_wsdl_element.h>
 

Modified: webservices/axis2/trunk/c/woden/include/woden_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_desc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_desc.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_desc.h Fri Mar 30 12:24:00 2007
@@ -121,7 +121,7 @@
     get_element_decl) (
             void *desc,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     axutil_array_list_t *(AXIS2_CALL *
     get_type_defs) (
@@ -132,7 +132,7 @@
     get_type_def) (
             void *desc,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     void *(AXIS2_CALL *
     to_element) (

Modified: webservices/axis2/trunk/c/woden/include/woden_desc_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_desc_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_desc_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_desc_element.h Fri Mar 30 12:24:00 2007
@@ -35,10 +35,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <woden.h>
 #include <woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden_direction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_direction.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_direction.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_direction.h Fri Mar 30 12:24:00 2007
@@ -50,10 +50,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <woden.h>
 
 #ifdef __cplusplus

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

Modified: webservices/axis2/trunk/c/woden/include/woden_documentation_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_documentation_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_documentation_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_documentation_element.h Fri Mar 30 12:24:00 2007
@@ -31,10 +31,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <woden_wsdl_element.h>
 #include <woden.h>
 

Modified: webservices/axis2/trunk/c/woden/include/woden_element_decl.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_element_decl.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_element_decl.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_element_decl.h Fri Mar 30 12:24:00 2007
@@ -37,10 +37,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <axutil_generic_obj.h>
@@ -97,7 +97,7 @@
      * underlying type system definition.
      *  
      */
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *decl,
             const axutil_env_t *env); 
@@ -156,7 +156,7 @@
     set_qname) (
             void *decl,
             const axutil_env_t *env,
-            axis2_qname_t *qname); 
+            axutil_qname_t *qname); 
 
     axis2_status_t (AXIS2_CALL *
     set_system) (

Modified: webservices/axis2/trunk/c/woden/include/woden_element_extensible.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_element_extensible.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_element_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_element_extensible.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -94,7 +94,7 @@
     get_ext_elements_of_type) (
             void *extensible,
             const axutil_env_t *env,
-            axis2_qname_t *ext_type);
+            axutil_qname_t *ext_type);
 
     axis2_bool_t (AXIS2_CALL *
     has_ext_elements_for_namespace) (

Modified: webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_endpoint_element.h Fri Mar 30 12:24:00 2007
@@ -29,10 +29,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <woden.h>
 #include <woden_documentable_element.h>
@@ -85,9 +85,9 @@
     set_binding_qname) (
             void *endpoint_el,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_binding_qname) (
             void *endpoint_el,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_ext_deserializer.h Fri Mar 30 12:24:00 2007
@@ -29,9 +29,9 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axutil_hash.h>
 #include <axiom_node.h>
 #include <woden.h>
@@ -72,7 +72,7 @@
             const axutil_env_t *env,
             axis2_char_t *parent_type,
             void *parent,
-            axis2_qname_t *ext_type,
+            axutil_qname_t *ext_type,
             axiom_node_t *ext_el_node,
             void *desc,
             woden_ext_registry_t *ext_reg);

Modified: webservices/axis2/trunk/c/woden/include/woden_ext_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_ext_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_ext_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_ext_element.h Fri Mar 30 12:24:00 2007
@@ -36,10 +36,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <woden.h>
 
 #ifdef __cplusplus
@@ -76,9 +76,9 @@
     axis2_status_t (AXIS2_CALL *
     set_ext_type) (void *ext_element,
                         const axutil_env_t *env,
-                        axis2_qname_t *qname);
+                        axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ext_type) (void *ext_element,
                         const axutil_env_t *env);
 

Modified: webservices/axis2/trunk/c/woden/include/woden_ext_registry.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_ext_registry.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_ext_registry.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_ext_registry.h Fri Mar 30 12:24:00 2007
@@ -27,10 +27,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -80,7 +80,7 @@
             void *registry,
             const axutil_env_t *env,
             axis2_char_t *parent_type,
-            axis2_qname_t *element_qtype,
+            axutil_qname_t *element_qtype,
             void *ed);
 
     /**
@@ -104,7 +104,7 @@
             void *registry,
             const axutil_env_t *env,
             axis2_char_t *parent_type,
-            axis2_qname_t *element_type);
+            axutil_qname_t *element_type);
 
     /**
     * Look up the type of the extensibility element with the specified qname, which
@@ -124,7 +124,7 @@
             void *registry,
             const axutil_env_t *env,
             axis2_char_t *parent_class,
-            axis2_qname_t *elem_qn);
+            axutil_qname_t *elem_qn);
 
     /**
     * Returns a set of QNames representing the extensibility elements
@@ -161,7 +161,7 @@
             void *registry,
             const axutil_env_t *env,
             axis2_char_t *parent_type,
-            axis2_qname_t *element_qtype,
+            axutil_qname_t *element_qtype,
             void *element);
 
 
@@ -183,7 +183,7 @@
             void *registry,
             const axutil_env_t *env,
             axis2_char_t *owner_class,
-            axis2_qname_t *attr_qname,
+            axutil_qname_t *attr_qname,
             void *attr);
 
     /**
@@ -203,7 +203,7 @@
             void *registry,
             const axutil_env_t *env,
             axis2_char_t *parent_class,
-            axis2_qname_t *attr_qn);
+            axutil_qname_t *attr_qn);
 
     /**
     * Register the object that will represent extensions from a specified 

Modified: webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_fault_ref_element.h Fri Mar 30 12:24:00 2007
@@ -29,10 +29,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -84,9 +84,9 @@
     set_ref) (
             void *iface_fault_ele,
             const axutil_env_t *env,
-            axis2_qname_t *fault_qname);
+            axutil_qname_t *fault_qname);
     
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ref) (
             void *iface_fault_ele,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_feature_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_feature_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_feature_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_feature_element.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <woden.h>
 #include <woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden_import_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_import_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_import_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_import_element.h Fri Mar 30 12:24:00 2007
@@ -30,10 +30,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <woden.h>
 #include <woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden_include_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_include_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_include_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_include_element.h Fri Mar 30 12:24:00 2007
@@ -30,10 +30,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <woden.h>
 #include <woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden_interface.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface.h Fri Mar 30 12:24:00 2007
@@ -72,7 +72,7 @@
             void *woden_interface,
             const axutil_env_t *env);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *woden_interface,
             const axutil_env_t *env);
@@ -91,7 +91,7 @@
     get_interface_fault) (
             void *woden_interface,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     axutil_array_list_t *(AXIS2_CALL *
     get_interface_ops) (

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_element.h Fri Mar 30 12:24:00 2007
@@ -29,10 +29,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -73,9 +73,9 @@
     set_qname) (
             void *interface_element,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *interface_element,
             const axutil_env_t *env); 
@@ -84,7 +84,7 @@
     add_extends_qname) (
             void *interface_element,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
     axutil_array_list_t *(AXIS2_CALL *
     get_extends_qnames) (

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault.h Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
 #include <woden.h>
 #include <woden_interface_fault_element.h>
 #include <woden_nested_configurable.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** @defgroup woden_interface_fault Interface Fault
   * @ingroup woden
@@ -71,7 +71,7 @@
             void *interface_fault,
             const axutil_env_t *env);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *interface_fault,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault_element.h Fri Mar 30 12:24:00 2007
@@ -30,10 +30,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -81,9 +81,9 @@
     set_qname) (
             void *iface_fault_ele,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
     
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_qname) (
             void *iface_fault_ele,
             const axutil_env_t *env);
@@ -98,9 +98,9 @@
     set_element_qname) (
             void *iface_fault_ele,
             const axutil_env_t *env,
-            axis2_qname_t *qname);
+            axutil_qname_t *qname);
 
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_element_qname) (
             void *iface_fault_ele,
             const axutil_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref.h Fri Mar 30 12:24:00 2007
@@ -30,7 +30,7 @@
 #include <woden.h>
 #include <woden_interface_fault_ref_element.h>
 #include <woden_nested_configurable.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 /** @defgroup woden_interface_fault_ref Interface Fault Reference
   * @ingroup woden

Modified: webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_fault_ref_element.h Fri Mar 30 12:24:00 2007
@@ -30,10 +30,10 @@
 #include <axutil_allocator.h>
 #include <axutil_env.h>
 #include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axis2_utils.h>
 #include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 #include <axis2_uri.h>
 #include <axutil_array_list.h>
 #include <woden.h>
@@ -75,9 +75,9 @@
     set_ref) (
             void *iface_fault_ele,
             const axutil_env_t *env,
-            axis2_qname_t *fault_qname);
+            axutil_qname_t *fault_qname);
     
-    axis2_qname_t *(AXIS2_CALL *
+    axutil_qname_t *(AXIS2_CALL *
     get_ref) (
             void *iface_fault_ele,
             const axutil_env_t *env);



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