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 na...@apache.org on 2006/06/06 09:54:37 UTC
svn commit: r412031 - in /webservices/axis2/trunk/c/xml_schema:
include/xml_schema/ samples/ src/
Author: nandika
Date: Tue Jun 6 00:54:36 2006
New Revision: 412031
URL: http://svn.apache.org/viewvc?rev=412031&view=rev
Log:
warnings removed
Added:
webservices/axis2/trunk/c/xml_schema/samples/
Modified:
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h
webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h Tue Jun 6 00:54:36 2006
@@ -46,13 +46,9 @@
struct axis2_xml_schema_group_ref_ops
{
- /**
- * Deallocate memory
- * @return status code
- */
axis2_status_t (AXIS2_CALL *
free) (void *group_ref,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_hash_t *(AXIS2_CALL *
super_objs) (
@@ -77,9 +73,9 @@
const axis2_env_t *env,
axis2_qname_t *ref_qname);
- struct axis2_xml_schema_group_base *(AXIS2_CALL *
+ void *(AXIS2_CALL *
get_particle)(void *group_ref,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_particle)(void *group_ref,
@@ -101,17 +97,6 @@
AXIS2_EXTERN axis2_xml_schema_group_ref_t * AXIS2_CALL
axis2_xml_schema_group_ref_create(const axis2_env_t *env);
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_ref_resolve_methods(
- axis2_xml_schema_group_ref_t *group_ref,
- const axis2_env_t *env,
- axis2_xml_schema_group_ref_t *group_ref_impl,
- axis2_hash_t *methods);
- */
-
/******************* Macros ******************************************************/
#define AXIS2_XML_SCHEMA_GROUP_REF_FREE(group_ref, env) \
(((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
@@ -142,7 +127,9 @@
#define AXIS2_XML_SCHEMA_GROUP_REF_SET_PARTICLE(group_ref, env, particle) \
(((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
set_particle(group_ref, env, particle))
+
/*************************** end macros ****************************************/
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Tue Jun 6 00:54:36 2006
@@ -69,7 +69,8 @@
axis2_xml_schema_collection_t *parent;
};
-#define AXIS2_INTF_TO_IMPL(schema) ((axis2_xml_schema_impl_t *) schema)
+#define AXIS2_INTF_TO_IMPL(schema) \
+ ((axis2_xml_schema_impl_t *) schema)
axis2_status_t AXIS2_CALL
axis2_xml_schema_free(
@@ -229,13 +230,13 @@
axis2_xml_schema_write_with_writer(
void *schema,
void *writer);
-
+/*
static axis2_status_t
serialize_internal(
void *schema,
const axis2_env_t *env,
void *writer);
-
+*/
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_get_prefix_to_namespace_map(
void *schema,
@@ -1029,8 +1030,9 @@
}
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_schema_types(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_schema_types(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1047,18 +1049,20 @@
}
axis2_char_t *AXIS2_CALL
-axis2_xml_schema_get_target_namespace(void *schema,
- const axis2_env_t *env)
-{ axis2_xml_schema_impl_t *schema_impl = NULL;
- axis2_hash_t *ht_super = NULL;
+axis2_xml_schema_get_target_namespace(
+ void *schema,
+ const axis2_env_t *env)
+
+{
+
+ axis2_xml_schema_impl_t *schema_impl = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
- ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
- if(!ht_super)
- return NULL;
- schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
- "AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+
+ schema_impl = AXIS2_INTF_TO_IMPL(schema);
+
if(!schema_impl)
- return NULL;
+ return NULL;
return schema_impl->target_namespace;
}
@@ -1107,38 +1111,39 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_compile(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_compile(
+ void *schema,
+ const axis2_env_t *env)
{
/** TODO */
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_write_with_out(void *schema,
- const axis2_env_t *env,
- void *outstream)
+axis2_xml_schema_write_with_out(
+ void *schema,
+ const axis2_env_t *env,
+ void *outstream)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
- axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
- schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
- "AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+ schema_impl = AXIS2_INTF_TO_IMPL(schema);
/** TODO */
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_write_with_writer(void *schema,
- void *writer)
+axis2_xml_schema_write_with_writer(
+ void *schema,
+ void *writer)
{
/** TODO */
return AXIS2_SUCCESS;
}
+/*
static axis2_status_t
serialize_internal(void *schema,
const axis2_env_t *env,
@@ -1152,15 +1157,15 @@
schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
"AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
- /** TODO */
return AXIS2_SUCCESS;
}
-
+*/
axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_get_prefix_to_namespace_map(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_prefix_to_namespace_map(
+ void *schema,
+ const axis2_env_t *env)
{
-
+
axis2_xml_schema_impl_t *schema_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
schema_impl = AXIS2_INTF_TO_IMPL(schema);
@@ -1168,14 +1173,18 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_prefix_to_namespace_map(void *schema,
- const axis2_env_t *env,
- axis2_hash_t *map)
+axis2_xml_schema_set_prefix_to_namespace_map(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_hash_t *map)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, map, AXIS2_FAILURE);
+
schema_impl = AXIS2_INTF_TO_IMPL(schema);
+
if(NULL != schema_impl->namespaces_map)
{
/** TODO */
@@ -1185,22 +1194,19 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_add_type(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_type_t *type)
+axis2_xml_schema_add_type(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_type_t *type)
{
axis2_qname_t *qname = NULL;
axis2_xml_schema_impl_t *schema_impl = NULL;
- axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, type, AXIS2_FAILURE);
- ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
-
- schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
- "AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+ schema_impl = AXIS2_INTF_TO_IMPL(schema);
qname = AXIS2_XML_SCHEMA_TYPE_GET_QNAME(type, env);
if(NULL != qname && NULL != schema_impl->schema_types)
@@ -1223,8 +1229,11 @@
axis2_char_t *ns_prefix)
{
axis2_xml_schema_impl_t *sch_impl = NULL;
+
AXIS2_PARAM_CHECK(env->error, ns_prefix, AXIS2_FAILURE);
+
sch_impl = AXIS2_INTF_TO_IMPL(schema);
+
if(NULL != sch_impl->schema_ns_prefix)
{
AXIS2_FREE(env->allocator, sch_impl->schema_ns_prefix);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c Tue Jun 6 00:54:36 2006
@@ -685,4 +685,5 @@
{
/** TODO */
return NULL;
-}
\ No newline at end of file
+}
+
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Tue Jun 6 00:54:36 2006
@@ -231,14 +231,14 @@
axis2_om_node_t *ele_node,
axis2_om_node_t *schema_node,
axis2_bool_t is_global);
-
+/*
static axis2_status_t
populate_element_namespaces(
axis2_xml_schema_builder_t *builder,
const axis2_env_t *env,
axis2_om_node_t *ele_node,
axis2_hash_t* ele_to_ns_map);
-
+*/
static axis2_xml_schema_identity_constraint_t*
handle_constraint(
axis2_xml_schema_builder_t *builder,
@@ -474,8 +474,6 @@
axis2_hash_t *namespaces = NULL;
axis2_char_t *target_ns = NULL;
- axis2_char_t *system_id = NULL;
-
/** element form default */
void *ele_form = NULL;
void *attr_form = NULL;
@@ -1314,8 +1312,6 @@
{
void *sch_union = NULL;
- axis2_array_list_t *v = NULL;
-
axis2_char_t *attr_value = NULL;
axis2_om_element_t *inline_uni_ele = NULL;
@@ -3456,7 +3452,7 @@
AXIS2_XML_SCHEMA_PARTICLE_SET_MIN_OCCURS(sch_ele, env, min_occurs);
return sch_ele;
}
-
+/*
static axis2_status_t
populate_element_namespaces(
axis2_xml_schema_builder_t *builder,
@@ -3497,7 +3493,7 @@
}
return AXIS2_SUCCESS;
}
-
+*/
static axis2_xml_schema_identity_constraint_t*
handle_constraint(
axis2_xml_schema_builder_t *builder,
@@ -4065,7 +4061,6 @@
axis2_xml_reader_t *xml_reader = NULL;
axis2_om_document_t *om_doc = NULL;
axis2_om_stax_builder_t *om_builder = NULL;
- axis2_xml_schema_collection_t *collection = NULL;
axis2_char_t *filename = NULL;
axis2_hash_t *sysid2schemas = NULL;
axis2_xml_schema_t *schema = NULL;
@@ -4102,4 +4097,4 @@
sch_builder_impl->collection , env, om_doc, base_uri);
}
-
\ No newline at end of file
+
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Tue Jun 6 00:54:36 2006
@@ -436,13 +436,10 @@
const axis2_env_t *env,
axis2_om_document_t* document)
{
- axis2_xml_schema_collection_impl_t *sch_col_impl = NULL;
axis2_xml_schema_builder_t *sch_builder = NULL;
AXIS2_PARAM_CHECK(env->error , document, NULL);
-
sch_builder = axis2_xml_schema_builder_create(env, collection);
return AXIS2_XML_SCHEMA_BUILDER_BUILD(sch_builder, env, document, NULL);
-
}
axis2_xml_schema_t * AXIS2_CALL
@@ -469,12 +466,9 @@
axis2_om_document_t *document,
axis2_char_t *uri)
{
- axis2_xml_schema_collection_impl_t *sch_col_impl = NULL;
axis2_xml_schema_builder_t *sch_builder = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error , document, NULL);
-
sch_builder = axis2_xml_schema_builder_create(env, collection);
return AXIS2_XML_SCHEMA_BUILDER_BUILD(sch_builder, env, document, uri);
}
@@ -487,15 +481,11 @@
axis2_char_t *uri)
{
axis2_xml_schema_builder_t *sch_builder = NULL;
-
AXIS2_PARAM_CHECK(env->error, node, NULL);
-
sch_builder = axis2_xml_schema_builder_create(env, collection);
-
if(!sch_builder)
return NULL;
return AXIS2_XML_SCHEMA_BUILDER_BUILD_WITH_ROOT_NODE(sch_builder, env, node, uri);
-
}
axis2_xml_schema_element_t * AXIS2_CALL
@@ -728,4 +718,4 @@
axis2_xml_schema_collection_impl_t *collection_impl = NULL;
collection_impl = AXIS2_INTF_TO_IMPL(collection);
return collection_impl->namespaces;
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Tue Jun 6 00:54:36 2006
@@ -21,7 +21,7 @@
axis2_xml_schema_complex_content_impl_t;
/**
- * @brief Other Extension Struct Impl
+ * @brief axis2_xml_schema_complex_content impl
* Axis2 Other Extension
*/
struct axis2_xml_schema_complex_content_impl
@@ -45,46 +45,55 @@
((axis2_xml_schema_complex_content_impl_t *) complex_content)
axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_free(void *complex_content,
- const axis2_env_t *env);
+axis2_xml_schema_complex_content_free(
+ void *complex_content,
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_get_base_impl(void *complex_content,
- const axis2_env_t *env);
+axis2_xml_schema_complex_content_get_base_impl(
+ void *complex_content,
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_type(void *complex_content,
- const axis2_env_t *env);
+axis2_xml_schema_complex_content_type(
+ void *complex_content,
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_complex_content_super_objs(void *complex_content,
- const axis2_env_t *env);
+axis2_xml_schema_complex_content_super_objs(
+ void *complex_content,
+ const axis2_env_t *env);
void* AXIS2_CALL
-axis2_xml_schema_complex_content_get_content(void *complex_content,
- const axis2_env_t *env);
+axis2_xml_schema_complex_content_get_content(
+ void *complex_content,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_set_content(void *complex_content,
- const axis2_env_t *env,
- void* content);
+axis2_xml_schema_complex_content_set_content(
+ void *complex_content,
+ const axis2_env_t *env,
+ void* content);
+
axis2_char_t* AXIS2_CALL
-axis2_xml_schema_complex_content_to_string(void *complex_content,
- const axis2_env_t *env,
- axis2_char_t *prefix,
- int tab);
+axis2_xml_schema_complex_content_to_string(
+ void *complex_content,
+ const axis2_env_t *env,
+ axis2_char_t *prefix,
+ int tab);
axis2_bool_t AXIS2_CALL
-axis2_xml_schema_complex_content_is_mixed(void *complex_content,
- const axis2_env_t *env);
+axis2_xml_schema_complex_content_is_mixed(
+ void *complex_content,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_set_mixed(void *complex_content,
- const axis2_env_t *env,
- axis2_bool_t mixed);
+axis2_xml_schema_complex_content_set_mixed(
+ void *complex_content,
+ const axis2_env_t *env,
+ axis2_bool_t mixed);
-/***************** end function prototypes ***********************************/
AXIS2_EXTERN axis2_xml_schema_complex_content_t * AXIS2_CALL
axis2_xml_schema_complex_content_create(const axis2_env_t *env)
@@ -92,8 +101,9 @@
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
- complex_content_impl = (axis2_xml_schema_complex_content_impl_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_complex_content_impl_t));
+ complex_content_impl = (axis2_xml_schema_complex_content_impl_t*)
+ AXIS2_MALLOC(env->allocator, sizeof(axis2_xml_schema_complex_content_impl_t));
+
if(!complex_content_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -175,7 +185,8 @@
status = axis2_xml_schema_annotated_resolve_methods(
- &(complex_content_impl->complex_content.base), env, complex_content_impl->annotated,
+ &(complex_content_impl->complex_content.base),
+ env, complex_content_impl->annotated,
complex_content_impl->methods);
return &(complex_content_impl->complex_content);
@@ -226,8 +237,9 @@
}
axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_get_base_impl(void *complex_content,
- const axis2_env_t *env)
+axis2_xml_schema_complex_content_get_base_impl(
+ void *complex_content,
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -236,64 +248,20 @@
return complex_content_impl->annotated;
}
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_resolve_methods(
- axis2_xml_schema_complex_content_t *complex_content,
- const axis2_env_t *env,
- axis2_xml_schema_complex_content_t *complex_content_impl,
- axis2_hash_t *methods)
-{
- axis2_xml_schema_complex_content_impl_t *complex_content_impl_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, complex_content_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, complex_content, AXIS2_FAILURE);
-
- complex_content_impl_l = (axis2_xml_schema_complex_content_impl_t *) complex_content_impl;
-
- complex_content->ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_complex_content_ops_t));
- if(!complex_content->ops)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- complex_content->ops->free = axis2_hash_get(methods, "free",
- AXIS2_HASH_KEY_STRING);
- complex_content->ops->get_base_impl =
- complex_content_impl_l->complex_content.ops->get_base_impl;
- complex_content->ops->get_content_type =
- complex_content_impl_l->complex_content.ops->get_content_type;
- complex_content->ops->get_content =
- complex_content_impl_l->complex_content.ops->get_content;
- complex_content->ops->set_content =
- complex_content_impl_l->complex_content.ops->set_content;
- complex_content->ops->to_string =
- complex_content_impl_l->complex_content.ops->to_string;
- complex_content->ops->is_mixed =
- complex_content_impl_l->complex_content.ops->is_mixed;
-
-
- return axis2_xml_schema_annotated_resolve_methods(&(complex_content->base),
- env, complex_content_impl_l->annotated, methods);
-}
-
-*/
-
void* AXIS2_CALL
-axis2_xml_schema_complex_content_get_content(void *complex_content,
- const axis2_env_t *env)
+axis2_xml_schema_complex_content_get_content(
+ void *complex_content,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(complex_content)->content;
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_set_content(void *complex_content,
- const axis2_env_t *env,
- void *content)
+axis2_xml_schema_complex_content_set_content(
+ void *complex_content,
+ const axis2_env_t *env,
+ void *content)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
@@ -312,12 +280,12 @@
}
axis2_char_t* AXIS2_CALL
-axis2_xml_schema_complex_content_to_string(void *complex_content,
- const axis2_env_t *env,
- axis2_char_t *prefix,
- int tab)
+axis2_xml_schema_complex_content_to_string(
+ void *complex_content,
+ const axis2_env_t *env,
+ axis2_char_t *prefix,
+ int tab)
{
- axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
axis2_char_t *xml = NULL;
axis2_char_t *temp_xml = NULL;
axis2_char_t *temp_prefix = NULL;
@@ -362,19 +330,20 @@
}
axis2_bool_t AXIS2_CALL
-axis2_xml_schema_complex_content_is_mixed(void *complex_content,
- const axis2_env_t *env)
+axis2_xml_schema_complex_content_is_mixed(
+ void *complex_content,
+ const axis2_env_t *env)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
- /** AXIS2_ENV_CHECK(env, AXIS2_FAILURE); */
complex_content_impl = AXIS2_INTF_TO_IMPL(complex_content);
return complex_content_impl->mixed;
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_set_mixed(void *complex_content,
- const axis2_env_t *env,
- axis2_bool_t mixed)
+axis2_xml_schema_complex_content_set_mixed(
+ void *complex_content,
+ const axis2_env_t *env,
+ axis2_bool_t mixed)
{
axis2_xml_schema_complex_content_impl_t *complex_content_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -384,15 +353,18 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_type(void *complex_content,
- const axis2_env_t *env)
+axis2_xml_schema_complex_content_type(
+ void *complex_content,
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_content)->obj_type;
}
axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_complex_content_super_objs(void *complex_content,
- const axis2_env_t *env)
+axis2_xml_schema_complex_content_super_objs(
+ void *complex_content,
+ const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_content)->ht_super;
-}
\ No newline at end of file
+}
+
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Tue Jun 6 00:54:36 2006
@@ -119,8 +119,6 @@
axis2_xml_schema_complex_content_extension_create(const axis2_env_t *env)
{
axis2_xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
- axis2_status_t status = AXIS2_FAILURE;
-
cmp_cnt_ext_impl = (axis2_xml_schema_complex_content_extension_impl_t*)
AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_content_extension_impl_t));
@@ -414,4 +412,4 @@
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->ht_super;
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c Tue Jun 6 00:54:36 2006
@@ -200,12 +200,12 @@
/************************** end ***********************************************/
AXIS2_EXTERN axis2_xml_schema_complex_type_t * AXIS2_CALL
-axis2_xml_schema_complex_type_create(const axis2_env_t *env,
- axis2_xml_schema_t *schema)
+axis2_xml_schema_complex_type_create(
+ const axis2_env_t *env,
+ axis2_xml_schema_t *schema)
{
axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
axis2_xml_schema_annotated_t *annotated = NULL;
- axis2_status_t status = AXIS2_FAILURE;
complex_type_impl = AXIS2_MALLOC(env->allocator,
sizeof(axis2_xml_schema_complex_type_impl_t));
@@ -393,7 +393,6 @@
axis2_xml_schema_type_resolve_methods(&(complex_type_impl->complex_type.base), env,
complex_type_impl->schema_type, complex_type_impl->methods);
-
return &(complex_type_impl->complex_type);
}
@@ -672,4 +671,4 @@
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(complex_type)->ht_super;
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c Tue Jun 6 00:54:36 2006
@@ -260,67 +260,6 @@
return group_impl->annotated;
}
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_resolve_methods(
- axis2_xml_schema_group_t *group,
- const axis2_env_t *env,
- axis2_xml_schema_group_t *group_impl,
- axis2_hash_t *methods)
-{
- axis2_xml_schema_group_impl_t *group_impl_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, group_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, group, AXIS2_FAILURE);
-
- group_impl_l = (axis2_xml_schema_group_impl_t *) group_impl;
-
- group->ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_group_ops_t));
- if(!group->ops)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- group->ops->free = axis2_hash_get(methods, "free",
- AXIS2_HASH_KEY_STRING);
- group->ops->super_objs = axis2_hash_get(methods, "super_objs",
- AXIS2_HASH_KEY_STRING);
- group->ops->type = axis2_hash_get(methods, "type",
- AXIS2_HASH_KEY_STRING);
-
- group->ops->get_name = axis2_hash_get(methods, "name",
- AXIS2_HASH_KEY_STRING);
- if(!group->ops->get_name)
- group->ops->get_name =
- group_impl_l->group.ops->get_name;
-
- group->ops->set_name = axis2_hash_get(methods, "set_name",
- AXIS2_HASH_KEY_STRING);
- if(!group->ops->set_name)
- group->ops->set_name =
- group_impl_l->group.ops->set_name;
-
- group->ops->get_particle = axis2_hash_get(methods, "get_particle",
- AXIS2_HASH_KEY_STRING);
- if(!group->ops->get_particle)
- group->ops->get_particle =
- group_impl_l->group.ops->get_particle;
-
- group->ops->set_particle = axis2_hash_get(methods, "set_particle",
- AXIS2_HASH_KEY_STRING);
- if(!group->ops->set_particle)
- group->ops->set_particle =
- group_impl_l->group.ops->set_particle;
-
- return axis2_xml_schema_annotated_resolve_methods(&(group->base),
- env, group_impl_l->annotated, methods);
-}
-
-*/
-
axis2_char_t *AXIS2_CALL
axis2_xml_schema_group_get_name(void *group,
const axis2_env_t *env)
@@ -335,14 +274,8 @@
axis2_char_t *name)
{
axis2_xml_schema_group_impl_t *group_impl = NULL;
- axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-/* super = AXIS2_XML_SCHEMA_GROUP_SUPER_OBJS(group, env);
- group_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP", AXIS2_HASH_KEY_STRING));
-*/
-
group_impl = AXIS2_INTF_TO_IMPL(group);
if(NULL != group_impl->name)
{
@@ -362,16 +295,6 @@
axis2_xml_schema_group_get_particle(void *group,
const axis2_env_t *env)
{
- /*
- axis2_xml_schema_group_impl_t *group_impl = NULL;
-
- axis2_hash_t *super = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
- super = AXIS2_XML_SCHEMA_GROUP_SUPER_OBJS(group, env);
- group_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP", AXIS2_HASH_KEY_STRING));
- */
return AXIS2_INTF_TO_IMPL(group)->particle;
}
@@ -381,24 +304,11 @@
axis2_xml_schema_group_base_t *particle)
{
axis2_xml_schema_group_impl_t *group_impl = NULL;
- /*
- axis2_hash_t *super = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
group_impl = AXIS2_INTF_TO_IMPL(group);
- AXIS2_PARAM_CHECK(env->error , particle, AXIS2_FAILURE);
- super = AXIS2_XML_SCHEMA_GROUP_SUPER_OBJS(group, env);
- group_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP", AXIS2_HASH_KEY_STRING));
- */
- group_impl = AXIS2_INTF_TO_IMPL(group);
-
if(NULL != group_impl->particle)
{
- /** TODO Free particle */
group_impl->particle = NULL;
}
group_impl->particle = particle;
return AXIS2_SUCCESS;
}
-
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c Tue Jun 6 00:54:36 2006
@@ -294,61 +294,10 @@
return group_base_impl->particle;
}
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_base_resolve_methods(
- axis2_xml_schema_group_base_t *group_base,
- const axis2_env_t *env,
- axis2_xml_schema_group_base_t *group_base_impl,
- axis2_hash_t *methods)
-{
- axis2_xml_schema_group_base_impl_t *group_base_impl_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, group_base_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-
- group_base_impl_l = (axis2_xml_schema_group_base_impl_t *) group_base_impl;
-
- group_base->ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_group_base_ops_t));
- if(!group_base->ops)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
-
- group_base->ops->free = axis2_hash_get(methods, "free",
- AXIS2_HASH_KEY_STRING);
- group_base->ops->super_objs = axis2_hash_get(methods, "super_objs",
- AXIS2_HASH_KEY_STRING);
- group_base->ops->type = axis2_hash_get(methods, "type",
- AXIS2_HASH_KEY_STRING);
-
- group_base->ops->get_items = axis2_hash_get(methods, "get_items",
- AXIS2_HASH_KEY_STRING);
- if(!group_base->ops->get_items)
- group_base->ops->get_items =
- group_base_impl_l->group_base.ops->get_items;
-
- return axis2_xml_schema_particle_resolve_methods(&(group_base->base),
- env, group_base_impl_l->particle, methods);
-}
-*/
-
-axis2_xml_schema_obj_collection_t *AXIS2_CALL
+axis2_xml_schema_obj_collection_t* AXIS2_CALL
axis2_xml_schema_group_base_get_items(void *group_base,
const axis2_env_t *env)
{
- /*
- axis2_xml_schema_group_base_impl_t *group_base_impl = NULL;
- axis2_hash_t *super = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
- super = AXIS2_XML_SCHEMA_GROUP_BASE_SUPER_OBJS(group_base, env);
- group_base_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP_BASE", AXIS2_HASH_KEY_STRING));
- */
return AXIS2_INTF_TO_IMPL(group_base)->items;
}
@@ -360,4 +309,5 @@
{
/** TODO */
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c Tue Jun 6 00:54:36 2006
@@ -22,8 +22,8 @@
axis2_xml_schema_group_ref_impl_t;
/**
- * @brief Other Extension Struct Impl
- * Axis2 Other Extension
+ * @brief axis2_xml_schema_group_ref_impl
+ *
*/
struct axis2_xml_schema_group_ref_impl
{
@@ -39,15 +39,16 @@
axis2_qname_t *ref_qname;
- axis2_xml_schema_group_base_t *particle;
+ void *particle;
};
#define AXIS2_INTF_TO_IMPL(group_ref) \
((axis2_xml_schema_group_ref_impl_t *) group_ref)
axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_ref_free(void *group_ref,
- const axis2_env_t *env);
+axis2_xml_schema_group_ref_free(
+ void *group_ref,
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
axis2_xml_schema_group_ref_super_objs(
@@ -60,27 +61,32 @@
const axis2_env_t *env);
axis2_xml_schema_particle_t *AXIS2_CALL
-axis2_xml_schema_group_ref_get_base_impl(void *group_ref,
- const axis2_env_t *env);
+axis2_xml_schema_group_ref_get_base_impl(
+ void *group_ref,
+ const axis2_env_t *env);
axis2_qname_t *AXIS2_CALL
-axis2_xml_schema_group_ref_get_ref_qname(void *group_ref,
- const axis2_env_t *env);
+axis2_xml_schema_group_ref_get_ref_qname(
+ void *group_ref,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_ref_set_ref_qname(void *group_ref,
- const axis2_env_t *env,
- axis2_qname_t *ref_qname);
+axis2_xml_schema_group_ref_set_ref_qname(
+ void *group_ref,
+ const axis2_env_t *env,
+ axis2_qname_t *ref_qname);
-axis2_xml_schema_group_base_t *AXIS2_CALL
-axis2_xml_schema_group_ref_get_particle(void *group_ref,
- const axis2_env_t *env);
+void *AXIS2_CALL
+axis2_xml_schema_group_ref_get_particle(
+ void *group_ref,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_ref_set_particle(void *group_ref,
- const axis2_env_t *env,
- axis2_xml_schema_group_base_t *particle);
-/************************** end function pointers **************************/
+axis2_xml_schema_group_ref_set_particle(
+ void *group_ref,
+ const axis2_env_t *env,
+ void *particle);
+
AXIS2_EXTERN axis2_xml_schema_group_ref_t * AXIS2_CALL
axis2_xml_schema_group_ref_create(const axis2_env_t *env)
@@ -279,67 +285,10 @@
return group_ref_impl->base;
}
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_ref_resolve_methods(
- axis2_xml_schema_group_ref_t *group_ref,
- const axis2_env_t *env,
- axis2_xml_schema_group_ref_t *group_ref_impl,
- axis2_hash_t *methods)
-{
- axis2_xml_schema_group_ref_impl_t *group_ref_impl_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, group_ref_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-
- group_ref_impl_l = (axis2_xml_schema_group_ref_impl_t *) group_ref_impl;
-
- group_ref->ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_group_ref_ops_t));
- group_ref->ops->free = axis2_hash_get(methods, "free",
- AXIS2_HASH_KEY_STRING);
- group_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
- AXIS2_HASH_KEY_STRING);
- group_ref->ops->type = axis2_hash_get(methods, "type",
- AXIS2_HASH_KEY_STRING);
-
- group_ref->ops->get_ref_qname = axis2_hash_get(methods, "get_ref_qname",
- AXIS2_HASH_KEY_STRING);
- if(!group_ref->ops->get_ref_qname)
- group_ref->ops->get_ref_qname =
- group_ref_impl_l->group_ref.ops->get_ref_qname;
-
- group_ref->ops->set_ref_qname = axis2_hash_get(methods, "set_ref_qname",
- AXIS2_HASH_KEY_STRING);
- if(!group_ref->ops->set_ref_qname)
- group_ref->ops->set_ref_qname =
- group_ref_impl_l->group_ref.ops->set_ref_qname;
-
- group_ref->ops->get_particle = axis2_hash_get(methods, "get_particle",
- AXIS2_HASH_KEY_STRING);
- if(!group_ref->ops->get_particle)
- group_ref->ops->get_particle =
- group_ref_impl_l->group_ref.ops->get_particle;
-
- return axis2_xml_schema_particle_resolve_methods(&(group_ref->base),
- env, group_ref_impl_l->base, methods);
-}
-*/
-
axis2_qname_t *AXIS2_CALL
axis2_xml_schema_group_ref_get_ref_qname(void *group_ref,
const axis2_env_t *env)
{
-/* axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
- axis2_hash_t *super = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
- super = AXIS2_XML_SCHEMA_GROUP_REF_SUPER_OBJS(group_ref, env);
- group_ref_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP_REF", AXIS2_HASH_KEY_STRING));
-*/
-
return AXIS2_INTF_TO_IMPL(group_ref)->ref_qname;
}
@@ -349,16 +298,6 @@
axis2_qname_t *ref_qname)
{
axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
- /*
- axis2_hash_t *super = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- super = AXIS2_XML_SCHEMA_GROUP_REF_SUPER_OBJS(group_ref, env);
- group_ref_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP_REF", AXIS2_HASH_KEY_STRING));
-
- */
- group_ref_impl = AXIS2_INTF_TO_IMPL(group_ref);
if(group_ref_impl->ref_qname)
{
AXIS2_QNAME_FREE(group_ref_impl->ref_qname, env);
@@ -373,26 +312,19 @@
return AXIS2_SUCCESS;
}
-axis2_xml_schema_group_base_t *AXIS2_CALL
-axis2_xml_schema_group_ref_get_particle(void *group_ref,
- const axis2_env_t *env)
+void *AXIS2_CALL
+axis2_xml_schema_group_ref_get_particle(
+ void *group_ref,
+ const axis2_env_t *env)
{
-/*
- axis2_xml_schema_group_ref_impl_t *group_ref_impl = NULL;
- axis2_hash_t *super = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
- super = AXIS2_XML_SCHEMA_GROUP_REF_SUPER_OBJS(group_ref, env);
- group_ref_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super,
- "AXIS2_XML_SCHEMA_GROUP_REF", AXIS2_HASH_KEY_STRING));
-*/
return AXIS2_INTF_TO_IMPL(group_ref)->particle;
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_ref_set_particle(void *group_ref,
- const axis2_env_t *env,
- axis2_xml_schema_group_base_t *particle)
+axis2_xml_schema_group_ref_set_particle(
+ void *group_ref,
+ const axis2_env_t *env,
+ void *particle)
{
axis2_xml_schema_group_ref_impl_t *grp_ref_impl = NULL;
@@ -404,4 +336,5 @@
}
grp_ref_impl->particle = particle;
return AXIS2_SUCCESS;
-}
+}
+
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c?rev=412031&r1=412030&r2=412031&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c Tue Jun 6 00:54:36 2006
@@ -68,7 +68,6 @@
axis2_char_t *spec)
{
axis2_char_t *modified_path = NULL;
- axis2_url_t *url = NULL;
axis2_char_t *final_path = NULL;
int length = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org