You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 21:24:23 UTC
svn commit: r524243 [9/17] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/
guththila/samples/ guththila/src/ include/ modu...
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c Fri Mar 30 12:24:00 2007
@@ -115,7 +115,7 @@
axis2_char_t*
w2c_schema_compiler_find_class_name(w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_bool_t is_array);
axis2_bool_t
@@ -126,25 +126,25 @@
xml_schema_t*
w2c_schema_compiler_resolve_parent_schema( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *schema_type_qname,
+ axutil_qname_t *schema_type_qname,
xml_schema_t *current_schema);
-axis2_qname_t*
+axutil_qname_t*
w2c_schema_compiler_generate_type_qname( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *ref_ele_qname,
+ axutil_qname_t *ref_ele_qname,
xml_schema_t *parent_schema );
axis2_bool_t
w2c_schema_compiler_is_already_processed( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *qname );
+ axutil_qname_t *qname );
axis2_char_t*
w2c_schema_compiler_find_ref_classname( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_bool_t is_array );
axis2_status_t
@@ -204,7 +204,7 @@
w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
w2c_schema_writer_meta_info_t *meta_info_child,
- axis2_qname_t *base_type_qname,
+ axutil_qname_t *base_type_qname,
xml_schema_t *parent_schema );
axis2_status_t
@@ -219,14 +219,14 @@
w2c_schema_compiler_process_simple_extension_base_type(
w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *ext_base_type,
+ axutil_qname_t *ext_base_type,
w2c_schema_writer_meta_info_t *meta_info);
axis2_status_t
w2c_schema_compiler_process_simple_restriction_base_type(
w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *res_base_type,
+ axutil_qname_t *res_base_type,
w2c_schema_writer_meta_info_t *meta_info);
axis2_status_t
@@ -574,7 +574,7 @@
const axutil_env_t *env,
xml_schema_element_t *element)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
void *existing = NULL;
xml_schema_type_t *schema_type = NULL;
@@ -584,10 +584,10 @@
axutil_hash_t *base_hash = NULL;
xml_schema_particle_t *particle = NULL;
axis2_bool_t is_array = AXIS2_FALSE;
- axis2_qname_t *type_qname = NULL;
+ axutil_qname_t *type_qname = NULL;
axis2_char_t *type_name = NULL;
- axis2_qname_t *changed_qname = NULL;
- axis2_qname_t *element_type_qname = NULL;
+ axutil_qname_t *changed_qname = NULL;
+ axutil_qname_t *element_type_qname = NULL;
axis2_char_t *written_classname = NULL;
qname = XML_SCHEMA_ELEMENT_GET_QNAME( element, env);
@@ -679,7 +679,7 @@
axis2_char_t*
w2c_schema_compiler_find_class_name(w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_bool_t is_array)
{
axis2_char_t *qname_str = NULL;
@@ -746,7 +746,7 @@
xml_schema_t *parent_schema)
{
int processed = 0;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
xml_schema_type_t *schema_type = NULL;
axis2_char_t *class_name = NULL;
@@ -755,20 +755,20 @@
xml_schema_particle_t *particle = NULL;
axis2_bool_t is_array = AXIS2_FALSE;
- axis2_qname_t *type_qname = NULL;
+ axutil_qname_t *type_qname = NULL;
axis2_char_t *type_name = NULL;
- axis2_qname_t *generated_type_qname = NULL;
+ axutil_qname_t *generated_type_qname = NULL;
w2c_schema_writer_meta_info_t *meta_inf = NULL;
xml_schema_complex_type_t *complex_type = NULL;
- axis2_qname_t *ref_qname = NULL;
+ axutil_qname_t *ref_qname = NULL;
xml_schema_t *current_parent_schema = NULL;
xml_schema_element_t *ref_ele = NULL;
- axis2_qname_t *ref_ele_qname = NULL;
+ axutil_qname_t *ref_ele_qname = NULL;
xml_schema_type_t *ref_schema_type = NULL;
xml_schema_type_t *type_by_name = NULL;
- axis2_qname_t *schema_type_qname = NULL;
+ axutil_qname_t *schema_type_qname = NULL;
axis2_char_t *local_part = NULL;
/** param check is done with displaying the message */
@@ -818,7 +818,7 @@
generated_type_qname = w2c_schema_compiler_generate_type_qname( compiler_impl, env, qname, parent_schema);
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( schema_type, env) )
{
- local_part = axis2_qname_get_localpart( generated_type_qname, env);
+ local_part = axutil_qname_get_localpart( generated_type_qname, env);
XML_SCHEMA_TYPE_SET_NAME( schema_type, env, local_part);
qname_str = w2c_string_make_key_from_qname( qname, env);
meta_inf = axutil_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
@@ -861,7 +861,7 @@
type_qname = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME( ref_ele, env);
if ( type_qname != NULL)
{
- type_name = axis2_qname_get_localpart( type_qname, env);
+ type_name = axutil_qname_get_localpart( type_qname, env);
}
if( NULL != type_name )
{
@@ -877,7 +877,7 @@
ref_schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE( ref_ele, env);
if ( XML_SCHEMA_COMPLEX_TYPE == XML_SCHEMA_TYPE_GET_TYPE( ref_schema_type, env) )
{
- local_part = axis2_qname_get_localpart( generated_type_qname, env);
+ local_part = axutil_qname_get_localpart( generated_type_qname, env);
XML_SCHEMA_TYPE_SET_NAME( ref_schema_type, env, local_part);
meta_inf = axutil_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
qname_str, AXIS2_HASH_KEY_STRING);
@@ -971,7 +971,7 @@
axis2_char_t *ns = NULL;
axis2_char_t *mapper_package_name = NULL;
axutil_hash_index_t *hi = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
@@ -1018,30 +1018,30 @@
hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
- qname = axis2_qname_create_from_string( env, key);
+ qname = axutil_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
- axis2_qname_free( qname, env);
+ axutil_qname_free( qname, env);
}
for (hi = axutil_hash_first( compiler_impl-> all_processed_anon_type, env);
hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
- qname = axis2_qname_create_from_string( env, key);
+ qname = axutil_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
- axis2_qname_free( qname, env);
+ axutil_qname_free( qname, env);
}
for (hi = axutil_hash_first( compiler_impl-> processed_type_map, env);
hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
- qname = axis2_qname_create_from_string( env, key);
+ qname = axutil_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
- axis2_qname_free( qname, env);
+ axutil_qname_free( qname, env);
}
/** the processed element set which is useful */
@@ -1049,10 +1049,10 @@
hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void*)&key, NULL, (void*)&value);
- qname = axis2_qname_create_from_string( env, key);
+ qname = axutil_qname_create_from_string( env, key);
W2C_TYPEMAPPER_ADD_TYPEMAPPING_NAME( compiler_impl-> base_schema_type_mapper,
env, qname, value);
- axis2_qname_free( qname, env);
+ axutil_qname_free( qname, env);
}
return compiler_impl-> base_schema_type_mapper;
}
@@ -1060,14 +1060,14 @@
xml_schema_t*
w2c_schema_compiler_resolve_parent_schema( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *schema_type_qname,
+ axutil_qname_t *schema_type_qname,
xml_schema_t *current_schema)
{
axis2_char_t *target_ns = NULL;
xml_schema_t *loaded_schema = NULL;
xml_schema_t *schema = NULL;
- target_ns = axis2_qname_get_uri( schema_type_qname, env);
+ target_ns = axutil_qname_get_uri( schema_type_qname, env);
loaded_schema = (xml_schema_t*)axutil_hash_get( compiler_impl-> loaded_schema_map,
target_ns, AXIS2_HASH_KEY_STRING );
if ( loaded_schema != NULL )
@@ -1085,10 +1085,10 @@
return current_schema;
}
-axis2_qname_t*
+axutil_qname_t*
w2c_schema_compiler_generate_type_qname( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *ref_ele_qname,
+ axutil_qname_t *ref_ele_qname,
xml_schema_t *parent_schema )
{
axis2_char_t *local_part = NULL;
@@ -1096,30 +1096,30 @@
axis2_char_t *new_local_part = NULL;
static int counter = 0;
axis2_char_t counter_str[32];
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
- ns_uri = axis2_qname_get_uri( ref_ele_qname, env);
- local_part = axis2_qname_get_localpart( ref_ele_qname, env);
+ ns_uri = axutil_qname_get_uri( ref_ele_qname, env);
+ local_part = axutil_qname_get_localpart( ref_ele_qname, env);
while( AXIS2_TRUE)
{
sprintf( counter_str, "_anon_type%d", counter);
new_local_part = axis2_stracat(env, local_part, counter_str);
- qname = axis2_qname_create( env, new_local_part, ns_uri, NULL);
+ qname = axutil_qname_create( env, new_local_part, ns_uri, NULL);
if ( ! XML_SCHEMA_GET_TYPE_BY_QNAME( parent_schema, env, qname ) )
{
/* new suitable qname found */
return qname;
}
/* else */
- axis2_qname_free( qname, env);
+ axutil_qname_free( qname, env);
}
}
axis2_bool_t
w2c_schema_compiler_is_already_processed( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *qname )
+ axutil_qname_t *qname )
{
axis2_char_t *qname_str = w2c_string_make_key_from_qname( qname, env );
axutil_hash_t *base_schema_type_map = NULL;
@@ -1134,7 +1134,7 @@
axis2_char_t*
w2c_schema_compiler_find_ref_classname( w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_bool_t is_array )
{
axis2_char_t *qname_str = NULL;
@@ -1195,7 +1195,7 @@
xml_schema_t *parent_schema )
{
w2c_schema_writer_meta_info_t *meta_info = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
meta_info = w2c_schema_compiler_process_complex_type(compiler_impl, env, complex_type, parent_schema);
@@ -1217,7 +1217,7 @@
axutil_hash_t *base_hash = NULL;
xml_schema_type_t *schema_type = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
axis2_char_t *fully_qualified_class_name = NULL;
w2c_schema_writer_meta_info_t *meta_info = NULL;
@@ -1266,7 +1266,7 @@
{
axutil_hash_t *base_hash = NULL;
xml_schema_type_t *schema_type = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS( complex_type, env);
@@ -1373,7 +1373,7 @@
{
xml_schema_complex_content_extension_t *extension = NULL;
xml_schema_complex_content_restriction_t *restriction = NULL;
- axis2_qname_t *base_type_qname = NULL;
+ axutil_qname_t *base_type_qname = NULL;
xml_schema_type_t *type = NULL;
axutil_hash_t *base_hash = NULL;
xml_schema_complex_type_t *complex_type = NULL;
@@ -1493,7 +1493,7 @@
w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
w2c_schema_writer_meta_info_t *meta_info_child,
- axis2_qname_t *base_type_qname,
+ axutil_qname_t *base_type_qname,
xml_schema_t *parent_schema )
{
xml_schema_type_t *type = NULL;
@@ -1504,7 +1504,7 @@
xml_schema_complex_content_t *complex_content = NULL;
xml_schema_complex_content_extension_t *extension = NULL;
xml_schema_complex_content_restriction_t *restriction = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
void *content = NULL;
w2c_schema_writer_meta_info_t *meta_info = NULL;
@@ -1578,7 +1578,7 @@
{
xml_schema_simple_content_extension_t *extension = NULL;
xml_schema_simple_content_restriction_t *restriction = NULL;
- axis2_qname_t *base_type_qname = NULL;
+ axutil_qname_t *base_type_qname = NULL;
xml_schema_type_t *type = NULL;
axutil_hash_t *base_hash = NULL;
xml_schema_complex_type_t *complex_type = NULL;
@@ -1709,11 +1709,11 @@
w2c_schema_compiler_process_simple_extension_base_type(
w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *ext_base_type,
+ axutil_qname_t *ext_base_type,
w2c_schema_writer_meta_info_t *meta_info)
{
axis2_char_t *class_name = NULL;
- axis2_qname_t *changed_qname = NULL;
+ axutil_qname_t *changed_qname = NULL;
axis2_char_t *qname_str = NULL;
qname_str = w2c_string_make_key_from_qname( ext_base_type, env);
@@ -1738,11 +1738,11 @@
w2c_schema_compiler_process_simple_restriction_base_type(
w2c_schema_compiler_impl_t *compiler_impl,
const axutil_env_t *env,
- axis2_qname_t *res_base_type,
+ axutil_qname_t *res_base_type,
w2c_schema_writer_meta_info_t *meta_info)
{
axis2_char_t *class_name = NULL;
- axis2_qname_t *changed_qname = NULL;
+ axutil_qname_t *changed_qname = NULL;
axis2_char_t *qname_str = NULL;
qname_str = w2c_string_make_key_from_qname( res_base_type, env);
@@ -1874,12 +1874,12 @@
w2c_schema_writer_meta_info_t *meta_info,
xml_schema_any_attribute_t *any_attri )
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *default_array = NULL;
default_array =
W2C_SCHEMA_PROPERTY_LOADER_GET_DEFAULT_ARRAY( compiler_impl-> loader, env);
- qname = axis2_qname_create( env,
+ qname = axutil_qname_create( env,
W2C_SCHEMA_COMPILER_CONSTS_EXTRA_ATTRIBUTE_FIELD_NAME, NULL, NULL );
W2C_SCHEMA_WRITER_META_INFO_REGISTER_MAPPING(meta_info, env,
@@ -1897,10 +1897,10 @@
xml_schema_attribute_t *attri,
w2c_schema_writer_meta_info_t *meta_info)
{
- axis2_qname_t *schema_type_name = NULL;
+ axutil_qname_t *schema_type_name = NULL;
axis2_char_t *mapped_name = NULL; /* class_name*/
axis2_char_t *qname_str = NULL;
- axis2_qname_t *attr_qname = NULL;
+ axutil_qname_t *attr_qname = NULL;
axutil_hash_t *base_schema_type_map = NULL;
base_schema_type_map =
@@ -1980,7 +1980,7 @@
int count = 0;
xml_schema_element_t *ele = NULL;
axis2_bool_t is_array = AXIS2_FALSE;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
xml_schema_any_t *any = NULL;
void *key = NULL;
@@ -1990,13 +1990,13 @@
axis2_char_t *class_name = NULL;
xml_schema_type_t *schema_type = NULL;
- axis2_qname_t *schema_type_qname = NULL;
- axis2_qname_t *referenced_qname = NULL;
+ axutil_qname_t *schema_type_qname = NULL;
+ axutil_qname_t *referenced_qname = NULL;
xml_schema_element_t *element_by_qname = NULL;
xml_schema_particle_t *particle = NULL;
int index = 0;
- axis2_qname_t *any_element_field_qname = NULL;
+ axutil_qname_t *any_element_field_qname = NULL;
xml_schema_obj_t *schema_obj = NULL;
axutil_hash_t *base_hash = NULL;
@@ -2039,7 +2039,7 @@
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( schema_obj, env);
any = (xml_schema_any_t*)axutil_hash_get( base_hash, "XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING);
- qname = axis2_qname_create( env, W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME,
+ qname = axutil_qname_create( env, W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME,
NULL, NULL );
qname_str = w2c_string_make_key_from_qname( qname, env);
/** CHECK: putting a pointer to hash key*/
@@ -2142,7 +2142,7 @@
{
base_hash = XML_SCHEMA_OBJ_SUPER_OBJS( key, env);
any = (xml_schema_any_t*)axutil_hash_get( base_hash, "XML_SCHEMA_ANY", AXIS2_HASH_KEY_STRING);
- any_element_field_qname = axis2_qname_create( env, W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME,
+ any_element_field_qname = axutil_qname_create( env, W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME,
NULL, NULL );
W2C_SCHEMA_WRITER_META_INFO_REGISTER_MAPPING(meta_info, env,
any_element_field_qname, NULL, (value==1)?default_array:default_class,
@@ -2190,7 +2190,7 @@
xml_schema_element_t *ele )
{
xml_schema_type_t *schema_type = NULL;
- axis2_qname_t * qname = NULL;
+ axutil_qname_t * qname = NULL;
axis2_char_t *qname_str = NULL;
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE( ele, env);
@@ -2216,10 +2216,10 @@
{
xml_schema_simple_type_content_t *content = NULL;
xml_schema_simple_type_restriction_t *restriction = NULL;
- axis2_qname_t *base_type_qname = NULL;
+ axutil_qname_t *base_type_qname = NULL;
axis2_char_t *qname_str = NULL;
axis2_char_t *class_name = NULL;
- axis2_qname_t *type_qname = NULL;
+ axutil_qname_t *type_qname = NULL;
xml_schema_simple_type_t *rest_base_type = NULL;
axutil_hash_t *base_hash = NULL;
xml_schema_type_t *type = NULL;
@@ -2248,7 +2248,7 @@
if( base_type_qname != NULL)
{
qname_str = w2c_string_make_key_from_qname( base_type_qname, env);
- nsuri = axis2_qname_get_uri( base_type_qname, env);
+ nsuri = axutil_qname_get_uri( base_type_qname, env);
if ( ! nsuri || '\0' == *nsuri)
{
/** the blank namespace should be taken */
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_schema_compiler_options.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
/**
* @brief
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c Fri Mar 30 12:24:00 2007
@@ -16,9 +16,9 @@
*/
#include <w2c_schema_property_loader.h>
-#include <axis2_properties.h>
+#include <axutil_properties.h>
#include <axutil_array_list.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <w2c_string.h>
#include <axutil_hash.h>
#include <stdlib.h>
@@ -46,7 +46,7 @@
w2c_schema_writer_t *writer_instance;
axis2_char_t *typemapper_name;
- axis2_properties_t *prop_set;
+ axutil_properties_t *prop_set;
axis2_char_t *prop_filename;
axis2_char_t *language;
axis2_char_t *default_class;
@@ -175,8 +175,8 @@
return NULL;
}
*/
- schema_property_loader_impl-> prop_set = axis2_properties_create( env);
- axis2_properties_load( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
+ schema_property_loader_impl-> prop_set = axutil_properties_create( env);
+ axutil_properties_load( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
if ( schema_property_loader_impl-> prop_set != NULL )
{
@@ -236,7 +236,7 @@
if (schema_property_loader_impl-> prop_set)
{
- axis2_properties_free( schema_property_loader_impl-> prop_set, env);
+ axutil_properties_free( schema_property_loader_impl-> prop_set, env);
}
if (schema_property_loader_impl-> prop_filename)
@@ -320,7 +320,7 @@
if (schema_property_loader_impl-> prop_set)
{
- axis2_properties_free ( schema_property_loader_impl->prop_set, env );
+ axutil_properties_free ( schema_property_loader_impl->prop_set, env );
}
/*
f = fopen ( schema_property_loader_impl-> prop_filename, "r+");
@@ -331,8 +331,8 @@
return AXIS2_FAILURE;
}
*/
- schema_property_loader_impl-> prop_set = axis2_properties_create( env);
- axis2_properties_load( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
+ schema_property_loader_impl-> prop_set = axutil_properties_create( env);
+ axutil_properties_load( schema_property_loader_impl-> prop_set, env, schema_property_loader_impl->prop_filename);
if ( schema_property_loader_impl-> prop_set != NULL )
{
@@ -434,7 +434,7 @@
w2c_schema_writer_t *writer = NULL;
axutil_dll_desc_t *dll_desc = NULL;
- prop_hash = axis2_properties_get_all( obj_impl-> prop_set, env);
+ prop_hash = axutil_properties_get_all( obj_impl-> prop_set, env);
language = obj_impl-> language;
/**
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c Fri Mar 30 12:24:00 2007
@@ -38,9 +38,9 @@
axis2_char_t *enum_facet;
axis2_char_t *pattern_facet;
- axis2_qname_t *extension_basetype;
- axis2_qname_t *restriction_basetype;
- axis2_qname_t *ownqname;
+ axutil_qname_t *extension_basetype;
+ axutil_qname_t *restriction_basetype;
+ axutil_qname_t *ownqname;
axutil_hash_t *element2schema_qnamemap;
axutil_hash_t *element2classmap;
axutil_hash_t *specialtype_flagmap;
@@ -153,24 +153,24 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_extension_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *extension_basetype);
-axis2_qname_t *AXIS2_CALL
+ axutil_qname_t *extension_basetype);
+axutil_qname_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_extension_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_restriction_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *restriction_basetype);
-axis2_qname_t *AXIS2_CALL
+ axutil_qname_t *restriction_basetype);
+axutil_qname_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_restriction_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_ownqname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *ownqname);
-axis2_qname_t *AXIS2_CALL
+ axutil_qname_t *ownqname);
+axutil_qname_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_ownqname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env);
@@ -283,91 +283,91 @@
w2c_schema_writer_meta_info_is_restriction_base_type(
w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *restriction_base_type);
+ axutil_qname_t *restriction_base_type);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_register_nillable_qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_is_nillable( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_register_mapping( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
- axis2_qname_t *schema_name,
+ axutil_qname_t *qname,
+ axutil_qname_t *schema_name,
axis2_char_t *class_name,
int type);
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
w2c_schema_writer_meta_info_get_schemaqname4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_char_t* AXIS2_CALL
w2c_schema_writer_meta_info_get_classname4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_attri_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_any_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_array_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_binary_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_any_attri_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_add_min_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
long min_occurs);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_add_max_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
long max_occurs);
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_register_qname_index( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
int index);
long AXIS2_CALL
w2c_schema_writer_meta_info_get_min_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
long AXIS2_CALL
w2c_schema_writer_meta_info_get_max_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axutil_array_list_t* AXIS2_CALL
w2c_schema_writer_meta_info_get_qname_array( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
@@ -385,7 +385,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_add_status( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *type,
+ axutil_qname_t *type,
int mask);
axis2_status_t AXIS2_CALL
@@ -682,15 +682,15 @@
if (schema_writer_meta_info_impl->extension_basetype)
{
- axis2_qname_free(schema_writer_meta_info_impl->extension_basetype, env);
+ axutil_qname_free(schema_writer_meta_info_impl->extension_basetype, env);
}
if (schema_writer_meta_info_impl->restriction_basetype)
{
- axis2_qname_free(schema_writer_meta_info_impl->restriction_basetype, env);
+ axutil_qname_free(schema_writer_meta_info_impl->restriction_basetype, env);
}
if (schema_writer_meta_info_impl->ownqname)
{
- axis2_qname_free(schema_writer_meta_info_impl->ownqname, env);
+ axutil_qname_free(schema_writer_meta_info_impl->ownqname, env);
}
if (schema_writer_meta_info_impl->nillable_qnamelist)
{
@@ -930,7 +930,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_extension_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *extension_basetype)
+ axutil_qname_t *extension_basetype)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -938,7 +938,7 @@
writer_meta_info_impl-> extension_basetype = extension_basetype;
return AXIS2_SUCCESS;
}
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_extension_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -951,7 +951,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_restriction_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *restriction_basetype)
+ axutil_qname_t *restriction_basetype)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -959,7 +959,7 @@
writer_meta_info_impl-> restriction_basetype = restriction_basetype;
return AXIS2_SUCCESS;
}
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_restriction_basetype( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -972,7 +972,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_set_ownqname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *ownqname)
+ axutil_qname_t *ownqname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -980,7 +980,7 @@
writer_meta_info_impl-> ownqname = ownqname;
return AXIS2_SUCCESS;
}
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
w2c_schema_writer_meta_info_get_ownqname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env)
{
@@ -1270,10 +1270,10 @@
w2c_schema_writer_meta_info_is_restriction_base_type(
w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *restriction_base_type)
+ axutil_qname_t *restriction_base_type)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- return axis2_qname_equals( W2C_INTF_TO_IMPL(schema_writer_meta_info)-> restriction_basetype,
+ return axutil_qname_equals( W2C_INTF_TO_IMPL(schema_writer_meta_info)-> restriction_basetype,
env,
restriction_base_type );
}
@@ -1282,7 +1282,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_register_nillable_qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1301,7 +1301,7 @@
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_is_nillable( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1319,8 +1319,8 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_register_mapping( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
- axis2_qname_t *schema_name,
+ axutil_qname_t *qname,
+ axutil_qname_t *schema_name,
axis2_char_t *class_name,
int type)
{
@@ -1340,20 +1340,20 @@
}
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
w2c_schema_writer_meta_info_get_schemaqname4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
- axis2_qname_t *ret_qname = NULL;
+ axutil_qname_t *ret_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
writer_meta_info_impl = W2C_INTF_TO_IMPL(schema_writer_meta_info);
qname_str = w2c_string_make_key_from_qname( qname, env);
- ret_qname = (axis2_qname_t*)axutil_hash_get( writer_meta_info_impl-> element2schema_qnamemap, qname_str,
+ ret_qname = (axutil_qname_t*)axutil_hash_get( writer_meta_info_impl-> element2schema_qnamemap, qname_str,
AXIS2_HASH_KEY_STRING);
return ret_qname;
}
@@ -1361,7 +1361,7 @@
axis2_char_t* AXIS2_CALL
w2c_schema_writer_meta_info_get_classname4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1379,7 +1379,7 @@
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_attri_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1401,7 +1401,7 @@
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_any_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1423,7 +1423,7 @@
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_array_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1445,7 +1445,7 @@
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_binary_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1467,7 +1467,7 @@
axis2_bool_t AXIS2_CALL
w2c_schema_writer_meta_info_get_any_attri_status4qname( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
@@ -1483,7 +1483,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_add_min_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
long min_occurs)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
@@ -1500,7 +1500,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_add_max_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
long max_occurs)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
@@ -1517,7 +1517,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_register_qname_index( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
int index)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
@@ -1536,7 +1536,7 @@
long AXIS2_CALL
w2c_schema_writer_meta_info_get_min_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1553,7 +1553,7 @@
long AXIS2_CALL
w2c_schema_writer_meta_info_get_max_occurs( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
axis2_char_t *qname_str = NULL;
@@ -1575,7 +1575,7 @@
axis2_char_t *qname_str = NULL;
axutil_hash_index_t *hi = NULL;
axutil_array_list_t *arr_list = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
int i = 0;
@@ -1588,7 +1588,7 @@
axutil_hash_this(hi, (void*)&qname_str, NULL, NULL);
if (qname_str)
{
- qname = axis2_qname_create_from_string( env, qname_str);
+ qname = axutil_qname_create_from_string( env, qname_str);
axutil_array_list_add_at( arr_list, env, i, qname);
}
}
@@ -1604,7 +1604,7 @@
int i = 0;
int real_index = 0;
int size = 0;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_array_list_t *temp_arr_list = NULL;
axis2_char_t index_str[32];
@@ -1620,7 +1620,7 @@
for ( i = 0, real_index = 0; i < size; i ++ )
{
sprintf(index_str, "%d", i);
- qname = (axis2_qname_t*) axutil_hash_get(
+ qname = (axutil_qname_t*) axutil_hash_get(
writer_meta_info_impl-> qname_orderlist, index_str, AXIS2_HASH_KEY_STRING );
if ( qname != NULL )
{
@@ -1634,7 +1634,7 @@
size = axutil_array_list_size( temp_arr_list, env);
for ( i = 0; i < size; i ++)
{
- qname = (axis2_qname_t*) axutil_array_list_get(
+ qname = (axutil_qname_t*) axutil_array_list_get(
temp_arr_list, env, i );
if ( w2c_schema_writer_meta_info_get_any_attri_status4qname(
schema_writer_meta_info, env, qname ) )
@@ -1676,7 +1676,7 @@
axis2_status_t AXIS2_CALL
w2c_schema_writer_meta_info_add_status( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
const axutil_env_t *env,
- axis2_qname_t *type,
+ axutil_qname_t *type,
int mask)
{
w2c_schema_writer_meta_info_impl_t *writer_meta_info_impl = NULL;
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -31,13 +31,13 @@
axis2_char_t* AXIS2_CALL
w2c_schema_c_writer_make_fully_qualified_class_name( w2c_schema_writer_t *writer,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
axis2_char_t *fully_qualified_class_name = NULL;
w2c_schema_writer_impl_t *writer_impl = NULL;
W2C_ENGINE_CONFIGURATION_NAMEMAKER name_maker = NULL;
w2c_qname2name_maker_t *qname2name_maker = NULL;
- axis2_qname_t *temp_qname = NULL;
+ axutil_qname_t *temp_qname = NULL;
axis2_char_t *temp_name = NULL;
axis2_char_t *temp_uri = NULL;
axis2_char_t *temp_prefix = NULL;
@@ -47,18 +47,18 @@
writer_impl = W2C_INTF_TO_IMPL(writer);
/** verify unique names */
- temp_name = axis2_qname_get_localpart( qname, env);
- temp_uri = axis2_qname_get_uri( qname, env);
- temp_prefix = axis2_qname_get_prefix( qname, env);
+ temp_name = axutil_qname_get_localpart( qname, env);
+ temp_uri = axutil_qname_get_uri( qname, env);
+ temp_prefix = axutil_qname_get_prefix( qname, env);
temp_name = w2c_schema_writer_make_unique_class_name( writer_impl, env,
writer_impl-> names_list, temp_name);
- temp_qname = axis2_qname_create( env, temp_name, temp_uri, temp_prefix);
+ temp_qname = axutil_qname_create( env, temp_name, temp_uri, temp_prefix);
qname2name_maker =
W2C_SCHEMA_COMPILER_OPTIONS_GET_QNAME2NAME_MAKER( writer_impl-> options, env);
if ( qname2name_maker == NULL)
{
- fully_qualified_class_name = axis2_qname_get_localpart( temp_qname, env);
+ fully_qualified_class_name = axutil_qname_get_localpart( temp_qname, env);
}
else
{
@@ -109,7 +109,7 @@
axis2_char_t*
w2c_schema_c_writer_process( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
axutil_hash_t *typemap,
axis2_bool_t is_element)
@@ -124,7 +124,7 @@
axis2_char_t *model_name = NULL;
axis2_char_t *namespace_uri = NULL;
- original_name = axis2_qname_get_localpart( qname, env);
+ original_name = axutil_qname_get_localpart( qname, env);
original_name = axis2_strdup(env, original_name, original_name);
class_name = W2C_SCHEMA_WRITER_META_INFO_GET_OWN_CLASSNAME( meta_info, env);
if( ! class_name )
@@ -165,7 +165,7 @@
w2c_schema_writer_parse( writer_impl, env,
model_source_node, out, header_template);
}
- namespace_uri = axis2_qname_get_uri( qname, env);
+ namespace_uri = axutil_qname_get_uri( qname, env);
model_name = axis2_stracat(env, class_name, "|");
model_name = w2c_string_add_string( model_name, namespace_uri, env);
axutil_hash_set( writer_impl-> model_map, model_name, AXIS2_HASH_KEY_STRING, model_source_node);
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -263,7 +263,7 @@
axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info)
{
- axis2_qname_t *qname;
+ axutil_qname_t *qname;
w2c_schema_writer_impl_t *writer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -280,7 +280,7 @@
axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
w2c_schema_writer_impl_t *writer_impl = NULL;
xml_schema_type_t *type = NULL;
axutil_hash_t *base_hash = NULL;
@@ -369,7 +369,7 @@
axis2_char_t* AXIS2_CALL
w2c_schema_writer_make_fully_qualified_class_name( w2c_schema_writer_t *writer,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
axis2_char_t *ns_uri = NULL;
axis2_char_t *package_name = NULL;
@@ -385,14 +385,14 @@
AXIS2_ENV_CHECK(env, NULL);
writer_impl = W2C_INTF_TO_IMPL(writer);
- ns_uri = axis2_qname_get_uri( qname, env);
+ ns_uri = axutil_qname_get_uri( qname, env);
qname2name_maker =
W2C_SCHEMA_COMPILER_OPTIONS_GET_QNAME2NAME_MAKER( writer_impl-> options, env);
if ( qname2name_maker == NULL)
{
- original_name = axis2_qname_get_localpart( qname, env);
+ original_name = axutil_qname_get_localpart( qname, env);
}
else
{
@@ -466,7 +466,7 @@
axis2_char_t*
w2c_schema_writer_process( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
axutil_hash_t *typemap,
axis2_bool_t is_element)
@@ -518,7 +518,7 @@
w2c_schema_writer_parse( writer_impl, env,
model_source_node, out, source_template);
}
- namespace_uri = axis2_qname_get_uri( qname, env);
+ namespace_uri = axutil_qname_get_uri( qname, env);
model_name = axis2_stracat(env, class_name, "|");
model_name = w2c_string_add_string( model_name, namespace_uri, env);
axutil_hash_set( writer_impl-> model_map, model_name, AXIS2_HASH_KEY_STRING, model_source_node);
@@ -538,7 +538,7 @@
const axutil_env_t *env,
axis2_char_t *class_name,
axis2_char_t *original_name,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_bool_t is_element,
w2c_schema_writer_meta_info_t *meta_info,
axutil_hash_t *property_names,
@@ -558,8 +558,8 @@
{
model = w2c_xslt_utils_add_child_node( env, "class", NULL);
}
- ns_uri = axis2_qname_get_uri( qname, env);
- prefix = axis2_qname_get_prefix( qname, env);
+ ns_uri = axutil_qname_get_uri( qname, env);
+ prefix = axutil_qname_get_prefix( qname, env);
prefix = w2c_schema_writer_get_prefix4uri( writer_impl, env, ns_uri, prefix);
@@ -567,7 +567,7 @@
w2c_xslt_utils_add_attribute( env, model, "name", class_name);
caps_name = axis2_strdup(env, class_name);
- caps_name = axis2_string_toupper( caps_name);
+ caps_name = axutil_string_toupper( caps_name);
w2c_xslt_utils_add_attribute( env, model, "caps-name", caps_name);
AXIS2_FREE( env-> allocator, caps_name);
@@ -641,7 +641,7 @@
axutil_array_list_t *qnames = NULL;
int i = 0;
int size = 0;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axiom_node_t *property = NULL;
axis2_char_t *localpart = NULL;
axis2_char_t *unique_name = NULL;
@@ -652,7 +652,7 @@
/*axis2_bool_t is_primitive = AXIS2_FALSE;*/
axis2_bool_t is_default = AXIS2_FALSE;
w2c_schema_writer_meta_info_t *parent_meta_info = NULL;
- axis2_qname_t *schema_qname = NULL;
+ axutil_qname_t *schema_qname = NULL;
axis2_char_t *qname_str = NULL;
void* schema_type = NULL;
axis2_char_t *short_type_name = NULL;
@@ -685,16 +685,16 @@
if ( qname2name_maker == NULL)
{
- localpart = axis2_qname_get_localpart( qname, env);
+ localpart = axutil_qname_get_localpart( qname, env);
}
else
{
localpart =
W2C_QNAME2NAME_MAKER_SUGGEST_NAME( qname2name_maker, env, qname);
}
- prefix = axis2_qname_get_prefix( qname, env);
- original_name = axis2_qname_get_localpart( qname, env);
- nsuri = axis2_qname_get_uri( qname, env);
+ prefix = axutil_qname_get_prefix( qname, env);
+ original_name = axutil_qname_get_localpart( qname, env);
+ nsuri = axutil_qname_get_uri( qname, env);
unique_name = w2c_schema_writer_make_unique_class_name(
writer_impl, env, property_names, localpart);
parent_meta_info = W2C_SCHEMA_WRITER_META_INFO_GET_PARENT( meta_info, env);
@@ -712,7 +712,7 @@
{
w2c_xslt_utils_add_attribute( env, property, "type", classname);
caps_type = axis2_strdup(env, classname);
- caps_type = axis2_string_toupper( caps_type);
+ caps_type = axutil_string_toupper( caps_type);
w2c_xslt_utils_add_attribute( env, property, "caps-type", caps_type);
AXIS2_FREE( env-> allocator, caps_type);
}
@@ -720,7 +720,7 @@
caps_name = axis2_strdup(env, unique_name);
- caps_name = axis2_string_toupper( caps_name);
+ caps_name = axutil_string_toupper( caps_name);
w2c_xslt_utils_add_attribute( env, property, "caps-cname", caps_name);
AXIS2_FREE( env-> allocator, caps_name);
@@ -761,7 +761,7 @@
}
if ( schema_qname != NULL && schema_type != NULL)
{
- short_type_name = axis2_qname_get_localpart( schema_qname, env);
+ short_type_name = axutil_qname_get_localpart( schema_qname, env);
}
else
{
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -77,7 +77,7 @@
axis2_char_t*
(*process)( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
axutil_hash_t *typemap,
axis2_bool_t is_element);
@@ -157,7 +157,7 @@
axis2_char_t* AXIS2_CALL
w2c_schema_writer_make_fully_qualified_class_name( w2c_schema_writer_t *writer,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
w2c_schema_writer_register_extension_mapper_packagename(w2c_schema_writer_t *writer,
@@ -190,7 +190,7 @@
axis2_char_t*
w2c_schema_writer_process( w2c_schema_writer_impl_t *writer_impl,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
w2c_schema_writer_meta_info_t *meta_info,
axutil_hash_t *typemap,
axis2_bool_t is_element);
@@ -200,7 +200,7 @@
const axutil_env_t *env,
axis2_char_t *class_name,
axis2_char_t *original_name,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_bool_t is_element,
w2c_schema_writer_meta_info_t *meta_info,
axutil_hash_t *property_names,
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
#define DEFAULT_DIR "src"
static void
-w2c_schema_print_message( const axutil_env_t *env, axis2_properties_t *messageh,
+w2c_schema_print_message( const axutil_env_t *env, axutil_properties_t *messageh,
axis2_char_t *key);
static void
@@ -106,22 +106,22 @@
static void
w2c_schema_print_usage( const axutil_env_t *env )
{
- axis2_properties_t *props = NULL;
+ axutil_properties_t *props = NULL;
props = w2c_messages_get_message_properties( env );
w2c_schema_print_message ( env, props,"schema2code.arg1");
w2c_schema_print_message ( env, props,"schema2code.arg2");
w2c_schema_print_message ( env, props,"schema2code.arg3");
- axis2_properties_free( props, env);
+ axutil_properties_free( props, env);
}
static void
w2c_schema_print_message( const axutil_env_t *env,
- axis2_properties_t *messagep, axis2_char_t *key)
+ axutil_properties_t *messagep, axis2_char_t *key)
{
axis2_char_t *message = NULL;
message = (axis2_char_t *)
- axis2_properties_get_property(messagep, env, key);
+ axutil_properties_get_property(messagep, env, key);
printf ( "%s\n", message );
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
{
axis2_char_t *dll_name = NULL;
axutil_dll_desc_t *dll_desc = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
axis2_char_t *file_path = NULL;
void *obj = NULL;
@@ -55,8 +55,8 @@
axutil_dll_desc_set_name(dll_desc, env, file_path);
axutil_dll_desc_set_type(dll_desc, env, -1); /* not a standard type */
- impl_info_param = axis2_param_create(env, NULL, NULL);
- axis2_param_set_value(impl_info_param, env, dll_desc);
+ impl_info_param = axutil_param_create(env, NULL, NULL);
+ axutil_param_set_value(impl_info_param, env, dll_desc);
axutil_class_loader_init(env);
obj = axutil_class_loader_create_dll(env, impl_info_param);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <w2c_cmdline_option.h>
#include <w2c_cmdline_option_consts.h>
#include <axutil_array_list.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <w2c_string.h>
/**
@@ -227,21 +227,21 @@
{
/* skip -- */
type = (axis2_char_t*)
- axis2_string_substring_starting_at ( type, index +2 );
+ axutil_string_substring_starting_at ( type, index +2 );
}
index = w2c_string_indexof_cs ( type, "-" );
if ( index > -1 )
{
/* skip - */
type = (axis2_char_t*)
- axis2_string_substring_starting_at ( type, index +1 );
+ axutil_string_substring_starting_at ( type, index +1 );
}
index = w2c_string_indexof_cs ( type,
W2C_CMDLINE_OPTION_CONSTS_EXTRA_OPTIONTYPE_PREFIX );
if (index < 0 )
{
- type = (axis2_char_t*)axis2_string_tolower( type );
+ type = (axis2_char_t*)axutil_string_tolower( type );
}
cmdline_option_impl-> type = type;
return type;
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -19,7 +19,7 @@
#include <w2c_cmdline_option_consts.h>
#include <w2c_cmdline_option.h>
#include <w2c_cmdline_option_validator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <w2c_string.h>
/**
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -18,7 +18,7 @@
#include <w2c_config_property_loader.h>
#include <w2c_properties.h>
#include <axutil_array_list.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <w2c_string.h>
#include <axutil_hash.h>
#include <stdlib.h>
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/messages.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/messages.c Fri Mar 30 12:24:00 2007
@@ -16,18 +16,18 @@
*/
#include <w2c_messages.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axutil_hash.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <platforms/axis2_platform_auto_sense.h>
#define W2C_MESSAGES_FILENAME "resource.properties"
-AXIS2_EXTERN axis2_properties_t* AXIS2_CALL
+AXIS2_EXTERN axutil_properties_t* AXIS2_CALL
w2c_messages_get_message_properties(
const axutil_env_t *env )
{
- axis2_properties_t *props = NULL;
+ axutil_properties_t *props = NULL;
axis2_char_t *axis2c_home = NULL;
axis2_char_t *filename = NULL;
axis2_char_t *filepath= NULL;
@@ -51,8 +51,8 @@
filepath = AXIS2_MALLOC ( env-> allocator, path_len* sizeof(axis2_char_t) );
sprintf ( filepath, "%s%s%s", axis2c_home, inter_path, filename );
- props = axis2_properties_create(env);
- axis2_properties_load( props, env, filepath);
+ props = axutil_properties_create(env);
+ axutil_properties_load( props, env, filepath);
return props;
}
@@ -60,16 +60,16 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
w2c_messages_get_message( const axutil_env_t *env, axis2_char_t *key )
{
- axis2_properties_t *props = NULL;
+ axutil_properties_t *props = NULL;
axis2_char_t *message = NULL;
props = w2c_messages_get_message_properties( env);
- message = axis2_properties_get_property( props, env, key);
+ message = axutil_properties_get_property( props, env, key);
if ( message )
{
message = axis2_strdup (env, message);
}
- axis2_properties_free( props, env);
+ axutil_properties_free( props, env);
return message;
}
@@ -90,11 +90,11 @@
AXIS2_EXTERN void AXIS2_CALL
w2c_messages_print_n_log_error_from_properties( const axutil_env_t *env,
- axis2_properties_t *props,
+ axutil_properties_t *props,
axis2_char_t *key )
{
axis2_char_t *msg = NULL;
- msg = axis2_properties_get_property( props, env, key);
+ msg = axutil_properties_get_property( props, env, key);
if ( msg )
{
fprintf ( stderr, "%s\n", msg );
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/properties.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/properties.c Fri Mar 30 12:24:00 2007
@@ -17,9 +17,9 @@
#include <w2c_properties.h>
#include <axutil_array_list.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <w2c_string.h>
-#include <axis2_properties.h>
+#include <axutil_properties.h>
/**
* @brief
@@ -56,7 +56,7 @@
axis2_char_t seperator)
{
w2c_properties_impl_t *properties_impl = NULL;
- axis2_properties_t *main_props = NULL;
+ axutil_properties_t *main_props = NULL;
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
axutil_hash_index_t *hi = NULL;
@@ -75,15 +75,15 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- main_props = axis2_properties_create(env);
+ main_props = axutil_properties_create(env);
if(! main_props)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_properties_load( main_props, env, filename );
+ axutil_properties_load( main_props, env, filename );
- tmp_hash = axis2_properties_get_all( main_props, env);
+ tmp_hash = axutil_properties_get_all( main_props, env);
properties_impl-> prop_hash = axutil_hash_make (env);
if(! properties_impl-> prop_hash)
@@ -123,7 +123,7 @@
}
}
}
- axis2_properties_free( main_props, env);
+ axutil_properties_free( main_props, env);
properties_impl->properties.ops =
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/string.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/string.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/string.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_string.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
@@ -157,15 +157,15 @@
}
AXIS2_EXTERN axis2_char_t*
-w2c_string_make_key_from_qname( axis2_qname_t *qname,
+w2c_string_make_key_from_qname( axutil_qname_t *qname,
const axutil_env_t *env)
{
axis2_char_t *local = NULL;
axis2_char_t *uri = NULL;
axis2_char_t *key = NULL;
- local = axis2_qname_get_localpart( qname, env);
- uri = axis2_qname_get_uri( qname, env);
+ local = axutil_qname_get_localpart( qname, env);
+ uri = axutil_qname_get_uri( qname, env);
key = axis2_strdup(env, local);
if ( uri != NULL && *uri != '\0' ) /* it should not be empty*/
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <w2c_typemapper.h>
#include <axutil_array_list.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <w2c_string.h>
#include <axiom_document.h>
#include <axiom_xml_reader.h>
@@ -42,7 +42,7 @@
axis2_char_t *mapper_name;
axutil_hash_t *qname2name;
axis2_char_t *default_type;
- axis2_qname_t *default_qname;
+ axutil_qname_t *default_qname;
axutil_hash_t *primitive_map;
axutil_hash_t *qname2prefix;
@@ -62,24 +62,24 @@
axis2_char_t* AXIS2_CALL
w2c_typemapper_get_parameter_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_char_t* AXIS2_CALL
w2c_typemapper_get_type_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
w2c_typemapper_add_typemapping_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_char_t *name);
axis2_char_t* AXIS2_CALL
w2c_typemapper_get_default_mapping_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env);
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
w2c_typemapper_get_default_qname(w2c_typemapper_t *typemapper,
const axutil_env_t *env);
@@ -90,7 +90,7 @@
axis2_bool_t AXIS2_CALL
w2c_typemapper_is_primitive(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
/************************** End of function prototypes ************************/
@@ -250,7 +250,7 @@
local_name = axis2_strdup(env, local_name);
prefix = axis2_strdup(env, prefix);
typemapper_impl-> default_qname =
- axis2_qname_create( env, local_name, uri, prefix);
+ axutil_qname_create( env, local_name, uri, prefix);
typemapper_impl-> default_type = axis2_strdup(env, type_val);
}
axutil_hash_set( typemapper_impl-> qname2name, qname2str,
@@ -331,7 +331,7 @@
}
if (typemapper_impl-> default_qname)
{
- axis2_qname_free( typemapper_impl-> default_qname, env);
+ axutil_qname_free( typemapper_impl-> default_qname, env);
}
if(typemapper->ops)
{
@@ -351,7 +351,7 @@
axis2_char_t* AXIS2_CALL
w2c_typemapper_get_parameter_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
axis2_char_t *local= NULL;
static int counter = 0;
@@ -376,7 +376,7 @@
axis2_char_t* AXIS2_CALL
w2c_typemapper_get_type_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_typemapper_impl_t *typemapper_impl = NULL;
@@ -410,7 +410,7 @@
axis2_status_t AXIS2_CALL
w2c_typemapper_add_typemapping_name(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axis2_char_t *name)
{
w2c_typemapper_impl_t *typemapper_impl = NULL;
@@ -421,7 +421,7 @@
typemapper_impl = W2C_INTF_TO_IMPL(typemapper);
- prefix = axis2_qname_get_prefix( qname, env);
+ prefix = axutil_qname_get_prefix( qname, env);
key = w2c_string_make_key_from_qname( qname, env);
key = axis2_strdup(env, key);
name = axis2_strdup(env, name);
@@ -451,7 +451,7 @@
}
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
w2c_typemapper_get_default_qname(w2c_typemapper_t *typemapper,
const axutil_env_t *env)
{
@@ -480,7 +480,7 @@
axis2_bool_t AXIS2_CALL
w2c_typemapper_is_primitive(w2c_typemapper_t *typemapper,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
w2c_typemapper_impl_t *typemapper_impl = NULL;
axis2_char_t *key = NULL;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c Fri Mar 30 12:24:00 2007
@@ -66,13 +66,13 @@
if ( index > -1 )
{
host_name =
- axis2_string_substring_starting_at ( host_name, index );
+ axutil_string_substring_starting_at ( host_name, index );
index = w2c_string_indexof ( host_name, '/');
if ( index > -1 )
{
host_name =
- axis2_string_substring_ending_at ( host_name, index);
+ axutil_string_substring_ending_at ( host_name, index);
}
}
else
@@ -131,8 +131,8 @@
}
long_path = ( axis2_char_t* )axis2_strdup(env, path);
- long_path = axis2_string_replace ( long_path, '-', '_' );
- long_path = axis2_string_replace ( long_path, ':', '_' );
+ long_path = axutil_string_replace ( long_path, '-', '_' );
+ long_path = axutil_string_replace ( long_path, ':', '_' );
for ( ptr = long_path_rev = long_path;
path_length ; ptr ++, path_length -- )
@@ -173,7 +173,7 @@
package_name = w2c_string_add_string ( package_name,
"_", env );
}
- long_path = axis2_string_replace ( long_path, '.', '_' );
+ long_path = axutil_string_replace ( long_path, '.', '_' );
package_name = w2c_string_add_string ( package_name, long_path, env );
return package_name;
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <w2c_xslt_utils.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
AXIS2_EXTERN axis2_status_t AXIS2_CALL
w2c_xslt_utils_add_attribute(
@@ -97,7 +97,7 @@
axiom_node_t *from_child = NULL;
axiom_element_t *from_child_ele = NULL;
axiom_children_iterator_t *it = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *text = NULL;
axutil_hash_t *attr_ht = NULL;
@@ -123,7 +123,7 @@
{
from_child_ele = AXIOM_NODE_GET_DATA_ELEMENT ( from_child, env );
qname = axiom_element_get_qname ( from_child_ele, env, from_child );
- qname = axis2_qname_clone ( qname, env );
+ qname = axutil_qname_clone ( qname, env );
axiom_element_create_with_qname ( env, to, qname, &to_child );
w2c_xslt_utils_copy_node_tree ( env, to_child, from_child );
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=524243&r1=524242&r2=524243
==============================================================================
--- 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 12:24:00 2007
@@ -134,7 +134,7 @@
w2c_typemapper_t *typemapper = NULL;
axutil_hash_t *types = NULL;
axis2_char_t *key = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *filename = NULL;
axis2_char_t *classname = NULL;
axutil_hash_index_t *hi = NULL;
@@ -151,7 +151,7 @@
hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, (void*)&key, NULL, (void*)&classname);
- qname = axis2_qname_create_from_string( env, key);
+ qname = axutil_qname_create_from_string( env, key);
if ( !W2C_TYPEMAPPER_IS_PRIMITIVE( typemapper, env, qname) )
{
filename = axis2_stracat(env, W2C_C_EMITTER_TYPE_PREFIX, classname);
@@ -403,13 +403,13 @@
axis2_char_t *full_name = NULL;
axis2_char_t *full_name_c = NULL;
axis2_char_t *given_name = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
qname = w2c_emitter_pick_service_name( emitter_impl, env );
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = axis2_qname_to_string(qname, env);
+ qname_str = axutil_qname_to_string(qname, env);
root = w2c_xslt_utils_add_child_node(env, "class", NULL);
full_name = axis2_strdup (env, W2C_C_EMITTER_STUB_PREFIX);
@@ -462,13 +462,13 @@
axis2_char_t *full_name = NULL;
axis2_char_t *full_name_c = NULL;
axis2_char_t *given_name = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
qname = w2c_emitter_pick_service_name( emitter_impl, env );
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = axis2_qname_to_string(qname, env);
+ qname_str = axutil_qname_to_string(qname, env);
root = w2c_xslt_utils_add_child_node(env, "interface", NULL);
full_name = axis2_strdup (env, W2C_C_EMITTER_SKEL_PREFIX);
@@ -500,13 +500,13 @@
axis2_char_t *svc_skel_name = NULL;
axis2_char_t *svc_skel_name_c = NULL;
axis2_char_t *given_name = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
qname = w2c_emitter_pick_service_name( emitter_impl, env );
given_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = axis2_qname_to_string(qname, env);
+ qname_str = axutil_qname_to_string(qname, env);
root = w2c_xslt_utils_add_child_node(env, "interface", NULL);
svc_skel_name = axis2_strdup (env, W2C_C_EMITTER_SVC_SKEL_PREFIX);
@@ -546,13 +546,13 @@
axiom_node_t *root = NULL;
axis2_char_t *svc_name = NULL;
axis2_char_t *c_svc_name = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_char_t *qname_str = NULL;
qname = w2c_emitter_pick_service_name( emitter_impl, env );
svc_name = W2C_QNAME2NAME_MAKER_SUGGEST_NAME(
emitter_impl-> qname2name_maker, env, qname);
- qname_str = axis2_qname_to_string(qname, env);
+ qname_str = axutil_qname_to_string(qname, env);
c_svc_name = emitter_impl-> name_maker_func( svc_name, env);
root = w2c_xslt_utils_add_child_node(env, "interface", NULL);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org