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 15:19:59 UTC
svn commit: r524073 [5/10] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/
modules/core/clientapi/ modules/core/context/ modules/...
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c Fri Mar 30 06:19:43 2007
@@ -17,7 +17,7 @@
#include <w2c_config_property_loader.h>
#include <w2c_properties.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <axis2_hash.h>
@@ -65,14 +65,14 @@
axis2_char_t *test_object_template_name;
axis2_char_t *db_supporter_template_name;
- axis2_array_list_t *extension_class_names;
- axis2_array_list_t *post_extension_class_names;
- axis2_array_list_t *third_party_schema_names;
- axis2_array_list_t *language_types;
+ axutil_array_list_t *extension_class_names;
+ axutil_array_list_t *post_extension_class_names;
+ axutil_array_list_t *third_party_schema_names;
+ axutil_array_list_t *language_types;
axis2_hash_t *language_emitter_map;
axis2_char_t *default_language;
axis2_hash_t *language_specific_properties_map;
- axis2_array_list_t *databinding_framework_names;
+ axutil_array_list_t *databinding_framework_names;
axis2_hash_t *databinding_framework_name_to_extension_map;
axis2_char_t *default_db_framework_name;
@@ -112,22 +112,22 @@
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_extension_class_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_post_extension_class_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_third_party_schema_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_language_types (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
@@ -147,7 +147,7 @@
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_databinding_framework_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env);
@@ -169,14 +169,14 @@
w2c_config_property_loader_impl_t *obj_impl,
const axis2_env_t *env);
-static axis2_array_list_t*
+static axutil_array_list_t*
w2c_config_property_loader_dup_array(
- axis2_array_list_t *arr,
+ axutil_array_list_t *arr,
const axis2_env_t *env);
static axis2_status_t
w2c_config_property_loader_free_array(
- axis2_array_list_t *original,
+ axutil_array_list_t *original,
const axis2_env_t *env);
@@ -466,7 +466,7 @@
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_extension_class_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env)
@@ -481,7 +481,7 @@
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_post_extension_class_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env)
@@ -496,7 +496,7 @@
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_third_party_schema_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env)
@@ -511,7 +511,7 @@
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_language_types (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env)
@@ -571,7 +571,7 @@
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_config_property_loader_get_databinding_framework_names (
w2c_config_property_loader_t *config_property_loader,
const axis2_env_t *env)
@@ -624,8 +624,8 @@
axis2_hash_t* temp_hash = NULL;
axis2_hash_t* lang_spec_hash = NULL;
axis2_hash_index_t* hi = NULL;
- axis2_array_list_t* prop = NULL;
- axis2_array_list_t* temp_array = NULL;
+ axutil_array_list_t* prop = NULL;
+ axutil_array_list_t* temp_array = NULL;
axis2_char_t* temp_buff = NULL;
axis2_char_t* key= NULL;
axis2_char_t* val= NULL;
@@ -639,7 +639,7 @@
*/
/*load the extension class names*/
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_CODE_GEN_KEY_PREFIX,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -649,7 +649,7 @@
}
/*load the post extension class names*/
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_POST_CODE_GEN_KEY_PREFIX,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -659,7 +659,7 @@
}
/* load the data binding framework names */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -670,7 +670,7 @@
/* populate the data binding framework name to extension name map */
temp_array = NULL;
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_EXTENSION_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -678,8 +678,8 @@
temp_array =
w2c_config_property_loader_dup_array(prop, env );
- size= axis2_array_list_size (obj_impl ->databinding_framework_names, env);
- if (size != axis2_array_list_size (temp_array, env) )
+ size= axutil_array_list_size (obj_impl ->databinding_framework_names, env);
+ if (size != axutil_array_list_size (temp_array, env) )
{
fprintf ( stderr, "data_binding_framework name to extension diff in size" );
w2c_config_property_loader_free(
@@ -692,40 +692,40 @@
for (i = 0 ; i < size ;i++ )
{
axis2_hash_set ( temp_hash,
- axis2_strdup(env, axis2_array_list_get(obj_impl ->databinding_framework_names, env, i )),
+ axis2_strdup(env, axutil_array_list_get(obj_impl ->databinding_framework_names, env, i )),
AXIS2_HASH_KEY_STRING,
- axis2_strdup(env, axis2_array_list_get(temp_array, env, i )));
+ axis2_strdup(env, axutil_array_list_get(temp_array, env, i )));
}
}
/*load the default framework name */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_DEFAULT_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
{
obj_impl ->default_db_framework_name =
- axis2_strdup( env, axis2_array_list_get(prop, env, 0 ));
+ axis2_strdup( env, axutil_array_list_get(prop, env, 0 ));
}
/* load the third party schema names */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_THIRD_PARTY_SCHEMA_KEY_PREFIX,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
{
obj_impl ->third_party_schema_names=
- axis2_strdup(env, axis2_array_list_get(prop, env, 0));
+ axis2_strdup(env, axutil_array_list_get(prop, env, 0));
}
/* the db supporter template name */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEMPLATE_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
{
obj_impl ->db_supporter_template_name=
- axis2_strdup(env, axis2_array_list_get(prop, env, 0 ));
+ axis2_strdup(env, axutil_array_list_get(prop, env, 0 ));
}
/* test object template name */
@@ -733,18 +733,18 @@
* starts with W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEMPLATE_NAME_KEY_PREFIX
* ends with W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEMPLATE_NAME_KEY_SUFFIX
*/
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEST_OBJECT_TEMPLATE_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
{
obj_impl ->test_object_template_name=
- axis2_strdup(env, axis2_array_list_get(prop, env, 0));
+ axis2_strdup(env, axutil_array_list_get(prop, env, 0));
}
/* load the language types */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_LANGUAGE_TYPE_KEY_PREFIX,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -754,15 +754,15 @@
}
/* load the language emitter map */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_EMITTER_CLASS_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
{
temp_array = w2c_config_property_loader_dup_array(prop, env );
- size= axis2_array_list_size (obj_impl->language_types , env);
- if (size != axis2_array_list_size (temp_array, env) )
+ size= axutil_array_list_size (obj_impl->language_types , env);
+ if (size != axutil_array_list_size (temp_array, env) )
{
fprintf ( stderr, "data_binding_framework name to extension diff in size" );
w2c_config_property_loader_free(
@@ -774,8 +774,8 @@
obj_impl ->language_emitter_map = temp_hash;
for (i = 0 ; i< size ; i++ )
{
- key = axis2_array_list_get(obj_impl ->language_types, env, i);
- val = axis2_array_list_get(temp_array, env, i );
+ key = axutil_array_list_get(obj_impl ->language_types, env, i);
+ val = axutil_array_list_get(temp_array, env, i );
axis2_hash_set ( temp_hash,
axis2_strdup(env, key),
AXIS2_HASH_KEY_STRING,
@@ -784,13 +784,13 @@
}
/* load the default language */
- prop = (axis2_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DEFAULT_LANGUAGE_TYPE_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
{
obj_impl ->default_language =
- axis2_strdup(env, axis2_array_list_get(prop, env, 0 ));
+ axis2_strdup(env, axutil_array_list_get(prop, env, 0 ));
}
/**
@@ -801,10 +801,10 @@
{
temp_hash = axis2_hash_make ( env );
obj_impl->language_specific_properties_map = temp_hash;
- size= axis2_array_list_size (obj_impl->language_types , env);
+ size= axutil_array_list_size (obj_impl->language_types , env);
for (i = 0 ; i< size ; i++ )
{
- temp_buff = axis2_array_list_get(obj_impl ->language_types, env, i );
+ temp_buff = axutil_array_list_get(obj_impl ->language_types, env, i );
lang_spec_hash = axis2_hash_make ( env );
for (hi = axis2_hash_first(prop_hash, env); hi;
hi = axis2_hash_next(env, hi))
@@ -821,26 +821,26 @@
}
}
}
-static axis2_array_list_t*
+static axutil_array_list_t*
w2c_config_property_loader_dup_array(
- axis2_array_list_t *original,
+ axutil_array_list_t *original,
const axis2_env_t *env)
{
int i = 0;
int size = 0;
- axis2_array_list_t* new_array = NULL;
+ axutil_array_list_t* new_array = NULL;
axis2_char_t *tmp = NULL;
- size = axis2_array_list_size( original, env);
+ size = axutil_array_list_size( original, env);
if ( 0 == size )
- return axis2_array_list_create( env, 1);
+ return axutil_array_list_create( env, 1);
- new_array = axis2_array_list_create( env, size);
+ new_array = axutil_array_list_create( env, size);
for( i = 0; i < size; i ++ )
{
- tmp = (axis2_char_t*)axis2_array_list_get( original, env, i);
+ tmp = (axis2_char_t*)axutil_array_list_get( original, env, i);
tmp = axis2_strdup(env, tmp);
- axis2_array_list_add_at( new_array, env, i, tmp);
+ axutil_array_list_add_at( new_array, env, i, tmp);
}
return new_array;
}
@@ -848,20 +848,20 @@
/** this frees axis2_char_t[] */
static axis2_status_t
w2c_config_property_loader_free_array(
- axis2_array_list_t *arr,
+ axutil_array_list_t *arr,
const axis2_env_t *env)
{
int i = 0;
int size = 0;
axis2_char_t *tmp = NULL;
- size = axis2_array_list_size( arr, env);
+ size = axutil_array_list_size( arr, env);
for( i = 0; i < size; i ++ )
{
- tmp = (axis2_char_t*)axis2_array_list_get( arr, env, i);
+ tmp = (axis2_char_t*)axutil_array_list_get( arr, env, i);
AXIS2_FREE( env-> allocator, tmp);
}
- axis2_array_list_free( arr, env);
+ axutil_array_list_free( arr, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/properties.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/properties.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/properties.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_properties.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <axis2_properties.h>
@@ -63,7 +63,7 @@
axis2_char_t *p = NULL;
axis2_char_t *tag = NULL;
axis2_hash_t *tmp_hash = NULL;
- axis2_array_list_t *arr_list = NULL;
+ axutil_array_list_t *arr_list = NULL;
int i = 0;
@@ -101,14 +101,14 @@
if (key && value)
{
i = 0;
- arr_list = axis2_array_list_create(env, 10);
+ arr_list = axutil_array_list_create(env, 10);
for( p = value, tag = value; *p; p ++)
{
if ( *p == seperator)
{
*p = '\0';
tag = w2c_properties_trunk_and_dup( tag, p, env);
- axis2_array_list_add_at( arr_list, env, i, tag);
+ axutil_array_list_add_at( arr_list, env, i, tag);
tag = p + 1;
i ++;
}
@@ -116,7 +116,7 @@
if ( p != tag )
{
tag = w2c_properties_trunk_and_dup( tag, p, env);
- axis2_array_list_add_at( arr_list, env, i, tag);
+ axutil_array_list_add_at( arr_list, env, i, tag);
}
key = axis2_strdup(env, key);
axis2_hash_set( properties_impl-> prop_hash, key, AXIS2_HASH_KEY_STRING, arr_list);
@@ -149,7 +149,7 @@
const axis2_env_t *env)
{
w2c_properties_impl_t *properties_impl = NULL;
- axis2_array_list_t *values_arr = NULL;
+ axutil_array_list_t *values_arr = NULL;
axis2_char_t *value = NULL;
axis2_char_t *key = NULL;
int i = 0;
@@ -168,16 +168,16 @@
axis2_hash_this(hi, (void*)&key, NULL, (void*)&values_arr);
if (key && values_arr)
{
- size = axis2_array_list_size( values_arr, env);
+ size = axutil_array_list_size( values_arr, env);
for (i = 0; i < size; i ++)
{
- value = (axis2_char_t*)axis2_array_list_get( values_arr, env, i);
+ value = (axis2_char_t*)axutil_array_list_get( values_arr, env, i);
if ( value != NULL)
{
AXIS2_FREE( env-> allocator, value);
}
}
- axis2_array_list_free( values_arr, env);
+ axutil_array_list_free( values_arr, env);
AXIS2_FREE(env-> allocator, key);
}
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_typemapper.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <axiom_document.h>
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c Fri Mar 30 06:19:43 2007
@@ -357,7 +357,7 @@
w2c_emitter_pick_service_name ( w2c_emitter_impl_t *emitter_impl,
const axis2_env_t *env)
{
- axis2_array_list_t *svc_list = NULL;
+ axutil_array_list_t *svc_list = NULL;
void *svc = NULL;
axis2_qname_t *svc_qname = NULL;
@@ -368,7 +368,7 @@
WODEN_WSDL10_DESC_ELEMENT_GET_SVC_ELEMENTS(emitter_impl->desc, env);
if (svc_list)
{
- svc = axis2_array_list_get(svc_list, env, 0);
+ svc = axutil_array_list_get(svc_list, env, 0);
if (svc)
{
svc_qname = WODEN_WSDL10_SVC_GET_QNAME(svc, env);
@@ -382,7 +382,7 @@
WODEN_DESC_ELEMENT_GET_SVC_ELEMENTS(emitter_impl->desc, env);
if (svc_list)
{
- svc = axis2_array_list_get(svc_list, env, 0);
+ svc = axutil_array_list_get(svc_list, env, 0);
if (svc)
{
svc_qname = WODEN_SVC_GET_QNAME(svc, env);
@@ -419,17 +419,17 @@
const axis2_env_t *env,
axiom_node_t *root)
{
- axis2_array_list_t *svc_list = NULL;
+ axutil_array_list_t *svc_list = NULL;
woden_wsdl10_svc_t *svc = NULL;
axis2_qname_t* svc_qname = NULL;
- axis2_array_list_t *endpoint_list = NULL;
+ axutil_array_list_t *endpoint_list = NULL;
woden_wsdl10_endpoint_t *endpoint = NULL;
axis2_char_t *address = NULL;
axis2_qname_t *ext_type_l = NULL;
axis2_qname_t *ext_type = NULL;
int size = 0;
- axis2_array_list_t *ext_elements = NULL;
+ axutil_array_list_t *ext_elements = NULL;
void *soap_address = NULL;
axis2_uri_t *soap_address_uri = NULL;
axiom_node_t *endpoint_node = NULL;
@@ -439,7 +439,7 @@
axis2_char_t *binding_style = NULL;
int j = 0;
- axis2_array_list_t *binding_ops_list = NULL;
+ axutil_array_list_t *binding_ops_list = NULL;
int binding_ops_count = 0;
void *binding_op = NULL;
@@ -463,12 +463,12 @@
svc_list = WODEN_WSDL10_DESC_GET_SVCS(emitter_impl-> desc, env);
/** currently work only for one service */
- if (axis2_array_list_size ( svc_list, env ) < 1 )
+ if (axutil_array_list_size ( svc_list, env ) < 1 )
{
/** no need to continue more */
return AXIS2_FAILURE;
}
- svc = axis2_array_list_get( svc_list, env, 0 );
+ svc = axutil_array_list_get( svc_list, env, 0 );
svc_qname = WODEN_WSDL10_SVC_GET_QNAME( svc, env);
ns = axis2_qname_get_uri( svc_qname, env);
w2c_xslt_utils_add_attribute (env, root, "namespace", ns);
@@ -479,12 +479,12 @@
endpoint_list = WODEN_WSDL10_SVC_GET_ENDPOINTS (svc, env);
/** currently work only for one endpoint*/
- if (axis2_array_list_size ( endpoint_list, env ) < 1 )
+ if (axutil_array_list_size ( endpoint_list, env ) < 1 )
{
return AXIS2_FAILURE; /* no need to continue more */
}
- endpoint = axis2_array_list_get( endpoint_list, env, 0 );
+ endpoint = axutil_array_list_get( endpoint_list, env, 0 );
endpoint = woden_wsdl10_endpoint_to_element_extensible(
endpoint, env);
@@ -493,12 +493,12 @@
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(endpoint,
env);
if(ext_elements)
- size = axis2_array_list_size(ext_elements, env);
+ size = axutil_array_list_size(ext_elements, env);
else
return AXIS2_FAILURE;
for(j = 0; j < size; j++)
{
- ext_element = axis2_array_list_get(ext_elements, env, j);
+ ext_element = axutil_array_list_get(ext_elements, env, j);
ext_type = (axis2_qname_t*)WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
@@ -538,11 +538,11 @@
binding_ops_list =
WODEN_BINDING_GET_BINDING_OPS( binding, env);
binding_ops_count =
- axis2_array_list_size( binding_ops_list, env );
+ axutil_array_list_size( binding_ops_list, env );
for ( i = 0; i < binding_ops_count; i ++ )
{
- binding_op = axis2_array_list_get ( binding_ops_list, env, i );
+ binding_op = axutil_array_list_get ( binding_ops_list, env, i );
/**********************************************************************
* extract interface ops
**********************************************************************/
@@ -587,10 +587,10 @@
"http://schemas.xmlsoap.org/wsdl/soap/", NULL);
binding_op = woden_wsdl10_binding_op_to_element_extensible(binding_op, env);
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op, env);
- size = axis2_array_list_size( ext_elements, env);
+ size = axutil_array_list_size( ext_elements, env);
for(j=0; j < size; j++)
{
- ext_element = axis2_array_list_get(ext_elements, env, j);
+ ext_element = axutil_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
@@ -619,7 +619,7 @@
axiom_node_t *method,
void *interface_op, int wsdl_version)
{
- axis2_array_list_t *interface_msg_refs = NULL;
+ axutil_array_list_t *interface_msg_refs = NULL;
int msg_refs_size = 0;
int j = 0;
void *interface_msg_ref = NULL;
@@ -650,10 +650,10 @@
interface_msg_refs = WODEN_INTERFACE_OP_GET_INTERFACE_MSG_REFS(
interface_op, env);
if(interface_msg_refs)
- msg_refs_size = axis2_array_list_size(interface_msg_refs, env);
+ msg_refs_size = axutil_array_list_size(interface_msg_refs, env);
for(j = 0; j < msg_refs_size; j++)
{
- interface_msg_ref = axis2_array_list_get(interface_msg_refs, env, j);
+ interface_msg_ref = axutil_array_list_get(interface_msg_refs, env, j);
if( wsdl_version == 1)
{
direction = WODEN_WSDL10_INTERFACE_MSG_REF_GET_DIRECTION
@@ -721,10 +721,10 @@
const axis2_env_t* env,
axiom_node_t* root)
{
- axis2_array_list_t* svc_list = NULL;
+ axutil_array_list_t* svc_list = NULL;
woden_svc_t* svc = NULL;
- axis2_array_list_t* endpoint_list = NULL;
+ axutil_array_list_t* endpoint_list = NULL;
woden_endpoint_t * endpoint = NULL;
axis2_uri_t* endpoint_uri = NULL;
axis2_char_t* endpoint_uri_str = NULL;
@@ -733,7 +733,7 @@
woden_binding_t* binding = NULL;
axis2_char_t* binding_style = NULL;
- axis2_array_list_t* binding_ops_list = NULL;
+ axutil_array_list_t* binding_ops_list = NULL;
int binding_ops_count = 0;
void* binding_op = NULL;
@@ -749,7 +749,7 @@
axis2_char_t *soap_action_str = NULL;
axis2_qname_t *ext_type_l = NULL;
axis2_qname_t *ext_type = NULL;
- axis2_array_list_t *ext_elements = NULL;
+ axutil_array_list_t *ext_elements = NULL;
void *ext_element = NULL;
int size = 0, j = 0;
@@ -762,12 +762,12 @@
svc_list = WODEN_DESC_GET_SVCS(emitter_impl->desc, env);
/** currently work only for one service */
- if (axis2_array_list_size ( svc_list, env ) < 1 )
+ if (axutil_array_list_size ( svc_list, env ) < 1 )
{
/** no need to continue more */
return AXIS2_FAILURE;
}
- svc = axis2_array_list_get( svc_list, env, 0 );
+ svc = axutil_array_list_get( svc_list, env, 0 );
/**********************************************************************
* extract endpoint(s)
@@ -775,11 +775,11 @@
endpoint_list = WODEN_SVC_GET_ENDPOINTS (svc, env);
/** currently work only for one endpoint*/
- if (axis2_array_list_size ( endpoint_list, env ) < 1 )
+ if (axutil_array_list_size ( endpoint_list, env ) < 1 )
{
return AXIS2_FAILURE; /* no need to continue more */
}
- endpoint = axis2_array_list_get( endpoint_list, env, 0 );
+ endpoint = axutil_array_list_get( endpoint_list, env, 0 );
endpoint_uri = WODEN_ENDPOINT_GET_ADDRESS( endpoint, env);
endpoint_uri_str = axis2_uri_to_string ( endpoint_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
endpoint_node = w2c_xslt_utils_add_child_node(env, "endpoint",
@@ -800,11 +800,11 @@
binding_ops_list =
WODEN_BINDING_GET_BINDING_OPS( binding, env);
binding_ops_count =
- axis2_array_list_size( binding_ops_list, env );
+ axutil_array_list_size( binding_ops_list, env );
for ( i = 0; i < binding_ops_count; i ++ )
{
- binding_op = axis2_array_list_get ( binding_ops_list, env, i );
+ binding_op = axutil_array_list_get ( binding_ops_list, env, i );
/**********************************************************************
* extract interface ops
**********************************************************************/
@@ -849,10 +849,10 @@
"http://schemas.xmlsoap.org/wsdl/soap/", NULL);
binding_op = woden_binding_op_to_element_extensible(binding_op, env);
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op, env);
- size = axis2_array_list_size( ext_elements, env);
+ size = axutil_array_list_size( ext_elements, env);
for(j=0; j < size; j++)
{
- ext_element = axis2_array_list_get(ext_elements, env, j);
+ ext_element = axutil_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
if(AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_emitter.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <w2c_engine_configuration.h>
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_engine.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_hash.h>
#include <axis2_string.h>
#include <w2c_string.h>
@@ -39,10 +39,10 @@
{
w2c_engine_t engine;
- axis2_array_list_t *pre_extensions;
- axis2_array_list_t *post_extensions;
- axis2_array_list_t *pre_extensions_dll_desc;
- axis2_array_list_t *post_extensions_dll_desc;
+ axutil_array_list_t *pre_extensions;
+ axutil_array_list_t *post_extensions;
+ axutil_array_list_t *pre_extensions_dll_desc;
+ axutil_array_list_t *post_extensions_dll_desc;
w2c_engine_configuration_t *conf;
w2c_config_property_loader_t *prop_loader;
@@ -165,13 +165,13 @@
/* following should be free 1 by 1 after the extension developed */
if(engine_impl-> pre_extensions )
- axis2_array_list_free (engine_impl-> pre_extensions, env );
+ axutil_array_list_free (engine_impl-> pre_extensions, env );
if(engine_impl-> post_extensions )
- axis2_array_list_free (engine_impl-> post_extensions, env );
+ axutil_array_list_free (engine_impl-> post_extensions, env );
if(engine_impl-> pre_extensions_dll_desc )
- axis2_array_list_free (engine_impl-> pre_extensions_dll_desc, env );
+ axutil_array_list_free (engine_impl-> pre_extensions_dll_desc, env );
if(engine_impl-> post_extensions_dll_desc )
- axis2_array_list_free (engine_impl-> post_extensions_dll_desc, env );
+ axutil_array_list_free (engine_impl-> post_extensions_dll_desc, env );
if(engine_impl-> conf)
W2C_ENGINE_CONFIGURATION_FREE (engine_impl-> conf, env);
@@ -214,11 +214,11 @@
if ( engine_impl-> pre_extensions != NULL )
{
- size = axis2_array_list_size( engine_impl-> pre_extensions, env);
+ size = axutil_array_list_size( engine_impl-> pre_extensions, env);
for (i = 0; i < size ; i++)
{
ext = (w2c_extension_t*)
- axis2_array_list_get( engine_impl-> pre_extensions, env, i);
+ axutil_array_list_get( engine_impl-> pre_extensions, env, i);
W2C_EXTENSION_ENGAGE ( ext, env, engine_impl-> conf);
}
}
@@ -268,32 +268,32 @@
if ( engine_impl-> post_extensions != NULL )
{
- size = axis2_array_list_size( engine_impl-> post_extensions, env);
+ size = axutil_array_list_size( engine_impl-> post_extensions, env);
for (i = 0; i < size ; i++)
{
ext = (w2c_extension_t*)
- axis2_array_list_get( engine_impl-> post_extensions, env, i);
+ axutil_array_list_get( engine_impl-> post_extensions, env, i);
W2C_EXTENSION_ENGAGE( ext, env, engine_impl-> conf);
}
}
/** freeing used extension right here */
if ( engine_impl-> pre_extensions != NULL )
{
- size = axis2_array_list_size( engine_impl-> pre_extensions, env);
+ size = axutil_array_list_size( engine_impl-> pre_extensions, env);
for (i = 0; i < size ; i++)
{
dll_desc = (axis2_dll_desc_t*)
- axis2_array_list_get( engine_impl-> pre_extensions_dll_desc, env, i);
+ axutil_array_list_get( engine_impl-> pre_extensions_dll_desc, env, i);
/*w2c_class_loader_free_loaded_class(env, dll_desc);*/
}
if ( engine_impl-> post_extensions != NULL )
{
- size = axis2_array_list_size( engine_impl-> post_extensions, env);
+ size = axutil_array_list_size( engine_impl-> post_extensions, env);
for (i = 0; i < size ; i++)
{
dll_desc = (axis2_dll_desc_t*)
- axis2_array_list_get( engine_impl-> post_extensions_dll_desc, env, i);
+ axutil_array_list_get( engine_impl-> post_extensions_dll_desc, env, i);
/*w2c_class_loader_free_loaded_class(env, dll_desc);*/
}
} }
@@ -305,7 +305,7 @@
w2c_engine_load_extension (w2c_engine_impl_t *engine_impl,
const axis2_env_t *env)
{
- axis2_array_list_t *extension_names = NULL;
+ axutil_array_list_t *extension_names = NULL;
w2c_config_property_loader_t *prop_loader = NULL;
axis2_char_t *class_name = NULL;
w2c_extension_t *ext = NULL;
@@ -320,21 +320,21 @@
if ( extension_names != NULL)
{
engine_impl-> pre_extensions
- = axis2_array_list_create ( env, 10 );
+ = axutil_array_list_create ( env, 10 );
engine_impl-> pre_extensions_dll_desc
- = axis2_array_list_create ( env, 10 );
- size = axis2_array_list_size ( extension_names ,env);
+ = axutil_array_list_create ( env, 10 );
+ size = axutil_array_list_size ( extension_names ,env);
for ( i = 0; i < size; i ++ )
{
- class_name = (axis2_char_t*)axis2_array_list_get
+ class_name = (axis2_char_t*)axutil_array_list_get
( extension_names, env , i );
ext = w2c_class_loader_get_object_from_class_name
( env, class_name, W2C_CLASS_LOADER_EXTENSION_PATH, &dll_desc);
if ( NULL!= ext )
{
- axis2_array_list_add_at ( engine_impl-> pre_extensions,
+ axutil_array_list_add_at ( engine_impl-> pre_extensions,
env, i,(void*)ext);
- axis2_array_list_add_at (engine_impl-> pre_extensions_dll_desc,
+ axutil_array_list_add_at (engine_impl-> pre_extensions_dll_desc,
env, i,(void*)dll_desc);
}
else
@@ -350,21 +350,21 @@
if ( extension_names != NULL)
{
engine_impl-> post_extensions
- = axis2_array_list_create ( env, 10 );
+ = axutil_array_list_create ( env, 10 );
engine_impl-> post_extensions_dll_desc
- = axis2_array_list_create ( env, 10 );
- size = axis2_array_list_size ( extension_names ,env);
+ = axutil_array_list_create ( env, 10 );
+ size = axutil_array_list_size ( extension_names ,env);
for ( i = 0; i < size; i ++ )
{
- class_name = (axis2_char_t*)axis2_array_list_get
+ class_name = (axis2_char_t*)axutil_array_list_get
( extension_names, env , i );
ext = w2c_class_loader_get_object_from_class_name
( env, class_name, W2C_CLASS_LOADER_EXTENSION_PATH, &dll_desc );
if ( NULL != ext )
{
- axis2_array_list_add_at ( engine_impl-> post_extensions,
+ axutil_array_list_add_at ( engine_impl-> post_extensions,
env, i,ext );
- axis2_array_list_add_at (engine_impl-> post_extensions_dll_desc,
+ axutil_array_list_add_at (engine_impl-> post_extensions_dll_desc,
env, i,(void*)dll_desc);
}
else
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c Fri Mar 30 06:19:43 2007
@@ -18,7 +18,7 @@
#include <w2c_engine_config_loader.h>
#include <w2c_cmdline_option_consts.h>
#include <axis2_hash.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <w2c_cmdline_option.h>
#include <w2c_messages.h>
#include <axis2_string.h>
@@ -51,7 +51,7 @@
axis2_char_t *tmp_key = NULL;
axis2_hash_t *h = NULL;
axis2_hash_index_t *hi = NULL;
- axis2_array_list_t *tmp_array = NULL;
+ axutil_array_list_t *tmp_array = NULL;
w2c_properties_t *props = NULL;
int len = 0;
@@ -362,7 +362,7 @@
if ( w2c_string_indexof_cs
( tmp_key, W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX)== 0 && tmp_array)
{
- tmp_string = (char*)axis2_array_list_get (tmp_array, env, 0 );
+ tmp_string = (char*)axutil_array_list_get (tmp_array, env, 0 );
if ( h == NULL )
{
h = axis2_hash_make ( env );
@@ -370,7 +370,7 @@
len = axis2_strlen (W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX );
tmp_key = axis2_string_substring_starting_at ( tmp_key, len);
axis2_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string );
- axis2_array_list_free ( tmp_array, env);
+ axutil_array_list_free ( tmp_array, env);
}
}
W2C_ENGINE_CONFIGURATION_SET_CONFIGURATION_PROPERTIES( conf, env, h );
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c Fri Mar 30 06:19:43 2007
@@ -17,7 +17,7 @@
#include <w2c_engine_configuration.h>
#include <w2c_engine_config_loader.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_hash.h>
#include <axis2_string.h>
#include <w2c_string.h>
@@ -90,7 +90,7 @@
/** c specific names */
axis2_bool_t convert_names;
axis2_bool_t indent_code;
- axis2_array_list_t *filenames;
+ axutil_array_list_t *filenames;
w2c_qname2name_maker_t *qname2name;
W2C_ENGINE_CONFIGURATION_NAMEMAKER namemaker_func;
@@ -457,7 +457,7 @@
const axis2_env_t* env,
axis2_char_t *filename);
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
w2c_engine_configuration_get_filenames(
w2c_engine_configuration_t* engine_configuration,
const axis2_env_t* env);
@@ -515,7 +515,7 @@
engine_configuration_impl->convert_names = AXIS2_FALSE;
engine_configuration_impl->indent_code = AXIS2_FALSE;
- engine_configuration_impl->filenames = axis2_array_list_create(env, 10);
+ engine_configuration_impl->filenames = axutil_array_list_create(env, 10);
engine_configuration_impl->engine_configuration.ops =
AXIS2_MALLOC (env->allocator, sizeof(w2c_engine_configuration_ops_t));
@@ -695,7 +695,7 @@
if ( engine_configuration_impl->filenames)
{
- axis2_array_list_free( engine_configuration_impl->filenames, env);
+ axutil_array_list_free( engine_configuration_impl->filenames, env);
}
if ( engine_configuration_impl->base_uri )
{
@@ -1701,11 +1701,11 @@
engine_configuration_impl = W2C_INTF_TO_IMPL(engine_configuration );
- axis2_array_list_add( engine_configuration_impl->filenames, env, filename);
+ axutil_array_list_add( engine_configuration_impl->filenames, env, filename);
return AXIS2_SUCCESS;
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
w2c_engine_configuration_get_filenames(
w2c_engine_configuration_t* engine_configuration,
const axis2_env_t* env)
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c Fri Mar 30 06:19:43 2007
@@ -63,7 +63,7 @@
w2c_c_code_indenter_ext_impl_t *extension_impl = NULL;
axis2_bool_t indent_code = AXIS2_FALSE;
axis2_char_t *lang = NULL;
- axis2_array_list_t *filenames = NULL;
+ axutil_array_list_t *filenames = NULL;
int i = 0, size = 0;
axis2_char_t *filename = NULL;
int length = 0;
@@ -78,10 +78,10 @@
/* this executes only with following configuration */
if ( indent_code && axis2_strcmp( lang, "c") == 0)
{
- size = axis2_array_list_size( filenames, env);
+ size = axutil_array_list_size( filenames, env);
for ( i = 0; i < size; i ++ )
{
- filename = axis2_array_list_get( filenames, env, i);
+ filename = axutil_array_list_get( filenames, env, i);
length = axis2_strlen( filename);
/* take only .c or .h files */
if( filename[length-1] == 'c' || filename[length-1] == 'h' ||
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include "writer_protected.h"
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <w2c_engine_configuration.h>
@@ -179,7 +179,7 @@
int suf_length = 0;
int index = 0;
axis2_char_t *ext_name = NULL;
- axis2_array_list_t *arr_list = NULL;
+ axutil_array_list_t *arr_list = NULL;
lang_map = W2C_CONFIG_PROPERTY_LOADER_GET_LANGUAGE_SPECIFIC_PROPERTIES_MAP
( writer_impl->loader, env );
@@ -199,7 +199,7 @@
(key, W2C_WRITER_EXTENSION_SUFFIX );
if ( index + suf_length == all_length )/* this meen its a suf*/
{
- value = axis2_array_list_get( arr_list, env, 0);
+ value = axutil_array_list_get( arr_list, env, 0);
ext_name = axis2_strdup (env, ".");
ext_name = w2c_string_add_string ( ext_name, value, env);
break;
@@ -221,7 +221,7 @@
int suf_length = 0;
int index = 0;
axis2_char_t *tmpl_name = NULL;
- axis2_array_list_t *arr_list = NULL;
+ axutil_array_list_t *arr_list = NULL;
for (hi = axis2_hash_first(lang_speci_map, env) ;
hi; hi = axis2_hash_next(env, hi))
@@ -235,12 +235,12 @@
(key, W2C_WRITER_TEMPLATE_SUFFIX );
if ( index + suf_length == all_length )/* this meen its a suf*/
{
- value = axis2_array_list_get ( arr_list, env, 0 );
+ value = axutil_array_list_get ( arr_list, env, 0 );
index = w2c_string_indexof_cs
(value, writer_impl-> self_name );
if (0 == index) /* prefix matches for the first entry*/
{
- value = axis2_array_list_get ( arr_list, env, 1);
+ value = axutil_array_list_get ( arr_list, env, 1);
tmpl_name = axis2_strdup (env, "");
tmpl_name = w2c_string_add_string ( tmpl_name, value, env);
break;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c Fri Mar 30 06:19:43 2007
@@ -17,7 +17,7 @@
#include <w2c_cmdline_option_parser.h>
#include <axis2_utils.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_hash.h>
#include <w2c_cmdline_option.h>
#include <w2c_cmdline_option_consts.h>
@@ -72,14 +72,14 @@
const axis2_env_t* env)
{
axis2_hash_t* h = NULL;
- axis2_array_list_t* invalid_arr = NULL;
+ axutil_array_list_t* invalid_arr = NULL;
w2c_cmdline_option_t* option = NULL;
int size = 0;
axis2_char_t* val = NULL;
invalid_arr = W2C_CMDLINE_OPTION_PARSER_GET_INVALID_OPTIONS(cmd_opt_parser, env);
- size = axis2_array_list_size(invalid_arr, env);
- axis2_array_list_free(invalid_arr, env);
+ size = axutil_array_list_size(invalid_arr, env);
+ axutil_array_list_free(invalid_arr, env);
if (size > 0)
{
w2c_print_usage(env);
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c Fri Mar 30 06:19:43 2007
@@ -71,7 +71,7 @@
w2c_cmdline_option_t *option = NULL;
axis2_hash_index_t *hi;
axis2_hash_t *hash = NULL;
- axis2_array_list_t *arr_list = NULL;
+ axutil_array_list_t *arr_list = NULL;
int i = 0;
int input_size;
axis2_char_t actual[128];
@@ -90,10 +90,10 @@
arr_list = W2C_CMDLINE_OPTION_GET_VALUES(option, env);
for (i = 0 , strcpy(actual, W2C_CMDLINE_OPTION_GET_TYPE(option, env));
- i < axis2_array_list_size(arr_list, env); i ++)
+ i < axutil_array_list_size(arr_list, env); i ++)
{
sprintf(actual , "%s %s", actual ,
- (char*)axis2_array_list_get(arr_list, env, i));
+ (char*)axutil_array_list_get(arr_list, env, i));
}
expected = "uri a.wsdl b.wsdl";
CuAssertStrEquals(tc, expected, actual);
@@ -106,10 +106,10 @@
arr_list = W2C_CMDLINE_OPTION_GET_VALUES(option, env);
sprintf(actual, "%s{%s}: ", actual, W2C_CMDLINE_OPTION_GET_TYPE(option, env));
- for (i = 0 ; i < axis2_array_list_size(arr_list, env); i ++)
+ for (i = 0 ; i < axutil_array_list_size(arr_list, env); i ++)
{
sprintf(actual , "%s%s ", actual ,
- (char*)axis2_array_list_get(arr_list, env, i));
+ (char*)axutil_array_list_get(arr_list, env, i));
}
}
@@ -119,10 +119,10 @@
/* ----------------------------------------------------------------------*/
arr_list = W2C_CMDLINE_OPTION_PARSER_GET_INVALID_OPTIONS(parser, env);
for (i = 0, actual[0] = '\0';
- i < axis2_array_list_size(arr_list, env); i ++)
+ i < axutil_array_list_size(arr_list, env); i ++)
{
option = (w2c_cmdline_option_t*)
- axis2_array_list_get(arr_list, env, i);
+ axutil_array_list_get(arr_list, env, i);
sprintf(actual , "%s%s ", actual ,
W2C_CMDLINE_OPTION_GET_TYPE(option, env));
}
@@ -140,7 +140,7 @@
axis2_char_t *expected = NULL;
axis2_hash_index_t *hi = NULL;
axis2_hash_t *hash = NULL;
- axis2_array_list_t *arr_list = NULL;
+ axutil_array_list_t *arr_list = NULL;
int i = 0;
axis2_char_t *axis2c_home = NULL;
axis2_char_t file_path[512];
@@ -178,10 +178,10 @@
axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
sprintf(actual, "%s{%s}: ", actual, key);
- for (i = 0 ; i < axis2_array_list_size(arr_list, env); i ++)
+ for (i = 0 ; i < axutil_array_list_size(arr_list, env); i ++)
{
sprintf(actual , "%s%s ", actual ,
- (char*)axis2_array_list_get(arr_list, env, i));
+ (char*)axutil_array_list_get(arr_list, env, i));
}
}
}
@@ -192,10 +192,10 @@
/** this part is removed from the config file - check later after it is readd */
/*
arr_list = W2C_CONFIG_PROPERTY_LOADER_GET_EXTENSION_CLASS_NAMES ( loader, env );
- for ( i = 0, actual[0] ='\0'; i < axis2_array_list_size ( arr_list, env ); i ++ )
+ for ( i = 0, actual[0] ='\0'; i < axutil_array_list_size ( arr_list, env ); i ++ )
{
sprintf ( actual, "%s%s,", actual,
- (char*) axis2_array_list_get ( arr_list, env , i ) );
+ (char*) axutil_array_list_get ( arr_list, env , i ) );
}
expected = ARRAYLIST_CONFIG_TEST_EXPECTED;
CuAssertStrEquals(tc, expected, actual);
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/session.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/session.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/session.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/session.c Fri Mar 30 06:19:43 2007
@@ -22,7 +22,7 @@
#include <tcpmon_util.h>
#include <axis2_thread.h>
#include <axis2_network_handler.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include "tcpmon_session_local.h"
#include "tcpmon_entry_local.h"
@@ -40,7 +40,7 @@
axis2_char_t *target_host;
TCPMON_SESSION_NEW_ENTRY_FUNCT on_new_entry_funct;
TCPMON_SESSION_TRANS_ERROR_FUNCT on_trans_fault_funct;
- axis2_array_list_t* entries;
+ axutil_array_list_t* entries;
axis2_bool_t is_running;
}
@@ -156,7 +156,7 @@
session_impl -> on_new_entry_funct = NULL;
session_impl -> on_trans_fault_funct = NULL;
- session_impl -> entries = axis2_array_list_create(env, 10);
+ session_impl -> entries = axutil_array_list_create(env, 10);
session_impl->session.ops =
AXIS2_MALLOC(env->allocator, sizeof(tcpmon_session_ops_t));
@@ -202,12 +202,12 @@
session_impl = AXIS2_INTF_TO_IMPL(session);
- for (entries_size = axis2_array_list_size(session_impl-> entries, env) - 1;
+ for (entries_size = axutil_array_list_size(session_impl-> entries, env) - 1;
entries_size >= 0; entries_size --)
{
TCPMON_ENTRY_FREE(entry, env);
}
- axis2_array_list_free(session_impl-> entries, env);
+ axutil_array_list_free(session_impl-> entries, env);
if (session->ops)
{
@@ -542,7 +542,7 @@
session_impl = AXIS2_INTF_TO_IMPL(session);
- axis2_array_list_add(session_impl-> entries,
+ axutil_array_list_add(session_impl-> entries,
env,
entry);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/util/include/axis2_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_dir_handler.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_dir_handler.h Fri Mar 30 06:19:43 2007
@@ -22,7 +22,7 @@
#include <axis2_error.h>
#include <axis2_env.h>
#include <axis2_string.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_utils.h>
@@ -41,7 +41,7 @@
* @param pathname path to your service or module directory
* @return array list of dll file names
*/
- AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
axis2_char_t *pathname);
@@ -51,7 +51,7 @@
* @param pathname path your modules or services folder
* @return array list of contents of services or modules folder
*/
- AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
axis2_char_t *pathname);
Modified: webservices/axis2/trunk/c/util/include/axis2_param.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param.h Fri Mar 30 06:19:43 2007
@@ -26,7 +26,7 @@
#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_hash.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#ifdef __cplusplus
extern "C"
@@ -144,9 +144,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_param_set_value_list(struct axis2_param *param,
const axis2_env_t *env,
- axis2_array_list_t *value_list);
+ axutil_array_list_t *value_list);
- AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL
axis2_param_get_value_list(struct axis2_param *param,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Fri Mar 30 06:19:43 2007
@@ -34,7 +34,7 @@
#include <axis2_env.h>
#include <axutil_allocator.h>
#include <axis2_string.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_hash.h>
/*#include <axiom_element.h>*/
@@ -102,7 +102,7 @@
/** To get all the params in a given description
* @return all the params contained
*/
- AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_param_container_get_params(axis2_param_container_t *param_container,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/util/include/axis2_string_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string_util.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_string_util.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_string_util.h Fri Mar 30 06:19:43 2007
@@ -18,24 +18,24 @@
#ifndef AXIS2_STRING_UTIL_H
#define AXIS2_STRING_UTIL_H
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_string.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_tokenize(const axis2_env_t *env,
axis2_char_t *in,
int delim);
- AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_first_token(const axis2_env_t *env,
axis2_char_t *in,
int delim);
- AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_last_token(const axis2_env_t *env,
axis2_char_t *in,
int delim);
Copied: webservices/axis2/trunk/c/util/include/axutil_array_list.h (from r524047, webservices/axis2/trunk/c/util/include/axis2_array_list.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_array_list.h?view=diff&rev=524073&p1=webservices/axis2/trunk/c/util/include/axis2_array_list.h&r1=524047&p2=webservices/axis2/trunk/c/util/include/axutil_array_list.h&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_array_list.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_array_list.h Fri Mar 30 06:19:43 2007
@@ -19,14 +19,14 @@
#define AXIS2_ARRAY_LIST_H
/**
- * @defgroup axis2_array_list array list
+ * @defgroup axutil_array_list array list
* @ingroup axis2_util
* Description.
* @{
*/
/**
- * @file axis2_array_list.h
+ * @file axutil_array_list.h
* @brief Axis2 array_list interface
*/
@@ -43,7 +43,7 @@
/**
* Array List struct
*/
- typedef struct axis2_array_list axis2_array_list_t;
+ typedef struct axutil_array_list axutil_array_list_t;
/**
* Constructs a new array list with the supplied initial capacity.
@@ -51,7 +51,7 @@
* @param env pointer to environment struct
* @param capacity initial capacity of this array_list
*/
- AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL axis2_array_list_create(
+ AXIS2_EXTERN axutil_array_list_t* AXIS2_CALL axutil_array_list_create(
const axis2_env_t *env,
int capacity);
@@ -61,7 +61,7 @@
* @param env pointer to environment struct
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_array_list_free_void_arg(
+ axutil_array_list_free_void_arg(
void *array_list,
const axis2_env_t *env);
@@ -75,8 +75,8 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_array_list_ensure_capacity(
- struct axis2_array_list *array_list,
+ axutil_array_list_ensure_capacity(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
int min_capacity);
@@ -87,8 +87,8 @@
* @return the list size
*/
AXIS2_EXTERN int AXIS2_CALL
- axis2_array_list_size(
- struct axis2_array_list *array_list,
+ axutil_array_list_size(
+ struct axutil_array_list *array_list,
const axis2_env_t *env);
/**
@@ -98,8 +98,8 @@
* @return true if there are no elements, else false
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_array_list_is_empty(
- struct axis2_array_list *array_list,
+ axutil_array_list_is_empty(
+ struct axutil_array_list *array_list,
const axis2_env_t *env);
/**
@@ -110,8 +110,8 @@
* @return true if the list contains e
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_array_list_contains(
- struct axis2_array_list *array_list,
+ axutil_array_list_contains(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
void *e);
@@ -125,8 +125,8 @@
* @return the index where e was found
*/
AXIS2_EXTERN int AXIS2_CALL
- axis2_array_list_index_of(
- struct axis2_array_list *array_list,
+ axutil_array_list_index_of(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
void *e);
@@ -138,7 +138,7 @@
* @return element at the given index
*/
AXIS2_EXTERN void* AXIS2_CALL
- axis2_array_list_get(struct axis2_array_list *array_list,
+ axutil_array_list_get(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index);
@@ -152,8 +152,8 @@
* @return the element previously at the specified index
*/
AXIS2_EXTERN void* AXIS2_CALL
- axis2_array_list_set(
- struct axis2_array_list *array_list,
+ axutil_array_list_set(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
int index,
void* e);
@@ -167,8 +167,8 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_array_list_add(
- struct axis2_array_list *array_list,
+ axutil_array_list_add(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
const void* e);
@@ -183,8 +183,8 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_array_list_add_at(
- struct axis2_array_list *array_list,
+ axutil_array_list_add_at(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
const int index,
const void* e);
@@ -197,7 +197,7 @@
* @return the removed void* pointer
*/
AXIS2_EXTERN void* AXIS2_CALL
- axis2_array_list_remove(struct axis2_array_list *array_list,
+ axutil_array_list_remove(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index);
@@ -209,8 +209,8 @@
* @return AXIS2_FALSE if index > size or index < 0, else AXIS2_TRUE
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_array_list_check_bound_inclusive(
- struct axis2_array_list *array_list,
+ axutil_array_list_check_bound_inclusive(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
int index);
@@ -222,8 +222,8 @@
* @return AXIS2_FALSE if index >= size or index < 0, else AXIS2_TRUE
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_array_list_check_bound_exclusive(
- struct axis2_array_list *array_list,
+ axutil_array_list_check_bound_exclusive(
+ struct axutil_array_list *array_list,
const axis2_env_t *env,
int index);
@@ -233,8 +233,8 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_array_list_free(
- struct axis2_array_list *array_list,
+ axutil_array_list_free(
+ struct axutil_array_list *array_list,
const axis2_env_t *env);
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/util/src/array_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/array_list.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/util/src/array_list.c Fri Mar 30 06:19:43 2007
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_utils.h>
#include <string.h>
-struct axis2_array_list
+struct axutil_array_list
{
/**The number of elements in this list. */
int size;
@@ -29,15 +29,15 @@
void** data;
};
-AXIS2_EXTERN struct axis2_array_list* AXIS2_CALL
-axis2_array_list_create(const axis2_env_t *env,
+AXIS2_EXTERN struct axutil_array_list* AXIS2_CALL
+axutil_array_list_create(const axis2_env_t *env,
int capacity)
{
- axis2_array_list_t *array_list = NULL;
+ axutil_array_list_t *array_list = NULL;
AXIS2_ENV_CHECK(env, NULL);
- array_list = AXIS2_MALLOC(env->allocator, sizeof(axis2_array_list_t));
+ array_list = AXIS2_MALLOC(env->allocator, sizeof(axutil_array_list_t));
if (!array_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -54,7 +54,7 @@
array_list->data = AXIS2_MALLOC(env->allocator, sizeof(void*) * capacity);
if (!array_list->data)
{
- axis2_array_list_free(array_list, env);
+ axutil_array_list_free(array_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -65,7 +65,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_array_list_ensure_capacity(struct axis2_array_list *array_list,
+axutil_array_list_ensure_capacity(struct axutil_array_list *array_list,
const axis2_env_t *env,
int min_capacity)
{
@@ -94,7 +94,7 @@
}
AXIS2_EXTERN int AXIS2_CALL
-axis2_array_list_size(struct axis2_array_list *array_list,
+axutil_array_list_size(struct axutil_array_list *array_list,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -102,7 +102,7 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_array_list_is_empty(struct axis2_array_list *array_list,
+axutil_array_list_is_empty(struct axutil_array_list *array_list,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -110,16 +110,16 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_array_list_contains(struct axis2_array_list *array_list,
+axutil_array_list_contains(struct axutil_array_list *array_list,
const axis2_env_t *env,
void *e)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_array_list_index_of(array_list, env, e) != -1;
+ return axutil_array_list_index_of(array_list, env, e) != -1;
}
AXIS2_EXTERN int AXIS2_CALL
-axis2_array_list_index_of(struct axis2_array_list *array_list,
+axutil_array_list_index_of(struct axutil_array_list *array_list,
const axis2_env_t *env,
void *e)
{
@@ -134,18 +134,18 @@
}
AXIS2_EXTERN void* AXIS2_CALL
-axis2_array_list_get(struct axis2_array_list *array_list,
+axutil_array_list_get(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index)
{
- if (axis2_array_list_check_bound_exclusive(array_list, env, index))
+ if (axutil_array_list_check_bound_exclusive(array_list, env, index))
return array_list->data[index];
else
return NULL;
}
AXIS2_EXTERN void* AXIS2_CALL
-axis2_array_list_set(struct axis2_array_list *array_list,
+axutil_array_list_set(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index,
void* e)
@@ -154,7 +154,7 @@
AXIS2_ENV_CHECK(env, NULL);
- if (axis2_array_list_check_bound_exclusive(array_list, env, index))
+ if (axutil_array_list_check_bound_exclusive(array_list, env, index))
{
result = array_list->data[index];
array_list->data[index] = e;
@@ -163,31 +163,31 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_array_list_add(struct axis2_array_list *array_list,
+axutil_array_list_add(struct axutil_array_list *array_list,
const axis2_env_t *env,
const void* e)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (array_list->size == array_list->capacity)
- if (axis2_array_list_ensure_capacity(array_list, env, array_list->size + 1) != AXIS2_SUCCESS)
+ if (axutil_array_list_ensure_capacity(array_list, env, array_list->size + 1) != AXIS2_SUCCESS)
return AXIS2_FAILURE;
array_list->data[array_list->size++] = (void *)e;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_array_list_add_at(struct axis2_array_list *array_list,
+axutil_array_list_add_at(struct axutil_array_list *array_list,
const axis2_env_t *env,
const int index,
const void* e)
{
int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (!axis2_array_list_check_bound_inclusive(array_list, env, index))
+ if (!axutil_array_list_check_bound_inclusive(array_list, env, index))
return AXIS2_FAILURE;
if (array_list->size == array_list->capacity)
{
- if (axis2_array_list_ensure_capacity(array_list, env, array_list->size + 1) != AXIS2_SUCCESS)
+ if (axutil_array_list_ensure_capacity(array_list, env, array_list->size + 1) != AXIS2_SUCCESS)
return AXIS2_FAILURE;
}
if (index != array_list->size)
@@ -201,7 +201,7 @@
}
AXIS2_EXTERN void* AXIS2_CALL
-axis2_array_list_remove(struct axis2_array_list *array_list,
+axutil_array_list_remove(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index)
{
@@ -209,7 +209,7 @@
int i = 0;
AXIS2_ENV_CHECK(env, NULL);
- if (axis2_array_list_check_bound_exclusive(array_list, env, index))
+ if (axutil_array_list_check_bound_exclusive(array_list, env, index))
{
result = array_list->data[index];
for (i = index; i < array_list->size - 1; i++)
@@ -221,7 +221,7 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_array_list_check_bound_inclusive(struct axis2_array_list *array_list,
+axutil_array_list_check_bound_inclusive(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index)
{
@@ -236,7 +236,7 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_array_list_check_bound_exclusive(struct axis2_array_list *array_list,
+axutil_array_list_check_bound_exclusive(struct axutil_array_list *array_list,
const axis2_env_t *env,
int index)
{
@@ -251,7 +251,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_array_list_free(struct axis2_array_list *array_list,
+axutil_array_list_free(struct axutil_array_list *array_list,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -265,14 +265,14 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_array_list_free_void_arg(void *array_list,
+axutil_array_list_free_void_arg(void *array_list,
const axis2_env_t *env)
{
- axis2_array_list_t *array_list_l = NULL;
+ axutil_array_list_t *array_list_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- array_list_l = (axis2_array_list_t *) array_list;
- axis2_array_list_free(array_list_l, env);
+ array_list_l = (axutil_array_list_t *) array_list;
+ axutil_array_list_free(array_list_l, env);
return;
}
Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Fri Mar 30 06:19:43 2007
@@ -35,11 +35,11 @@
* @param pathname path to your service or module directory
* @return array list of dll file names
*/
-AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
axis2_char_t *pathname)
{
- axis2_array_list_t *file_list = NULL;
+ axutil_array_list_t *file_list = NULL;
struct stat *buf = NULL;
int count = 1;
int i = 0;
@@ -48,12 +48,12 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
- file_list = axis2_array_list_create(env, 100);
+ file_list = axutil_array_list_create(env, 100);
count = AXIS2_SCANDIR(pathname, &files, file_select, AXIS2_ALPHASORT);
/* If no files found, make a non-selectable menu item */
if (count <= 0)
{
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
return NULL;
}
@@ -73,13 +73,13 @@
int j = 0;
axis2_file_t *del_file = NULL;
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -94,13 +94,13 @@
axis2_file_t *del_file = NULL;
axis2_file_free(arch_file, env);
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -114,19 +114,19 @@
AXIS2_FREE(env->allocator, path);
axis2_file_free(arch_file, env);
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stat(path, buf);
axis2_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
- status = axis2_array_list_add(file_list, env, arch_file);
+ status = axutil_array_list_add(file_list, env, arch_file);
if (AXIS2_SUCCESS != status)
{
int size = 0;
@@ -136,13 +136,13 @@
axis2_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
AXIS2_FREE(env->allocator, buf);
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
return NULL;
}
AXIS2_FREE(env->allocator, path);
@@ -158,11 +158,11 @@
* @param pathname path your modules or services folder
* @return array list of contents of services or modules folder
*/
-AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
axis2_char_t *pathname)
{
- axis2_array_list_t *file_list = NULL;
+ axutil_array_list_t *file_list = NULL;
struct stat *buf = NULL;
int count = 1;
int i = 0;
@@ -177,7 +177,7 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
- file_list = axis2_array_list_create(env, 0);
+ file_list = axutil_array_list_create(env, 0);
if (!getcwd(cwd, 500)) exit(1);
chdir(pathname);
axis2_archive_extract();
@@ -188,7 +188,7 @@
/* If no files found, make a non-selectable menu item */
if (count <= 0)
{
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
return NULL;
}
@@ -208,13 +208,13 @@
int j = 0;
axis2_file_t *del_file = NULL;
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -228,13 +228,13 @@
axis2_file_t *del_file = NULL;
axis2_file_free(arch_file, env);
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -249,19 +249,19 @@
axis2_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stat(path, buf);
axis2_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
- status = axis2_array_list_add(file_list, env, arch_file);
+ status = axutil_array_list_add(file_list, env, arch_file);
if (AXIS2_SUCCESS != status)
{
int size = 0;
@@ -271,13 +271,13 @@
axis2_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
AXIS2_FREE(env->allocator, buf);
- size = axis2_array_list_size(file_list, env);
+ size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
- del_file = axis2_array_list_get(file_list, env, j);
+ del_file = axutil_array_list_get(file_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(file_list, env);
+ axutil_array_list_free(file_list, env);
return NULL;
}
AXIS2_FREE(env->allocator, path);
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Fri Mar 30 06:19:43 2007
@@ -31,7 +31,7 @@
/** Parameter type */
int type; /*default is AXIS2_TEXT_PARAM */
axis2_hash_t *attrs;
- axis2_array_list_t *value_list;
+ axutil_array_list_t *value_list;
axis2_status_t (AXIS2_CALL *
value_free) (void *param_value,
const axis2_env_t *env);
@@ -187,7 +187,7 @@
axis2_status_t AXIS2_CALL
axis2_param_set_value_list(axis2_param_t *param,
const axis2_env_t *env,
- axis2_array_list_t *value_list)
+ axutil_array_list_t *value_list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value_list, AXIS2_FAILURE);
@@ -196,23 +196,23 @@
{
int i = 0, size = 0;
- size = axis2_array_list_size(param->value_list, env);
+ size = axutil_array_list_size(param->value_list, env);
for (i = 0; i < size; i++)
{
axis2_param_t *param = NULL;
- param = (axis2_param_t *) axis2_array_list_get(
+ param = (axis2_param_t *) axutil_array_list_get(
param->value_list, env, i);
axis2_param_free(param, env);
}
- axis2_array_list_free(param->value_list, env);
+ axutil_array_list_free(param->value_list, env);
}
param->value_list = value_list;
return AXIS2_SUCCESS;
}
-axis2_array_list_t* AXIS2_CALL
+axutil_array_list_t* AXIS2_CALL
axis2_param_get_value_list(axis2_param_t *param,
const axis2_env_t *env)
{
@@ -259,19 +259,19 @@
{
int i = 0, size = 0;
- size = axis2_array_list_size(param->value_list, env);
+ size = axutil_array_list_size(param->value_list, env);
for (i = 0; i < size; i++)
{
axis2_param_t *param_l = NULL;
- param_l = (axis2_param_t *) axis2_array_list_get(
+ param_l = (axis2_param_t *) axutil_array_list_get(
param->value_list, env, i);
if (param_l)
{
axis2_param_free(param_l, env);
}
}
- axis2_array_list_free(param->value_list, env);
+ axutil_array_list_free(param->value_list, env);
}
param_name = axis2_param_get_name(param, env);
AXIS2_FREE(env->allocator, param_name);
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/src/param_container.c (original)
+++ webservices/axis2/trunk/c/util/src/param_container.c Fri Mar 30 06:19:43 2007
@@ -20,7 +20,7 @@
struct axis2_param_container
{
axis2_hash_t *params;
- axis2_array_list_t *params_list;
+ axutil_array_list_t *params_list;
};
AXIS2_EXTERN axis2_param_container_t * AXIS2_CALL
@@ -41,7 +41,7 @@
param_container->params = NULL;
param_container->params_list = NULL;
- param_container->params_list = axis2_array_list_create(env, 0);
+ param_container->params_list = axutil_array_list_create(env, 0);
param_container->params = axis2_hash_make(env);
if (!param_container->params)
@@ -85,7 +85,7 @@
* requested from param_container. Params referenced here are
* actually contained in params hash table
*/
- axis2_array_list_free(param_container->params_list, env);
+ axutil_array_list_free(param_container->params_list, env);
param_container->params_list = NULL;
}
@@ -145,7 +145,7 @@
name, AXIS2_HASH_KEY_STRING));
}
-AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_param_container_get_params(axis2_param_container_t *param_container,
const axis2_env_t *env)
{
@@ -155,7 +155,7 @@
if (!param_container->params_list)
{
- param_container->params_list = axis2_array_list_create(env, 0);
+ param_container->params_list = axutil_array_list_create(env, 0);
if (!param_container->params_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
@@ -168,11 +168,11 @@
index_i; index_i = axis2_hash_next(env, index_i))
{
axis2_hash_this(index_i, NULL, NULL, &value);
- status = axis2_array_list_add(param_container->params_list, env,
+ status = axutil_array_list_add(param_container->params_list, env,
value);
if (AXIS2_SUCCESS != status)
{
- axis2_array_list_free(param_container->params_list , env);
+ axutil_array_list_free(param_container->params_list , env);
return NULL;
}
}
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Fri Mar 30 06:19:43 2007
@@ -19,12 +19,12 @@
#include <string.h>
#include <axis2_utils.h>
-AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_tokenize(const axis2_env_t *env,
axis2_char_t *in,
int delim)
{
- axis2_array_list_t *list = NULL;
+ axutil_array_list_t *list = NULL;
axis2_char_t *rest = NULL;
axis2_char_t *str = NULL;
@@ -34,7 +34,7 @@
{
return NULL;
}
- list = axis2_array_list_create(env, 10);
+ list = axutil_array_list_create(env, 10);
if (!list)
{
return NULL;
@@ -47,7 +47,7 @@
index = strchr(str, delim);
if ((!index) && (str) && axis2_strcmp(str, "") != 0)
{
- axis2_array_list_add(list, env, str);
+ axutil_array_list_add(list, env, str);
break;
}
@@ -56,7 +56,7 @@
if ((list) && (str) && axis2_strcmp(str, "") != 0)
{
- axis2_array_list_add(list, env, str);
+ axutil_array_list_add(list, env, str);
}
if (!rest || axis2_strcmp(rest, "") == 0)
@@ -72,12 +72,12 @@
return list;
}
-AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_first_token(const axis2_env_t *env,
axis2_char_t *in,
int delim)
{
- axis2_array_list_t *list = NULL;
+ axutil_array_list_t *list = NULL;
axis2_char_t *str = NULL;
axis2_char_t *rest = NULL;
axis2_char_t *index = NULL;
@@ -88,7 +88,7 @@
return NULL;
}
- list = axis2_array_list_create(env, 2);
+ list = axutil_array_list_create(env, 2);
if (!list)
{
return NULL;
@@ -98,25 +98,25 @@
index = strchr(str, delim);
if (!index)
{
- axis2_array_list_add(list, env, str);
- axis2_array_list_add(list, env, axis2_strdup(env, ""));
+ axutil_array_list_add(list, env, str);
+ axutil_array_list_add(list, env, axis2_strdup(env, ""));
return list;
}
rest = index + 1;
str[index - str] = '\0';
- axis2_array_list_add(list, env, str);
- axis2_array_list_add(list, env, rest);
+ axutil_array_list_add(list, env, str);
+ axutil_array_list_add(list, env, rest);
return list;
}
-AXIS2_EXTERN axis2_array_list_t * AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL
axis2_last_token(const axis2_env_t *env,
axis2_char_t *in,
int delim)
{
- axis2_array_list_t *list = NULL;
+ axutil_array_list_t *list = NULL;
axis2_char_t *str = NULL;
axis2_char_t *rest = NULL;
axis2_char_t *index = NULL;
@@ -127,7 +127,7 @@
return NULL;
}
- list = axis2_array_list_create(env, 2);
+ list = axutil_array_list_create(env, 2);
if (!list)
{
return NULL;
@@ -138,16 +138,16 @@
if (!index)
{
- axis2_array_list_add(list, env, axis2_strdup(env, ""));
- axis2_array_list_add(list, env, str);
+ axutil_array_list_add(list, env, axis2_strdup(env, ""));
+ axutil_array_list_add(list, env, str);
return list;
}
rest = index + 1;
str[index - str] = '\0';
- axis2_array_list_add(list, env, str);
- axis2_array_list_add(list, env, rest);
+ axutil_array_list_add(list, env, str);
+ axutil_array_list_add(list, env, rest);
return list;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org