You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 20:28:34 UTC
svn commit: r524225 [5/22] - 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/schema/writer/schema_c_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c Fri Mar 30 11:28:18 2007
@@ -111,12 +111,12 @@
const axutil_env_t *env,
axis2_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
axis2_bool_t is_element)
{
axis2_char_t *original_name = NULL;
axis2_char_t *class_name = NULL;
- axis2_hash_t *property_names = NULL;
+ axutil_hash_t *property_names = NULL;
axiom_node_t *model_source_node = NULL;
axis2_char_t *out = NULL;
axis2_char_t *source_template = NULL;
@@ -133,7 +133,7 @@
W2C_SCHEMA_WRITER_MAKE_FULLY_QUALIFIED_CLASS_NAME( &(writer_impl->writer), env, qname);
}
- property_names = axis2_hash_make( env);
+ property_names = axutil_hash_make( env);
if( writer_impl-> template_loaded)
{
@@ -168,7 +168,7 @@
namespace_uri = axis2_qname_get_uri( qname, env);
model_name = axis2_stracat(env, class_name, "|");
model_name = w2c_string_add_string( model_name, namespace_uri, env);
- axis2_hash_set( writer_impl-> model_map, model_name, AXIS2_HASH_KEY_STRING, model_source_node);
+ axutil_hash_set( writer_impl-> model_map, model_name, AXIS2_HASH_KEY_STRING, model_source_node);
}
AXIS2_FREE( env->allocator, original_name);
return class_name;
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c Fri Mar 30 11:28:18 2007
@@ -47,8 +47,8 @@
writer_impl-> template_name = NULL;
writer_impl-> global_wrapped_node = NULL;
- writer_impl-> model_map = axis2_hash_make(env);
- writer_impl-> names_list = axis2_hash_make(env);
+ writer_impl-> model_map = axutil_hash_make(env);
+ writer_impl-> names_list = axutil_hash_make(env);
writer_impl-> base_type_map = NULL;
@@ -58,8 +58,8 @@
- writer_impl->uri2prefix_map = axis2_hash_make(env);
- writer_impl->prefix2uri_map = axis2_hash_make(env);
+ writer_impl->uri2prefix_map = axutil_hash_make(env);
+ writer_impl->prefix2uri_map = axutil_hash_make(env);
writer_impl->last_prefix_index = 1;
@@ -134,15 +134,15 @@
if( writer_impl-> model_map)
{
- axis2_hash_free( writer_impl-> model_map, env);
+ axutil_hash_free( writer_impl-> model_map, env);
}
if( writer_impl-> names_list)
{
- axis2_hash_free( writer_impl-> names_list, env);
+ axutil_hash_free( writer_impl-> names_list, env);
}
if( writer_impl-> ns2packagename_map)
{
- axis2_hash_free( writer_impl-> ns2packagename_map, env);
+ axutil_hash_free( writer_impl-> ns2packagename_map, env);
}
writer_impl-> is_helper_mode = AXIS2_FALSE;
if( writer_impl-> mapping_class_package)
@@ -168,7 +168,7 @@
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_schema_writer_get_model_map( w2c_schema_writer_t *writer,
const axutil_env_t *env)
{
@@ -186,7 +186,7 @@
const axutil_env_t *env,
w2c_schema_compiler_options_t *options,
axis2_char_t* template_name,
- axis2_hash_t* base_type_map)
+ axutil_hash_t* base_type_map)
{
w2c_schema_writer_impl_t *writer_impl = NULL;
axis2_char_t *output = NULL;
@@ -260,7 +260,7 @@
w2c_schema_writer_write_element( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_element_t *element,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info)
{
axis2_qname_t *qname;
@@ -277,19 +277,19 @@
w2c_schema_writer_write_complex_type( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_complex_type_t *complex_type,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info)
{
axis2_qname_t *qname = NULL;
w2c_schema_writer_impl_t *writer_impl = NULL;
xml_schema_type_t *type = NULL;
- axis2_hash_t *base_hash = NULL;
+ axutil_hash_t *base_hash = NULL;
AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( complex_type, env);
- type = (xml_schema_type_t*)axis2_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
+ type = (xml_schema_type_t*)axutil_hash_get( base_hash, "XML_SCHEMA_TYPE", AXIS2_HASH_KEY_STRING);
qname = XML_SCHEMA_TYPE_GET_QNAME( type, env);
return W2C_SCHEMA_WRITER_PROCESS( writer_impl, env, qname, meta_info, typemap, AXIS2_FALSE);
@@ -340,7 +340,7 @@
w2c_schema_writer_write_simple_type( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_complex_type_t *type,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -360,7 +360,7 @@
}
writer_impl-> root_dir = root_dir;
- writer_impl-> names_list = axis2_hash_make(env);
+ writer_impl-> names_list = axutil_hash_make(env);
return AXIS2_SUCCESS;
}
@@ -445,7 +445,7 @@
if( writer_impl-> ns2packagename_map)
{
- base_package_name = (axis2_char_t*)axis2_hash_get( writer_impl-> ns2packagename_map, namespace_uri,
+ base_package_name = (axis2_char_t*)axutil_hash_get( writer_impl-> ns2packagename_map, namespace_uri,
AXIS2_HASH_KEY_STRING);
}
if ( ! base_package_name)
@@ -468,14 +468,14 @@
const axutil_env_t *env,
axis2_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
axis2_bool_t is_element)
{
axis2_char_t *fully_qualified_class_name = NULL;
int length = 0;
axis2_char_t *original_name = NULL;
axis2_char_t *class_name = NULL;
- axis2_hash_t *property_names = NULL;
+ axutil_hash_t *property_names = NULL;
axiom_node_t *model_source_node = NULL;
axis2_char_t *out = NULL;
axis2_char_t *model_name = NULL;
@@ -493,7 +493,7 @@
class_name = fully_qualified_class_name+length;
original_name = w2c_string_make_key_from_qname( qname, env);
- property_names = axis2_hash_make( env);
+ property_names = axutil_hash_make( env);
if( writer_impl-> template_loaded)
{
@@ -521,7 +521,7 @@
namespace_uri = axis2_qname_get_uri( qname, env);
model_name = axis2_stracat(env, class_name, "|");
model_name = w2c_string_add_string( model_name, namespace_uri, env);
- axis2_hash_set( writer_impl-> model_map, model_name, AXIS2_HASH_KEY_STRING, model_source_node);
+ axutil_hash_set( writer_impl-> model_map, model_name, AXIS2_HASH_KEY_STRING, model_source_node);
}
return fully_qualified_class_name;
}
@@ -541,8 +541,8 @@
axis2_qname_t *qname,
axis2_bool_t is_element,
w2c_schema_writer_meta_info_t *meta_info,
- axis2_hash_t *property_names,
- axis2_hash_t *typemap)
+ axutil_hash_t *property_names,
+ axutil_hash_t *typemap)
{
axis2_char_t *ns_uri = NULL;
axis2_char_t *prefix = NULL;
@@ -612,8 +612,8 @@
const axutil_env_t *env,
w2c_schema_writer_meta_info_t *meta_info,
axiom_node_t *model,
- axis2_hash_t *property_names,
- axis2_hash_t *typemap,
+ axutil_hash_t *property_names,
+ axutil_hash_t *typemap,
axis2_bool_t is_inherited)
{
w2c_schema_writer_meta_info_t *parent_meta_info = NULL;
@@ -634,8 +634,8 @@
const axutil_env_t *env,
w2c_schema_writer_meta_info_t *meta_info,
axiom_node_t *model,
- axis2_hash_t *property_names,
- axis2_hash_t *typemap,
+ axutil_hash_t *property_names,
+ axutil_hash_t *typemap,
axis2_bool_t is_inherited)
{
axutil_array_list_t *qnames = NULL;
@@ -741,7 +741,7 @@
if ( schema_qname != NULL)
{
qname_str = w2c_string_make_key_from_qname( schema_qname, env);
- schema_type = axis2_hash_get( typemap, qname_str, AXIS2_HASH_KEY_STRING);
+ schema_type = axutil_hash_get( typemap, qname_str, AXIS2_HASH_KEY_STRING);
}
if ( schema_type != NULL)
{
@@ -757,7 +757,7 @@
}
if( qname_str != NULL)
{
- schema_type = axis2_hash_get(writer_impl-> base_type_map , qname_str, AXIS2_HASH_KEY_STRING);
+ schema_type = axutil_hash_get(writer_impl-> base_type_map , qname_str, AXIS2_HASH_KEY_STRING);
}
if ( schema_qname != NULL && schema_type != NULL)
{
@@ -815,7 +815,7 @@
axis2_char_t*
w2c_schema_writer_make_unique_class_name( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_hash_t *list_of_names,
+ axutil_hash_t *list_of_names,
axis2_char_t *xml_name)
{
axis2_char_t *class_name = NULL;
@@ -824,7 +824,7 @@
static int count = 0;
class_name = axis2_strdup(env, xml_name);
- present = (int)axis2_hash_get( list_of_names, xml_name, AXIS2_HASH_KEY_STRING);
+ present = (int)axutil_hash_get( list_of_names, xml_name, AXIS2_HASH_KEY_STRING);
if ( present)
{
sprintf( count_str, "%d", count);
@@ -833,7 +833,7 @@
}
else
{
- axis2_hash_set( list_of_names, xml_name, AXIS2_HASH_KEY_STRING, (void*)1);
+ axutil_hash_set( list_of_names, xml_name, AXIS2_HASH_KEY_STRING, (void*)1);
}
return class_name;
}
@@ -905,7 +905,7 @@
{
return NULL;
}
- prefix = axis2_hash_get( writer_impl-> uri2prefix_map, uri, AXIS2_HASH_KEY_STRING);
+ prefix = axutil_hash_get( writer_impl-> uri2prefix_map, uri, AXIS2_HASH_KEY_STRING);
if( prefix == NULL)
{
if ( default_prefix == NULL || 0 == axis2_strlen( default_prefix) )
@@ -917,8 +917,8 @@
{
prefix = axis2_strdup(env, default_prefix);
}
- axis2_hash_set(writer_impl-> prefix2uri_map, prefix, AXIS2_HASH_KEY_STRING, uri);
- axis2_hash_set(writer_impl-> uri2prefix_map, uri, AXIS2_HASH_KEY_STRING, prefix);
+ axutil_hash_set(writer_impl-> prefix2uri_map, prefix, AXIS2_HASH_KEY_STRING, uri);
+ axutil_hash_set(writer_impl-> uri2prefix_map, uri, AXIS2_HASH_KEY_STRING, prefix);
}
else
{
@@ -942,7 +942,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_write_extension_mapper( w2c_schema_writer_t *writer,
const axutil_env_t *env,
- axis2_hash_t *meta_info_array)
+ axutil_hash_t *meta_info_array)
{
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer_protected.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer_protected.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer_protected.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer_protected.h Fri Mar 30 11:28:18 2007
@@ -45,24 +45,24 @@
axis2_char_t *template_name;
axis2_bool_t template_loaded;
- axis2_hash_t *names_list;
+ axutil_hash_t *names_list;
axis2_bool_t wrap_classes;
axis2_bool_t write_classes;
axis2_char_t *package_name;
axis2_char_t *root_dir;
axiom_node_t *global_wrapped_node;
- axis2_hash_t *model_map;
+ axutil_hash_t *model_map;
- axis2_hash_t *base_type_map;
- axis2_hash_t *ns2packagename_map;
+ axutil_hash_t *base_type_map;
+ axutil_hash_t *ns2packagename_map;
axis2_bool_t is_helper_mode;
/**
* package for the mapping class
*/
axis2_char_t *mapping_class_package;
- axis2_hash_t *uri2prefix_map;
- axis2_hash_t *prefix2uri_map;
+ axutil_hash_t *uri2prefix_map;
+ axutil_hash_t *prefix2uri_map;
int last_prefix_index;
w2c_schema_compiler_options_t *options;
@@ -79,7 +79,7 @@
const axutil_env_t *env,
axis2_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
axis2_bool_t is_element);
axis2_char_t*
(*create_out_file)( w2c_schema_writer_impl_t *writer_impl,
@@ -118,7 +118,7 @@
w2c_schema_writer_free (w2c_schema_writer_t *schema_writer,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_schema_writer_get_model_map( w2c_schema_writer_t *writer,
const axutil_env_t *env);
@@ -127,20 +127,20 @@
const axutil_env_t *env,
w2c_schema_compiler_options_t *options,
axis2_char_t *template_name,
- axis2_hash_t *base_type_map);
+ axutil_hash_t *base_type_map);
axis2_char_t* AXIS2_CALL
w2c_schema_writer_write_element( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_element_t *element,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info);
axis2_char_t* AXIS2_CALL
w2c_schema_writer_write_complex_type( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_complex_type_t *type,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info);
axis2_status_t AXIS2_CALL
@@ -151,7 +151,7 @@
w2c_schema_writer_write_simple_type( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_complex_type_t *type,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info);
axis2_char_t* AXIS2_CALL
@@ -167,7 +167,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_write_extension_mapper( w2c_schema_writer_t *writer,
const axutil_env_t *env,
- axis2_hash_t *meta_info_array);
+ axutil_hash_t *meta_info_array);
axis2_char_t* AXIS2_CALL
@@ -192,7 +192,7 @@
const axutil_env_t *env,
axis2_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
axis2_bool_t is_element);
axiom_node_t*
@@ -203,16 +203,16 @@
axis2_qname_t *qname,
axis2_bool_t is_element,
w2c_schema_writer_meta_info_t *meta_info,
- axis2_hash_t *property_names,
- axis2_hash_t *typemap);
+ axutil_hash_t *property_names,
+ axutil_hash_t *typemap);
axis2_status_t
w2c_schema_writer_populate_info( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
w2c_schema_writer_meta_info_t *meta_info,
axiom_node_t *model,
- axis2_hash_t *property_names,
- axis2_hash_t *typemap,
+ axutil_hash_t *property_names,
+ axutil_hash_t *typemap,
axis2_bool_t is_inherited);
axis2_status_t
@@ -220,8 +220,8 @@
const axutil_env_t *env,
w2c_schema_writer_meta_info_t *meta_info,
axiom_node_t *model,
- axis2_hash_t *property_names,
- axis2_hash_t *typemap,
+ axutil_hash_t *property_names,
+ axutil_hash_t *typemap,
axis2_bool_t is_inherited);
axis2_bool_t
@@ -233,7 +233,7 @@
axis2_char_t*
w2c_schema_writer_make_unique_class_name( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_hash_t *list_of_names,
+ axutil_hash_t *list_of_names,
axis2_char_t *xml_name);
axis2_status_t
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c Fri Mar 30 11:28:18 2007
@@ -29,7 +29,7 @@
{
w2c_cmdline_option_parser_t cmdline_option_parser;
- axis2_hash_t *hash;
+ axutil_hash_t *hash;
} w2c_cmdline_option_parser_impl_t;
@@ -44,7 +44,7 @@
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_cmdline_option_parser_get_options (
w2c_cmdline_option_parser_t *cmdline_option_parser,
const axutil_env_t *env);
@@ -112,7 +112,7 @@
const axutil_env_t *env)
{
w2c_cmdline_option_parser_impl_t *cmdline_option_parser_impl = NULL;
- axis2_hash_index_t *hi;
+ axutil_hash_index_t *hi;
w2c_cmdline_option_t *option = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -127,13 +127,13 @@
if (cmdline_option_parser_impl-> hash)
{
- for (hi = axis2_hash_first(cmdline_option_parser_impl->hash, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(cmdline_option_parser_impl->hash, env); hi;
+ hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, NULL, NULL, (void*)&option);
+ axutil_hash_this(hi, NULL, NULL, (void*)&option);
W2C_CMDLINE_OPTION_FREE ( option, env );
}
- axis2_hash_free ( cmdline_option_parser_impl-> hash, env );
+ axutil_hash_free ( cmdline_option_parser_impl-> hash, env );
}
if(cmdline_option_parser_impl)
@@ -145,7 +145,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_cmdline_option_parser_get_options (
w2c_cmdline_option_parser_t *cmdline_option_parser,
const axutil_env_t *env)
@@ -165,7 +165,7 @@
{
w2c_cmdline_option_parser_impl_t *cmdline_option_parser_impl = NULL;
axutil_array_list_t *invalid_arr = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
w2c_cmdline_option_t *option = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -174,10 +174,10 @@
invalid_arr = axutil_array_list_create ( env, 1 );
- for (hi = axis2_hash_first(cmdline_option_parser_impl->hash, env); hi;
- hi = axis2_hash_next( env, hi))
+ for (hi = axutil_hash_first(cmdline_option_parser_impl->hash, env); hi;
+ hi = axutil_hash_next( env, hi))
{
- axis2_hash_this(hi, NULL, NULL, (void*)&option);
+ axutil_hash_this(hi, NULL, NULL, (void*)&option);
if (w2c_cmdline_option_validator_isinvalid ( env,option ) )
{
axutil_array_list_add ( invalid_arr, env, option );
@@ -194,12 +194,12 @@
{
int i = 0;
w2c_cmdline_option_t *option = NULL;
- axis2_hash_t *hash;
+ axutil_hash_t *hash;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
axutil_array_list_t *values_arr= NULL;
- hash = axis2_hash_make ( env );
+ hash = axutil_hash_make ( env );
parser->hash = hash;
while ( i < argc )
{
@@ -217,7 +217,7 @@
option = (w2c_cmdline_option_t*)
w2c_cmdline_option_create_with_values( env, key, values_arr );
key = W2C_CMDLINE_OPTION_GET_TYPE ( option, env );
- axis2_hash_set ( hash, key, AXIS2_HASH_KEY_STRING, option );
+ axutil_hash_set ( hash, key, AXIS2_HASH_KEY_STRING, option );
}
return;
}
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -20,7 +20,7 @@
#include <axutil_array_list.h>
#include <axis2_string.h>
#include <w2c_string.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <stdlib.h>
#define W2C_CONFIG_PROPERTY_LOADER_CODE_GEN_KEY_PREFIX "codegen.extension"
@@ -69,11 +69,11 @@
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;
+ axutil_hash_t *language_emitter_map;
axis2_char_t *default_language;
- axis2_hash_t *language_specific_properties_map;
+ axutil_hash_t *language_specific_properties_map;
axutil_array_list_t *databinding_framework_names;
- axis2_hash_t *databinding_framework_name_to_extension_map;
+ axutil_hash_t *databinding_framework_name_to_extension_map;
axis2_char_t *default_db_framework_name;
w2c_properties_t *prop_set;
@@ -132,7 +132,7 @@
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_config_property_loader_get_language_emitter_map (
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
@@ -142,7 +142,7 @@
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_config_property_loader_get_language_specific_properties_map (
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
@@ -152,7 +152,7 @@
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_config_property_loader_get_databinding_framework_name_to_extension_map (
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
@@ -182,7 +182,7 @@
static axis2_status_t
w2c_config_property_loader_free_hash(
- axis2_hash_t *original,
+ axutil_hash_t *original,
const axutil_env_t *env);
/************************** End of function prototypes ************************/
@@ -341,7 +341,7 @@
if (config_property_loader_impl-> language_specific_properties_map)
{
/* all the elemenets here will be freed by some other */
- axis2_hash_free (
+ axutil_hash_free (
config_property_loader_impl-> language_specific_properties_map, env);
}
@@ -526,7 +526,7 @@
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_config_property_loader_get_language_emitter_map (
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env)
@@ -556,7 +556,7 @@
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_config_property_loader_get_language_specific_properties_map (
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env)
@@ -586,7 +586,7 @@
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_config_property_loader_get_databinding_framework_name_to_extension_map (
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env)
@@ -620,10 +620,10 @@
w2c_config_property_loader_impl_t *obj_impl,
const axutil_env_t *env)
{
- axis2_hash_t* prop_hash = NULL;
- axis2_hash_t* temp_hash = NULL;
- axis2_hash_t* lang_spec_hash = NULL;
- axis2_hash_index_t* hi = NULL;
+ axutil_hash_t* prop_hash = NULL;
+ axutil_hash_t* temp_hash = NULL;
+ axutil_hash_t* lang_spec_hash = NULL;
+ axutil_hash_index_t* hi = NULL;
axutil_array_list_t* prop = NULL;
axutil_array_list_t* temp_array = NULL;
axis2_char_t* temp_buff = NULL;
@@ -639,7 +639,7 @@
*/
/*load the extension class names*/
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_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 = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_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 = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_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 = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_EXTENSION_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -687,11 +687,11 @@
return;
}
- temp_hash = axis2_hash_make ( env );
+ temp_hash = axutil_hash_make ( env );
obj_impl ->databinding_framework_name_to_extension_map = temp_hash;
for (i = 0 ; i < size ;i++ )
{
- axis2_hash_set ( temp_hash,
+ axutil_hash_set ( temp_hash,
axis2_strdup(env, axutil_array_list_get(obj_impl ->databinding_framework_names, env, i )),
AXIS2_HASH_KEY_STRING,
axis2_strdup(env, axutil_array_list_get(temp_array, env, i )));
@@ -699,7 +699,7 @@
}
/*load the default framework name */
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_DEFAULT_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -709,7 +709,7 @@
}
/* load the third party schema names */
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_THIRD_PARTY_SCHEMA_KEY_PREFIX,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -719,7 +719,7 @@
}
/* the db supporter template name */
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEMPLATE_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -733,7 +733,7 @@
* 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 = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEST_OBJECT_TEMPLATE_NAME_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -744,7 +744,7 @@
/* load the language types */
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_LANGUAGE_TYPE_KEY_PREFIX,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -754,7 +754,7 @@
}
/* load the language emitter map */
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_EMITTER_CLASS_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -770,13 +770,13 @@
return;
}
- temp_hash = axis2_hash_make ( env );
+ temp_hash = axutil_hash_make ( env );
obj_impl ->language_emitter_map = temp_hash;
for (i = 0 ; i< size ; 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,
+ axutil_hash_set ( temp_hash,
axis2_strdup(env, key),
AXIS2_HASH_KEY_STRING,
axis2_strdup(env, val));
@@ -784,7 +784,7 @@
}
/* load the default language */
- prop = (axutil_array_list_t*)axis2_hash_get ( prop_hash,
+ prop = (axutil_array_list_t*)axutil_hash_get ( prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DEFAULT_LANGUAGE_TYPE_KEY,
AXIS2_HASH_KEY_STRING );
if ( prop != NULL)
@@ -799,25 +799,25 @@
*/
if ( obj_impl->language_types)
{
- temp_hash = axis2_hash_make ( env );
+ temp_hash = axutil_hash_make ( env );
obj_impl->language_specific_properties_map = temp_hash;
size= axutil_array_list_size (obj_impl->language_types , env);
for (i = 0 ; i< size ; 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))
+ lang_spec_hash = axutil_hash_make ( env );
+ for (hi = axutil_hash_first(prop_hash, env); hi;
+ hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&prop);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&prop);
if ( w2c_string_indexof_cs ( key, temp_buff ) == 0 &&
w2c_string_indexof ( key, '.') == strlen (temp_buff ))
{
prop = w2c_config_property_loader_dup_array( prop, env );
- axis2_hash_set ( lang_spec_hash, key, AXIS2_HASH_KEY_STRING, prop );
+ axutil_hash_set ( lang_spec_hash, key, AXIS2_HASH_KEY_STRING, prop );
}
}
- axis2_hash_set (temp_hash, temp_buff, AXIS2_HASH_KEY_STRING, lang_spec_hash );
+ axutil_hash_set (temp_hash, temp_buff, AXIS2_HASH_KEY_STRING, lang_spec_hash );
}
}
}
@@ -868,17 +868,17 @@
/** this frees (axis2_char_t, axis2_char_t) */
static axis2_status_t
w2c_config_property_loader_free_hash(
- axis2_hash_t *h,
+ axutil_hash_t *h,
const axutil_env_t *env)
{
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
- for (hi = axis2_hash_first( h, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( h, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key )
{
AXIS2_FREE( env-> allocator, key);
@@ -888,7 +888,7 @@
AXIS2_FREE(env-> allocator, value);
}
}
- axis2_hash_free( h, env);
+ axutil_hash_free( h, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/messages.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/messages.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/messages.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/messages.c Fri Mar 30 11:28:18 2007
@@ -17,7 +17,7 @@
#include <w2c_messages.h>
#include <axis2_property.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_string.h>
#include <platforms/axis2_platform_auto_sense.h>
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/properties.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/properties.c Fri Mar 30 11:28:18 2007
@@ -28,7 +28,7 @@
{
w2c_properties_t properties;
- axis2_hash_t *prop_hash;
+ axutil_hash_t *prop_hash;
} w2c_properties_impl_t;
@@ -41,7 +41,7 @@
w2c_properties_free (w2c_properties_t *properties,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_properties_get_hash(w2c_properties_t *properties,
const axutil_env_t *env);
@@ -59,10 +59,10 @@
axis2_properties_t *main_props = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_char_t *p = NULL;
axis2_char_t *tag = NULL;
- axis2_hash_t *tmp_hash = NULL;
+ axutil_hash_t *tmp_hash = NULL;
axutil_array_list_t *arr_list = NULL;
int i = 0;
@@ -85,7 +85,7 @@
tmp_hash = axis2_properties_get_all( main_props, env);
- properties_impl-> prop_hash = axis2_hash_make (env);
+ properties_impl-> prop_hash = axutil_hash_make (env);
if(! properties_impl-> prop_hash)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -94,10 +94,10 @@
if(tmp_hash)
{
- for (hi = axis2_hash_first( tmp_hash, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( tmp_hash, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key && value)
{
i = 0;
@@ -119,7 +119,7 @@
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);
+ axutil_hash_set( properties_impl-> prop_hash, key, AXIS2_HASH_KEY_STRING, arr_list);
}
}
}
@@ -154,7 +154,7 @@
axis2_char_t *key = NULL;
int i = 0;
int size = 0;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -162,10 +162,10 @@
if(properties_impl-> prop_hash)
{
- for (hi = axis2_hash_first( properties_impl-> prop_hash, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( properties_impl-> prop_hash, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&values_arr);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&values_arr);
if (key && values_arr)
{
size = axutil_array_list_size( values_arr, env);
@@ -181,7 +181,7 @@
AXIS2_FREE(env-> allocator, key);
}
}
- axis2_hash_free( properties_impl-> prop_hash, env);
+ axutil_hash_free( properties_impl-> prop_hash, env);
}
if(properties->ops)
@@ -198,7 +198,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_properties_get_hash(w2c_properties_t *properties,
const axutil_env_t *env)
{
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Fri Mar 30 11:28:18 2007
@@ -40,12 +40,12 @@
w2c_typemapper_t typemapper;
axis2_char_t *mapper_name;
- axis2_hash_t *qname2name;
+ axutil_hash_t *qname2name;
axis2_char_t *default_type;
axis2_qname_t *default_qname;
- axis2_hash_t *primitive_map;
+ axutil_hash_t *primitive_map;
- axis2_hash_t *qname2prefix;
+ axutil_hash_t *qname2prefix;
} w2c_typemapper_impl_t;
@@ -83,7 +83,7 @@
w2c_typemapper_get_default_qname(w2c_typemapper_t *typemapper,
const axutil_env_t *env);
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_typemapper_get_all(w2c_typemapper_t *typemapper,
const axutil_env_t *env);
@@ -186,9 +186,9 @@
om_doc = axiom_document_create(env, NULL, om_builder);
axiom_document_build_all(om_doc, env);
- typemapper_impl-> qname2name = axis2_hash_make ( env);
- typemapper_impl-> qname2prefix = axis2_hash_make ( env);
- typemapper_impl-> primitive_map = axis2_hash_make ( env);
+ typemapper_impl-> qname2name = axutil_hash_make ( env);
+ typemapper_impl-> qname2prefix = axutil_hash_make ( env);
+ typemapper_impl-> primitive_map = axutil_hash_make ( env);
root = axiom_document_get_root_element(om_doc, env);
root_ele = AXIOM_NODE_GET_DATA_ELEMENT(root, env);
typemapper_impl-> mapper_name =
@@ -253,13 +253,13 @@
axis2_qname_create( env, local_name, uri, prefix);
typemapper_impl-> default_type = axis2_strdup(env, type_val);
}
- axis2_hash_set( typemapper_impl-> qname2name, qname2str,
+ axutil_hash_set( typemapper_impl-> qname2name, qname2str,
AXIS2_HASH_KEY_STRING, type_val );
qname2str = axis2_strdup(env, qname2str);
- axis2_hash_set( typemapper_impl-> qname2prefix, qname2str,
+ axutil_hash_set( typemapper_impl-> qname2prefix, qname2str,
AXIS2_HASH_KEY_STRING, prefix );
qname2str = axis2_strdup(env, qname2str);
- axis2_hash_set( typemapper_impl-> primitive_map, qname2str,
+ axutil_hash_set( typemapper_impl-> primitive_map, qname2str,
AXIS2_HASH_KEY_STRING, (void*)1);
}
@@ -278,8 +278,8 @@
w2c_typemapper_impl_t *typemapper_impl = NULL;
axis2_char_t *key = NULL;
- axis2_hash_index_t *hi = NULL;
- axis2_hash_t *h = NULL;
+ axutil_hash_index_t *hi = NULL;
+ axutil_hash_t *h = NULL;
axis2_char_t *value = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -287,39 +287,39 @@
typemapper_impl = W2C_INTF_TO_IMPL(typemapper);
h = typemapper_impl-> qname2name;
- for (hi = axis2_hash_first(h, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(h, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (value)
{
AXIS2_FREE ( env-> allocator, value);
}
if (key) AXIS2_FREE ( env-> allocator, key);
}
- axis2_hash_free( h , env);
+ axutil_hash_free( h , env);
h = typemapper_impl-> qname2prefix;
- for (hi = axis2_hash_first(h, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(h, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (value)
{
AXIS2_FREE ( env-> allocator, value);
}
if (key) AXIS2_FREE ( env-> allocator, key);
}
- axis2_hash_free( h , env);
+ axutil_hash_free( h , env);
h = typemapper_impl-> primitive_map;
- for (hi = axis2_hash_first(h, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(h, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key) AXIS2_FREE ( env-> allocator, key);
}
- axis2_hash_free( h , env);
+ axutil_hash_free( h , env);
if (typemapper_impl-> mapper_name)
{
@@ -383,7 +383,7 @@
axis2_char_t *str = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value =NULL;
- axis2_hash_t *h = NULL;
+ axutil_hash_t *h = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -401,7 +401,7 @@
{
key++;
}
- value = axis2_hash_get( h, key, AXIS2_HASH_KEY_STRING );
+ value = axutil_hash_get( h, key, AXIS2_HASH_KEY_STRING );
AXIS2_FREE( env-> allocator, str);
return value;
}
@@ -426,12 +426,12 @@
key = axis2_strdup(env, key);
name = axis2_strdup(env, name);
- axis2_hash_set( typemapper_impl-> qname2name, key,
+ axutil_hash_set( typemapper_impl-> qname2name, key,
AXIS2_HASH_KEY_STRING, name);
if ( prefix && axis2_strlen( prefix) > 0 )
{
key = axis2_strdup(env, key);
- axis2_hash_set( typemapper_impl-> qname2prefix , key,
+ axutil_hash_set( typemapper_impl-> qname2prefix , key,
AXIS2_HASH_KEY_STRING, prefix);
}
return AXIS2_SUCCESS;
@@ -464,7 +464,7 @@
return typemapper_impl-> default_qname;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_typemapper_get_all(w2c_typemapper_t *typemapper,
const axutil_env_t *env)
{
@@ -490,6 +490,6 @@
typemapper_impl = W2C_INTF_TO_IMPL(typemapper);
key = w2c_string_make_key_from_qname(qname, env);
- return (axis2_bool_t)axis2_hash_get( typemapper_impl-> primitive_map,
+ return (axis2_bool_t)axutil_hash_get( typemapper_impl-> primitive_map,
key, AXIS2_HASH_KEY_STRING );
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c Fri Mar 30 11:28:18 2007
@@ -100,8 +100,8 @@
axis2_qname_t *qname = NULL;
axis2_char_t *text = NULL;
- axis2_hash_t *attr_ht = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *attr_ht = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
axiom_attribute_t *om_attri = NULL;
@@ -133,10 +133,10 @@
attr_ht = axiom_element_get_all_attributes(from_ele, env);
if(NULL != attr_ht)
{
- for( hi = axis2_hash_first(attr_ht, env); hi;
- hi = axis2_hash_next(env, hi))
+ for( hi = axutil_hash_first(attr_ht, env); hi;
+ hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
if(NULL != val)
{
om_attri = (axiom_attribute_t *)val;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c Fri Mar 30 11:28:18 2007
@@ -132,12 +132,12 @@
w2c_config_property_loader_t *loader)
{
w2c_typemapper_t *typemapper = NULL;
- axis2_hash_t *types = NULL;
+ axutil_hash_t *types = NULL;
axis2_char_t *key = NULL;
axis2_qname_t *qname = NULL;
axis2_char_t *filename = NULL;
axis2_char_t *classname = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_char_t *source = NULL;
axis2_char_t *header = NULL;
axis2_char_t *root = NULL;
@@ -147,10 +147,10 @@
typemapper = W2C_ENGINE_CONFIGURATION_GET_TYPEMAPPER( config, env);
types = W2C_TYPEMAPPER_GET_ALL( typemapper, env);
- for (hi = axis2_hash_first( types, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first( types, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&classname);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&classname);
qname = axis2_qname_create_from_string( env, key);
if ( !W2C_TYPEMAPPER_IS_PRIMITIVE( typemapper, env, qname) )
{
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Fri Mar 30 11:28:18 2007
@@ -17,7 +17,7 @@
#include <w2c_engine.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <w2c_cmdline_option.h>
@@ -75,7 +75,7 @@
w2c_cmdline_option_parser_t *parser)
{
w2c_engine_impl_t *engine_impl = NULL;
- axis2_hash_t *all_options = NULL;
+ axutil_hash_t *all_options = NULL;
axis2_char_t *wsdl_uri = NULL;
axis2_char_t *base_uri = NULL;
w2c_cmdline_option_t *option = NULL;
@@ -115,7 +115,7 @@
engine_impl-> conf =
w2c_engine_configuration_create_with_options ( env, all_options );
- option = axis2_hash_get(all_options,
+ option = axutil_hash_get(all_options,
W2C_CMDLINE_OPTION_CONSTS_WSDL_LOCATION_URI,
AXIS2_HASH_KEY_STRING );
@@ -201,7 +201,7 @@
int i = 0;
w2c_extension_t *ext = NULL;
w2c_emitter_t *emitter = NULL;
- axis2_hash_t *emitter_map = NULL;
+ axutil_hash_t *emitter_map = NULL;
axis2_char_t *emit_name = NULL;
axis2_char_t *output_lang = NULL;
axis2_bool_t all_flag = AXIS2_FALSE;
@@ -227,7 +227,7 @@
( engine_impl-> prop_loader, env );
output_lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE
( engine_impl-> conf, env );
- emit_name = (axis2_char_t*)axis2_hash_get ( emitter_map,
+ emit_name = (axis2_char_t*)axutil_hash_get ( emitter_map,
output_lang, AXIS2_HASH_KEY_STRING);
/* the place where emitter is loading */
emitter = w2c_class_loader_get_object_from_class_name
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -17,7 +17,7 @@
#include <w2c_engine_config_loader.h>
#include <w2c_cmdline_option_consts.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axutil_array_list.h>
#include <w2c_cmdline_option.h>
#include <w2c_messages.h>
@@ -30,15 +30,15 @@
static w2c_cmdline_option_t*
w2c_engine_config_loader_load_option(const axutil_env_t *env,
axis2_char_t *short_opt,axis2_char_t *long_opt,
- axis2_hash_t *options);
+ axutil_hash_t *options);
static void
-w2c_engine_config_loader_free_hash(const axutil_env_t *env, axis2_hash_t *h );
+w2c_engine_config_loader_free_hash(const axutil_env_t *env, axutil_hash_t *h );
AXIS2_EXTERN axis2_status_t AXIS2_CALL
w2c_engine_config_loader_load_config(
const axutil_env_t *env,
w2c_engine_configuration_t *conf,
- axis2_hash_t *option_map )
+ axutil_hash_t *option_map )
{
w2c_cmdline_option_t *option = NULL;
axis2_char_t *tmp_string= NULL;
@@ -49,8 +49,8 @@
axis2_char_t *cp = NULL;
int loop_state = 0;
axis2_char_t *tmp_key = NULL;
- axis2_hash_t *h = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *h = NULL;
+ axutil_hash_index_t *hi = NULL;
axutil_array_list_t *tmp_array = NULL;
w2c_properties_t *props = NULL;
int len = 0;
@@ -269,7 +269,7 @@
tmp_string = W2C_CMDLINE_OPTION_GET_VALUE ( option, env );
if (tmp_string)
{
- h = axis2_hash_make (env );
+ h = axutil_hash_make (env );
loop_state = -1; /* 1 - started, 1 - '=' found 2- end*/
for ( cp = tmp_string; loop_state !=2 ; cp ++ )
{
@@ -320,13 +320,13 @@
else
loop_state = 0;
*cp = '\0';
- axis2_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING,
+ axutil_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING,
axis2_strdup (env, tag) );
}
}
if (loop_state == -1)
{
- axis2_hash_free (h ,env); /*clear created hash*/
+ axutil_hash_free (h ,env); /*clear created hash*/
/* asumes option value is a filename */
props = w2c_properties_create( env, tmp_string, '\0');
h = W2C_PROPERTIES_GET_HASH( props, env);
@@ -337,13 +337,13 @@
else
{
/* replace arraylist in each with string */
- for (hi = axis2_hash_first(h , env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(h , env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&tmp_key, NULL, (void*)&tmp_string);
+ axutil_hash_this(hi, (void*)&tmp_key, NULL, (void*)&tmp_string);
tmp_key = axis2_strdup(env, tmp_key);
tmp_string = axis2_strdup (env, tmp_string);
- axis2_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string);
+ axutil_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string);
}
}
W2C_PROPERTIES_FREE( props, env);
@@ -354,10 +354,10 @@
/* catch extra parameters */
h = NULL;
- for (hi = axis2_hash_first(option_map , env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(option_map , env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&tmp_key,
+ axutil_hash_this(hi, (void*)&tmp_key,
NULL, (void*)&tmp_array);
if ( w2c_string_indexof_cs
( tmp_key, W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX)== 0 && tmp_array)
@@ -365,11 +365,11 @@
tmp_string = (char*)axutil_array_list_get (tmp_array, env, 0 );
if ( h == NULL )
{
- h = axis2_hash_make ( env );
+ h = axutil_hash_make ( env );
}
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 );
+ axutil_hash_set( h, tmp_key, AXIS2_HASH_KEY_STRING, tmp_string );
axutil_array_list_free ( tmp_array, env);
}
}
@@ -381,12 +381,12 @@
static w2c_cmdline_option_t*
w2c_engine_config_loader_load_option(const axutil_env_t *env,
axis2_char_t *short_opt,axis2_char_t *long_opt,
- axis2_hash_t *options_map)
+ axutil_hash_t *options_map)
{
w2c_cmdline_option_t *option = NULL;
if (long_opt != NULL)
{
- option = (w2c_cmdline_option_t*)axis2_hash_get(options_map,
+ option = (w2c_cmdline_option_t*)axutil_hash_get(options_map,
long_opt, AXIS2_HASH_KEY_STRING);
if (option != NULL)
{
@@ -396,7 +396,7 @@
/* short option gets last precedence */
if (short_opt != NULL)
{
- option = (w2c_cmdline_option_t*)axis2_hash_get(options_map,
+ option = (w2c_cmdline_option_t*)axutil_hash_get(options_map,
short_opt, AXIS2_HASH_KEY_STRING);
}
@@ -404,17 +404,17 @@
}
static void
-w2c_engine_config_loader_free_hash(const axutil_env_t *env, axis2_hash_t *h )
+w2c_engine_config_loader_free_hash(const axutil_env_t *env, axutil_hash_t *h )
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value =NULL;
- for (hi = axis2_hash_first(h, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(h, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if ( value )AXIS2_FREE ( env-> allocator, value );
if ( key )AXIS2_FREE ( env-> allocator, key);
}
- axis2_hash_free ( h , env);
+ axutil_hash_free ( h , env);
}
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -18,7 +18,7 @@
#include <w2c_engine_configuration.h>
#include <w2c_engine_config_loader.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_string.h>
#include <w2c_string.h>
#include <w2c_qname2name_maker.h>
@@ -37,7 +37,7 @@
axis2_char_t *repository_path;
/** Mapping file including the qname to type map */
axis2_char_t *type_mapping_file;
- axis2_hash_t *uri2packagemap;
+ axutil_hash_t *uri2packagemap;
axis2_bool_t params_wrapped;
axis2_char_t *output_location;
@@ -74,13 +74,13 @@
/**
* A hashmap to hang the property objects
*/
- axis2_hash_t *policy_map;
+ axutil_hash_t *policy_map;
/*
* A hashmap of properties that may be populated on the way. extensions can populate it
* This can be used to keep non specific information
*/
- axis2_hash_t *configuration_properties;
+ axutil_hash_t *configuration_properties;
axis2_char_t *wsdl_version;
axis2_bool_t flatten_files;
@@ -126,7 +126,7 @@
w2c_engine_configuration_t * engine_configuration,
const axutil_env_t* env );
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_engine_configuration_get_uri2packagemap (
w2c_engine_configuration_t * engine_configuration,
const axutil_env_t* env );
@@ -216,12 +216,12 @@
w2c_engine_configuration_t * engine_configuration,
const axutil_env_t* env );
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_engine_configuration_get_policy_map (
w2c_engine_configuration_t * engine_configuration,
const axutil_env_t* env );
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_engine_configuration_get_configuration_properties (
w2c_engine_configuration_t * engine_configuration,
const axutil_env_t* env );
@@ -293,7 +293,7 @@
w2c_engine_configuration_set_uri2packagemap (
w2c_engine_configuration_t* engine_configuration,
const axutil_env_t* env,
- axis2_hash_t* uri2packagemap );
+ axutil_hash_t* uri2packagemap );
axis2_status_t AXIS2_CALL
w2c_engine_configuration_set_params_wrapped (
@@ -401,13 +401,13 @@
w2c_engine_configuration_set_policy_map (
w2c_engine_configuration_t* engine_configuration,
const axutil_env_t* env,
- axis2_hash_t* policy_map );
+ axutil_hash_t* policy_map );
axis2_status_t AXIS2_CALL
w2c_engine_configuration_set_configuration_properties (
w2c_engine_configuration_t* engine_configuration,
const axutil_env_t* env,
- axis2_hash_t* configuration_properties );
+ axutil_hash_t* configuration_properties );
axis2_status_t AXIS2_CALL
w2c_engine_configuration_set_wsdl_version(
@@ -661,7 +661,7 @@
AXIS2_EXTERN w2c_engine_configuration_t * AXIS2_CALL
w2c_engine_configuration_create_with_options (const axutil_env_t *env,
- axis2_hash_t* options)
+ axutil_hash_t* options)
{
w2c_engine_configuration_impl_t *engine_configuration_impl = NULL;
@@ -738,8 +738,8 @@
W2C_TYPEMAPPER_FREE ( engine_configuration_impl->typemapper, env );
}
- axis2_hash_free (engine_configuration_impl->uri2packagemap, env );
- axis2_hash_free (engine_configuration_impl->policy_map, env );
+ axutil_hash_free (engine_configuration_impl->uri2packagemap, env );
+ axutil_hash_free (engine_configuration_impl->policy_map, env );
if(engine_configuration->ops)
@@ -812,7 +812,7 @@
return engine_configuration_impl-> type_mapping_file;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_engine_configuration_get_uri2packagemap (
w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env )
@@ -1064,7 +1064,7 @@
return engine_configuration_impl-> serverside_interface;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_engine_configuration_get_policy_map (
w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env )
@@ -1078,7 +1078,7 @@
return engine_configuration_impl-> policy_map;
}
-axis2_hash_t* AXIS2_CALL
+axutil_hash_t* AXIS2_CALL
w2c_engine_configuration_get_configuration_properties (
w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env )
@@ -1260,7 +1260,7 @@
w2c_engine_configuration_set_uri2packagemap (
w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env,
- axis2_hash_t *uri2packagemap )
+ axutil_hash_t *uri2packagemap )
{
w2c_engine_configuration_impl_t *engine_configuration_impl = NULL;
@@ -1548,7 +1548,7 @@
w2c_engine_configuration_set_policy_map (
w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env,
- axis2_hash_t *policy_map )
+ axutil_hash_t *policy_map )
{
w2c_engine_configuration_impl_t *engine_configuration_impl = NULL;
@@ -1564,7 +1564,7 @@
w2c_engine_configuration_set_configuration_properties (
w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env,
- axis2_hash_t *configuration_properties )
+ axutil_hash_t *configuration_properties )
{
w2c_engine_configuration_impl_t *engine_configuration_impl = NULL;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c Fri Mar 30 11:28:18 2007
@@ -25,8 +25,8 @@
w2c_extension_t extension;
w2c_qname2name_maker_t qname2name_maker;
- axis2_hash_t *qname2name;
- axis2_hash_t *name2number;
+ axutil_hash_t *qname2name;
+ axutil_hash_t *name2number;
} w2c_c_qname2name_ext_impl_t;
@@ -52,8 +52,8 @@
w2c_c_qname2name_ext_impl_t *impl = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value =NULL;
- axis2_hash_index_t *hi = NULL;
- axis2_hash_t *h = NULL;
+ axutil_hash_index_t *hi = NULL;
+ axutil_hash_t *h = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -61,18 +61,18 @@
h = impl-> qname2name;
- for (hi = axis2_hash_first(h, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(h, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key)
AXIS2_FREE( env-> allocator, key);
if (value)
AXIS2_FREE( env-> allocator, value);
}
- axis2_hash_free( h , env);
+ axutil_hash_free( h , env);
- axis2_hash_free( impl-> name2number, env);
+ axutil_hash_free( impl-> name2number, env);
if(extension->ops)
{
@@ -136,7 +136,7 @@
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
key = axis2_qname_to_string(qname, env);
- local = (axis2_char_t*)axis2_hash_get( impl-> qname2name, key,
+ local = (axis2_char_t*)axutil_hash_get( impl-> qname2name, key,
AXIS2_HASH_KEY_STRING );
if( local != NULL) /* key has been there somewhere */
{
@@ -144,20 +144,20 @@
}
/* otherwise */
local = axis2_qname_get_localpart( qname, env);
- counter = (int)axis2_hash_get( impl-> name2number, local,
+ counter = (int)axutil_hash_get( impl-> name2number, local,
AXIS2_HASH_KEY_STRING );
if ( counter == 0 ) /** this means name doesnt exist */
{
- axis2_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, local);
- axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)1);
+ axutil_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, local);
+ axutil_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)1);
return local;
}
/* else qname would already exist */
sprintf(counter_str, "%d", counter);
given_name = axis2_stracat(env, local, counter_str);
- axis2_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, given_name);
- axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)(counter+1));
+ axutil_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, given_name);
+ axutil_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)(counter+1));
return given_name;
}
@@ -189,8 +189,8 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- impl->qname2name = axis2_hash_make(env);
- impl->name2number = axis2_hash_make(env);
+ impl->qname2name = axutil_hash_make(env);
+ impl->name2number = axutil_hash_make(env);
impl->extension.ops =
AXIS2_MALLOC (env->allocator, sizeof(w2c_extension_ops_t));
if(! impl->extension.ops)
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -170,11 +170,11 @@
w2c_writer_get_extension( w2c_writer_impl_t *writer_impl,
const axutil_env_t *env)
{
- axis2_hash_t *lang_map = NULL;
- axis2_hash_t *lang_speci_map = NULL;
+ axutil_hash_t *lang_map = NULL;
+ axutil_hash_t *lang_speci_map = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
int all_length = 0;
int suf_length = 0;
int index = 0;
@@ -184,13 +184,13 @@
lang_map = W2C_CONFIG_PROPERTY_LOADER_GET_LANGUAGE_SPECIFIC_PROPERTIES_MAP
( writer_impl->loader, env );
- lang_speci_map = axis2_hash_get( lang_map,
+ lang_speci_map = axutil_hash_get( lang_map,
writer_impl-> language, AXIS2_HASH_KEY_STRING);
- for (hi = axis2_hash_first(lang_speci_map, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(lang_speci_map, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
if ( key && arr_list)
{
suf_length = axis2_strlen( W2C_WRITER_EXTENSION_SUFFIX );
@@ -212,21 +212,21 @@
axis2_char_t *
w2c_writer_find_template ( w2c_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_hash_t *lang_speci_map)
+ axutil_hash_t *lang_speci_map)
{
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
int all_length = 0;
int suf_length = 0;
int index = 0;
axis2_char_t *tmpl_name = NULL;
axutil_array_list_t *arr_list = NULL;
- for (hi = axis2_hash_first(lang_speci_map, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(lang_speci_map, env) ;
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
if ( key && arr_list)
{
suf_length = axis2_strlen( W2C_WRITER_TEMPLATE_SUFFIX );
@@ -284,8 +284,8 @@
w2c_writer_load_template(w2c_writer_impl_t *writer_impl,
const axutil_env_t *env)
{
- axis2_hash_t* lang_map = NULL;
- axis2_hash_t* lang_speci_map = NULL;
+ axutil_hash_t* lang_map = NULL;
+ axutil_hash_t* lang_speci_map = NULL;
axis2_char_t* file_path = NULL;
axis2_char_t* tmpl_name = NULL;
@@ -305,7 +305,7 @@
lang_map = W2C_CONFIG_PROPERTY_LOADER_GET_LANGUAGE_SPECIFIC_PROPERTIES_MAP
( writer_impl->loader, env );
- lang_speci_map = axis2_hash_get( lang_map,
+ lang_speci_map = axutil_hash_get( lang_map,
writer_impl-> language, AXIS2_HASH_KEY_STRING);
tmpl_name = w2c_writer_find_template( writer_impl, env, lang_speci_map);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer_protected.h Fri Mar 30 11:28:18 2007
@@ -75,7 +75,7 @@
axis2_char_t*
w2c_writer_find_template ( w2c_writer_impl_t* writer_impl,
const axutil_env_t* env,
- axis2_hash_t* lang_speci_map);
+ axutil_hash_t* lang_speci_map);
axis2_char_t*
w2c_writer_get_extension( w2c_writer_impl_t* writer_impl,
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c Fri Mar 30 11:28:18 2007
@@ -18,7 +18,7 @@
#include <w2c_cmdline_option_parser.h>
#include <axis2_utils.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_cmdline_option.h>
#include <w2c_cmdline_option_consts.h>
#include <w2c_messages.h>
@@ -71,7 +71,7 @@
w2c_validate_cmdline_options(w2c_cmdline_option_parser_t* cmd_opt_parser,
const axutil_env_t* env)
{
- axis2_hash_t* h = NULL;
+ axutil_hash_t* h = NULL;
axutil_array_list_t* invalid_arr = NULL;
w2c_cmdline_option_t* option = NULL;
int size = 0;
@@ -87,7 +87,7 @@
}
h = W2C_CMDLINE_OPTION_PARSER_GET_OPTIONS(cmd_opt_parser, env);
option = (w2c_cmdline_option_t*)
- axis2_hash_get(h, W2C_CMDLINE_OPTION_CONSTS_WSDL_LOCATION_URI,
+ axutil_hash_get(h, W2C_CMDLINE_OPTION_CONSTS_WSDL_LOCATION_URI,
AXIS2_HASH_KEY_STRING);
if (option == NULL)
{
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_engine_test.c Fri Mar 30 11:28:18 2007
@@ -46,8 +46,8 @@
axutil_env_t *env;
axutil_allocator_t *allocator;
w2c_cmdline_option_parser_t* parser = NULL;
- axis2_hash_index_t *hi;
- axis2_hash_t* hash = NULL;
+ axutil_hash_index_t *hi;
+ axutil_hash_t* hash = NULL;
int input_size;
axis2_char_t actual[1024];
int actual_len = 0;
@@ -84,10 +84,10 @@
hash = W2C_ENGINE_CONFIGURATION_GET_URI2PACKAGEMAP(conf, env);
- for (hi = axis2_hash_first(hash, env), actual[0] = '\0';
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(hash, env), actual[0] = '\0';
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
sprintf(actual, "%s%s=%s,", actual, key, value);
}
actual_len = axis2_strlen(actual);
@@ -109,10 +109,10 @@
hash = W2C_ENGINE_CONFIGURATION_GET_URI2PACKAGEMAP(conf, env);
- for (hi = axis2_hash_first(hash, env), actual[0] = '\0';
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(hash, env), actual[0] = '\0';
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
sprintf(actual, "%s%s=%s,", actual, key, value);
}
actual_len = axis2_strlen(actual);
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c Fri Mar 30 11:28:18 2007
@@ -26,7 +26,7 @@
#include <axiom.h>
#include <w2c_xslt_utils.h>
#include <w2c_cmdline_option_parser.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_engine_configuration.h>
static const axis2_char_t* w2c_config_test_input1[] =
@@ -47,7 +47,7 @@
axiom_node_t* inter_node = NULL;
axis2_char_t* buffer = NULL;
w2c_cmdline_option_parser_t* parser = NULL;
- axis2_hash_t* hash = NULL;
+ axutil_hash_t* hash = NULL;
w2c_engine_configuration_t* conf = NULL;
axutil_dll_desc_t* dll_desc = NULL;
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -69,8 +69,8 @@
axutil_allocator_t *allocator;
w2c_cmdline_option_parser_t *parser = NULL;
w2c_cmdline_option_t *option = NULL;
- axis2_hash_index_t *hi;
- axis2_hash_t *hash = NULL;
+ axutil_hash_index_t *hi;
+ axutil_hash_t *hash = NULL;
axutil_array_list_t *arr_list = NULL;
int i = 0;
int input_size;
@@ -86,7 +86,7 @@
hash = W2C_CMDLINE_OPTION_PARSER_GET_OPTIONS(parser, env);
option = (w2c_cmdline_option_t*)
- axis2_hash_get(hash, "uri", AXIS2_HASH_KEY_STRING);
+ axutil_hash_get(hash, "uri", AXIS2_HASH_KEY_STRING);
arr_list = W2C_CMDLINE_OPTION_GET_VALUES(option, env);
for (i = 0 , strcpy(actual, W2C_CMDLINE_OPTION_GET_TYPE(option, env));
@@ -99,10 +99,10 @@
CuAssertStrEquals(tc, expected, actual);
/* ----------------------------------------------------------------------*/
- for (hi = axis2_hash_first(hash, env), actual[0] = '\0';
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(hash, env), actual[0] = '\0';
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, NULL, NULL, (void*)&option);
+ axutil_hash_this(hi, NULL, NULL, (void*)&option);
arr_list = W2C_CMDLINE_OPTION_GET_VALUES(option, env);
sprintf(actual, "%s{%s}: ", actual, W2C_CMDLINE_OPTION_GET_TYPE(option, env));
@@ -138,8 +138,8 @@
w2c_config_property_loader_t *loader = NULL;
axis2_char_t *actual = NULL;
axis2_char_t *expected = NULL;
- axis2_hash_index_t *hi = NULL;
- axis2_hash_t *hash = NULL;
+ axutil_hash_index_t *hi = NULL;
+ axutil_hash_t *hash = NULL;
axutil_array_list_t *arr_list = NULL;
int i = 0;
axis2_char_t *axis2c_home = NULL;
@@ -167,15 +167,15 @@
hash =
W2C_CONFIG_PROPERTY_LOADER_GET_LANGUAGE_SPECIFIC_PROPERTIES_MAP(loader, env);
- hash = (axis2_hash_t*)axis2_hash_get(hash, "c", AXIS2_HASH_KEY_STRING);
+ hash = (axutil_hash_t*)axutil_hash_get(hash, "c", AXIS2_HASH_KEY_STRING);
if (hash)
{
actual = (axis2_char_t*) malloc(sizeof(axis2_char_t) * 4096);
- for (hi = axis2_hash_first(hash, env), actual[0] = '\0';
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(hash, env), actual[0] = '\0';
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
+ axutil_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
sprintf(actual, "%s{%s}: ", actual, key);
for (i = 0 ; i < axutil_array_list_size(arr_list, env); i ++)
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param.h Fri Mar 30 11:28:18 2007
@@ -25,7 +25,7 @@
#include <axis2_utils_defines.h>
#include <axutil_env.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axutil_array_list.h>
#ifdef __cplusplus
@@ -135,9 +135,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_param_set_attributes(struct axis2_param *param,
const axutil_env_t *env,
- axis2_hash_t *attrs);
+ axutil_hash_t *attrs);
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
axis2_param_get_attributes(struct axis2_param *param,
const axutil_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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Fri Mar 30 11:28:18 2007
@@ -35,7 +35,7 @@
#include <axutil_allocator.h>
#include <axis2_string.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
/*#include <axiom_element.h>*/
#include <axis2_qname.h>
Modified: webservices/axis2/trunk/c/util/include/axis2_properties.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_properties.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_properties.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_properties.h Fri Mar 30 11:28:18 2007
@@ -21,7 +21,7 @@
#include <axis2_utils_defines.h>
#include <axutil_error.h>
#include <axutil_env.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <stdio.h>
#ifdef __cplusplus
@@ -86,7 +86,7 @@
* @param env Environment. MUST NOT be NULL
* @return hash (key,value)
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
axis2_properties_get_all(axis2_properties_t *properties,
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