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/05 11:15:03 UTC
svn commit: r411722 [1/2] - in /webservices/axis2/trunk/c/xml_schema:
include/xml_schema/ src/
Author: nandika
Date: Mon Jun 5 02:15:02 2006
New Revision: 411722
URL: http://svn.apache.org/viewvc?rev=411722&view=rev
Log: (empty)
Modified:
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_collection.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj_collection.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_url_resolver.h
webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.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_extension.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h Mon Jun 5 02:15:02 2006
@@ -43,52 +43,59 @@
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_om_node_t **child_node);
-
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_om_node_t **child_node);
-
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_sibling_element(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_om_node_t **next_node);
-
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_localname(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_char_t *localname,
- axis2_om_node_t **child_node);
-
-
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_last_child_element_with_localname(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_char_t *localname,
- axis2_om_node_t **child_node);
-
-AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_next_siblng_element_with_localname(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_char_t *localname,
- axis2_om_node_t **next_node);
+axis2_om_util_get_first_child_element(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_om_node_t **child_node);
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_last_child_element(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_om_node_t **child_node);
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_next_sibling_element(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_om_node_t **next_node);
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_first_child_element_with_localname(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_char_t *localname,
+ axis2_om_node_t **child_node);
+
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
-axis2_om_util_get_first_child_element_with_uri_localname(axis2_om_element_t *ele,
- const axis2_env_t *env,
- axis2_om_node_t *ele_node,
- axis2_char_t *localname,
- axis2_char_t *uri,
- axis2_om_node_t **child_node);
+axis2_om_util_get_last_child_element_with_localname(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_char_t *localname,
+ axis2_om_node_t **child_node);
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_next_siblng_element_with_localname(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_char_t *localname,
+ axis2_om_node_t **next_node);
+
+AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
+axis2_om_util_get_first_child_element_with_uri_localname(
+ axis2_om_element_t *ele,
+ const axis2_env_t *env,
+ axis2_om_node_t *ele_node,
+ axis2_char_t *localname,
+ axis2_char_t *uri,
+ axis2_om_node_t **child_node);
AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL
axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele,
const axis2_env_t *env,
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h Mon Jun 5 02:15:02 2006
@@ -60,152 +60,184 @@
* @return status code
*/
axis2_status_t (AXIS2_CALL *
- free) (void *schema,
+ free)(
+ void *schema,
const axis2_env_t *env);
axis2_hash_t *(AXIS2_CALL *
- super_objs) (void *schema,
+ super_objs)(
+ void *schema,
const axis2_env_t *env);
axis2_xml_schema_types_t (AXIS2_CALL *
- type) (void *schema,
+ type)( void *schema,
const axis2_env_t *env);
axis2_xml_schema_annotated_t *(AXIS2_CALL *
- get_base_impl) (void *schema,
- const axis2_env_t *env);
+ get_base_impl)(
+ void *schema,
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
- get_namespace) (void *schema,
- const axis2_env_t *env,
- axis2_char_t *prefix);
+ get_namespace)(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *prefix);
struct axis2_xml_schema_form *(AXIS2_CALL *
- get_attr_form_default) (void *schema,
- const axis2_env_t *env);
+ get_attr_form_default)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_attr_form_default) (void *schema,
- const axis2_env_t *env,
- struct axis2_xml_schema_form *value);
+ set_attr_form_default)(
+ void *schema,
+ const axis2_env_t *env,
+ struct axis2_xml_schema_form *value);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
- get_attr_groups) (void *schema,
- const axis2_env_t *env);
+ get_attr_groups)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
- get_attrs) (void *schema,
- const axis2_env_t *env);
+ get_attrs)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
- get_block_default) (void *schema,
- const axis2_env_t *env);
+ get_block_default)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_block_default) (void *schema,
- const axis2_env_t *env,
- struct axis2_xml_schema_derivation_method *block_default);
+ set_block_default)(
+ void *schema,
+ const axis2_env_t *env,
+ struct axis2_xml_schema_derivation_method *block_default);
struct axis2_xml_schema_form *(AXIS2_CALL *
- get_element_form_default) (void *schema,
- const axis2_env_t *env);
+ get_element_form_default)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_element_form_default) (void *schema,
- const axis2_env_t *env,
- struct axis2_xml_schema_form *element_form_default);
+ set_element_form_default)(
+ void *schema,
+ const axis2_env_t *env,
+ struct axis2_xml_schema_form *element_form_default);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
- get_elements) (void *schema,
- const axis2_env_t *env);
+ get_elements)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_element *(AXIS2_CALL *
- get_element_by_qname) (void *schema,
- const axis2_env_t *env,
- axis2_qname_t *qname);
+ get_element_by_qname)(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
struct axis2_xml_schema_type *(AXIS2_CALL *
- get_type_by_qname) (void *schema,
- const axis2_env_t *env,
- axis2_qname_t *qname);
+ get_type_by_qname)(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
- get_final_default) (void *schema,
- const axis2_env_t *env);
+ get_final_default)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_final_default) (void *schema,
- const axis2_env_t *env,
- struct axis2_xml_schema_derivation_method *final_default);
+ set_final_default)(
+ void *schema,
+ const axis2_env_t *env,
+ struct axis2_xml_schema_derivation_method *final_default);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
- get_groups) (void *schema,
- const axis2_env_t *env);
+ get_groups)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
- get_includes) (void *schema,
- const axis2_env_t *env);
+ get_includes)(
+ void *schema,
+ const axis2_env_t *env);
axis2_bool_t (AXIS2_CALL *
- is_compiled) (void *schema,
- const axis2_env_t *env);
+ is_compiled)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
- get_items) (void *schema,
- const axis2_env_t *env);
+ get_items)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
- get_notations) (void *schema,
- const axis2_env_t *env);
+ get_notations)(
+ void *schema,
+ const axis2_env_t *env);
struct axis2_xml_schema_obj_table *(AXIS2_CALL *
- get_schema_types) (void *schema,
- const axis2_env_t *env);
+ get_schema_types)(
+ void *schema,
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
- get_target_namespace) (void *schema,
- const axis2_env_t *env);
+ get_target_namespace)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- set_target_namespace) (void *schema,
- const axis2_env_t *env,
- axis2_char_t *target_namespace);
+ set_target_namespace)(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *target_namespace);
axis2_char_t *(AXIS2_CALL *
- get_version) (void *schema,
- const axis2_env_t *env);
+ get_version)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- compile) (void *schema,
- const axis2_env_t *env);
+ compile)(void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- write_with_out) (void *schema,
- const axis2_env_t *env,
- void *outstream);
+ write_with_out)(
+ void *schema,
+ const axis2_env_t *env,
+ void *outstream);
axis2_status_t (AXIS2_CALL *
- write_with_writer) (void *schema,
- void *writer);
+ write_with_writer)(
+ void *schema,
+ void *writer);
axis2_hash_t *(AXIS2_CALL *
- get_prefix_to_namespace_map) (void *schema,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_prefix_to_namespace_map) (void *schema,
- const axis2_env_t *env,
- axis2_hash_t *map);
+ get_prefix_to_namespace_map)(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- add_type) (void *schema,
- const axis2_env_t *env,
- struct axis2_xml_schema_type *type);
-
- axis2_status_t (AXIS2_CALL *
- set_schema_ns_prefix)(void *schema,
- const axis2_env_t *env,
- axis2_char_t *ns_prefix);
+ set_prefix_to_namespace_map)(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_hash_t *map);
+
+ axis2_status_t (AXIS2_CALL *
+ add_type)(
+ void *schema,
+ const axis2_env_t *env,
+ struct axis2_xml_schema_type *type);
+
+ axis2_status_t (AXIS2_CALL *
+ set_schema_ns_prefix)(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *ns_prefix);
};
@@ -222,16 +254,6 @@
axis2_xml_schema_create(const axis2_env_t *env,
axis2_char_t *namespc,
struct axis2_xml_schema_collection *parent);
-
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- */
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_resolve_methods(
- axis2_xml_schema_t *schema,
- const axis2_env_t *env,
- axis2_xml_schema_t *schema_impl,
- axis2_hash_t *methods);
#define AXIS2_XML_SCHEMA_FREE(schema, env) \
(((axis2_xml_schema_t *) schema)->ops->\
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h Mon Jun 5 02:15:02 2006
@@ -176,16 +176,7 @@
AXIS2_EXTERN axis2_xml_schema_attribute_t * AXIS2_CALL
axis2_xml_schema_attribute_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_attribute_resolve_methods(
- axis2_xml_schema_attribute_t *attr,
- const axis2_env_t *env,
- axis2_xml_schema_attribute_t *any_impl,
- axis2_hash_t *methods);
- */
/******************************* Macros *************************************************/
#define AXIS2_XML_SCHEMA_ATTRIBUTE_FREE(attr, env) \
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_collection.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_collection.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_collection.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_collection.h Mon Jun 5 02:15:02 2006
@@ -41,11 +41,12 @@
{
#endif
-typedef struct axis2_xml_schema_collection axis2_xml_schema_collection_t;
-typedef struct axis2_xml_schema_collection_ops axis2_xml_schema_collection_ops_t;
+typedef struct axis2_xml_schema_collection
+ axis2_xml_schema_collection_t;
+typedef struct axis2_xml_schema_collection_ops
+ axis2_xml_schema_collection_ops_t;
struct axis2_xml_schema;
struct axis2_om_node;
-struct axis2_xml_schema_type_receiver;
struct axis2_xml_schema_type;
/** @defgroup axis2_xml_schema_collection Xml Schema Collection
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h Mon Jun 5 02:15:02 2006
@@ -75,14 +75,14 @@
const axis2_env_t *env,
axis2_bool_t fixed);
- void *(AXIS2_CALL *
+ axis2_char_t *(AXIS2_CALL *
get_value)(void *facet,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_value)(void *facet,
- const axis2_env_t *env,
- void *value);
+ const axis2_env_t *env,
+ axis2_char_t *value);
axis2_status_t (AXIS2_CALL *
set_facet_type)(void *facet,
@@ -106,16 +106,6 @@
axis2_bool_t fixed,
axis2_xml_schema_types_t type);
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_facet_resolve_methods(
- axis2_xml_schema_facet_t *facet,
- const axis2_env_t *env,
- axis2_xml_schema_facet_t *facet_impl,
- axis2_hash_t *methods);
-*/
AXIS2_EXTERN axis2_xml_schema_facet_t * AXIS2_CALL
axis2_xml_schema_facet_construct(const axis2_env_t *env,
axis2_om_node_t *node);
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h Mon Jun 5 02:15:02 2006
@@ -46,10 +46,6 @@
struct axis2_xml_schema_obj_ops
{
- /**
- * Deallocate memory
- * @return status code
- */
axis2_status_t (AXIS2_CALL *
free) (
void *obj,
@@ -94,8 +90,8 @@
axis2_bool_t (AXIS2_CALL *
equals) (void *obj,
- const axis2_env_t *env,
- void *obj_comp);
+ const axis2_env_t *env,
+ void *obj_comp);
};
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj_collection.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj_collection.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj_collection.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj_collection.h Mon Jun 5 02:15:02 2006
@@ -68,29 +68,29 @@
axis2_status_t (AXIS2_CALL *
set_item) (axis2_xml_schema_obj_collection_t *obj_collection,
- const axis2_env_t *env,
- int i,
- axis2_xml_schema_obj_t *item);
+ const axis2_env_t *env,
+ int i,
+ void *item);
axis2_status_t (AXIS2_CALL *
add) (axis2_xml_schema_obj_collection_t *obj_collection,
- const axis2_env_t *env,
- axis2_xml_schema_obj_t *item);
+ const axis2_env_t *env,
+ void *item);
axis2_bool_t (AXIS2_CALL *
- contains) (axis2_xml_schema_obj_collection_t *obj_collection,
- const axis2_env_t *env,
- axis2_xml_schema_obj_t *item);
+ contains)(axis2_xml_schema_obj_collection_t *obj_collection,
+ const axis2_env_t *env,
+ void *item);
axis2_status_t (AXIS2_CALL *
index_of) (axis2_xml_schema_obj_collection_t *obj_collection,
- const axis2_env_t *env,
- axis2_xml_schema_obj_t *item);
+ const axis2_env_t *env,
+ void *item);
void* (AXIS2_CALL *
- remove_at) (axis2_xml_schema_obj_collection_t *obj_collection,
- const axis2_env_t *env,
- int i);
+ remove_at)(axis2_xml_schema_obj_collection_t *obj_collection,
+ const axis2_env_t *env,
+ int i);
axis2_array_list_t* (AXIS2_CALL *
to_array)(axis2_xml_schema_obj_collection_t *obj_collection,
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h Mon Jun 5 02:15:02 2006
@@ -149,10 +149,11 @@
#define AXIS2_XML_SCHEMA_TYPE_GET_BASE_IMPL(type, env) \
(((axis2_xml_schema_type_t *) type)->ops->\
get_base_impl(type, env))
-
-#define AXIS2_XML_SCHEMA_TYPE_TYPE(type, env) \
- (((axis2_xml_schema_type_t *) type)->ops->\
- type(type, env))
+
+#define AXIS2_XML_SCHEMA_TYPE_TYPE(sch_type, env) \
+ (((axis2_xml_schema_type_t *) sch_type)->ops->\
+ type(sch_type, env))
+
#define AXIS2_XML_SCHEMA_TYPE_SUPER_OBJS(type, env) \
(((axis2_xml_schema_type_t *) type)->ops->\
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_url_resolver.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_url_resolver.h?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_url_resolver.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_url_resolver.h Mon Jun 5 02:15:02 2006
@@ -29,7 +29,7 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axis2_xml_schema_url_resolver_resolve_entity(
- axis2_env_t *env,
+ const axis2_env_t *env,
axis2_char_t *ns,
axis2_char_t *schema_location,
axis2_char_t *base_uri);
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=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Mon Jun 5 02:15:02 2006
@@ -14,22 +14,12 @@
* limitations under the License.
*/
-#include <xml_schema/axis2_xml_schema.h>
-#include <xml_schema/axis2_xml_schema_collection.h>
-#include <xml_schema/axis2_xml_schema_form.h>
-#include <xml_schema/axis2_xml_schema_obj_table.h>
-#include <xml_schema/axis2_xml_schema_derivation_method.h>
-#include <xml_schema/axis2_xml_schema_type.h>
-#include <xml_schema/axis2_xml_schema_obj_collection.h>
-#include <xml_schema/axis2_xml_schema_element.h>
+#include <xml_schema/axis2_xml_schema_includes.h>
#define AXIS2_XML_SCHEMA_DEFAULT_TARGET_NS "DEFAULT"
typedef struct axis2_xml_schema_impl axis2_xml_schema_impl_t;
-/**
- * @brief Other Extension Struct Impl
- * Axis2 Other Extension
- */
+
struct axis2_xml_schema_impl
{
axis2_xml_schema_t schema;
@@ -82,161 +72,193 @@
#define AXIS2_INTF_TO_IMPL(schema) ((axis2_xml_schema_impl_t *) schema)
axis2_status_t AXIS2_CALL
-axis2_xml_schema_free(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_free(
+ void *schema,
+ const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_super_objs(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_super_objs(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_type(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_type(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_get_base_impl(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_base_impl(
+ void *schema,
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
-axis2_xml_schema_get_namespace(void *schema,
- const axis2_env_t *env,
- axis2_char_t *prefix);
+axis2_xml_schema_get_namespace(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *prefix);
axis2_xml_schema_form_t *AXIS2_CALL
-axis2_xml_schema_get_attr_form_default(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_attr_form_default(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_attr_form_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_form_t *value);
+axis2_xml_schema_set_attr_form_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_form_t *value);
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_attr_groups(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_attr_groups(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_attrs(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_attrs(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_derivation_method_t *AXIS2_CALL
-axis2_xml_schema_get_block_default(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_block_default(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_block_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_derivation_method_t *block_default);
+axis2_xml_schema_set_block_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_derivation_method_t *block_default);
axis2_xml_schema_form_t *AXIS2_CALL
-axis2_xml_schema_get_element_form_default(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_element_form_default(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_element_form_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_form_t *element_form_default);
+axis2_xml_schema_set_element_form_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_form_t *element_form_default);
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_elements(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_elements(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_element_t *AXIS2_CALL
-axis2_xml_schema_get_element_by_qname(void *schema,
- const axis2_env_t *env,
- axis2_qname_t *qname);
+axis2_xml_schema_get_element_by_qname(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
axis2_xml_schema_type_t *AXIS2_CALL
-axis2_xml_schema_get_type_by_qname(void *schema,
- const axis2_env_t *env,
- axis2_qname_t *qname);
+axis2_xml_schema_get_type_by_qname(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_qname_t *qname);
axis2_xml_schema_derivation_method_t *AXIS2_CALL
-axis2_xml_schema_get_final_default(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_final_default(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_final_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_derivation_method_t *final_default);
+axis2_xml_schema_set_final_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_derivation_method_t *final_default);
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_groups(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_groups(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_obj_collection_t *AXIS2_CALL
-axis2_xml_schema_get_includes(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_includes(
+ void *schema,
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_xml_schema_is_compiled(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_is_compiled(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_obj_collection_t *AXIS2_CALL
-axis2_xml_schema_get_items(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_items(
+ void *schema,
+ const axis2_env_t *env);
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_notations(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_notations(
+ void *schema,
+ const axis2_env_t *env);
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_char_t *AXIS2_CALL
-axis2_xml_schema_get_target_namespace(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_target_namespace(
+ void *schema,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_target_namespace(void *schema,
- const axis2_env_t *env,
- axis2_char_t *target_namespace);
+axis2_xml_schema_set_target_namespace(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *target_namespace);
axis2_char_t *AXIS2_CALL
-axis2_xml_schema_get_version(void *schema,
- const axis2_env_t *env);
+axis2_xml_schema_get_version(
+ void *schema,
+ const axis2_env_t *env);
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);
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_status_t AXIS2_CALL
-axis2_xml_schema_write_with_writer(void *schema,
- void *writer);
+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);
+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,
- const axis2_env_t *env);
+axis2_xml_schema_get_prefix_to_namespace_map(
+ void *schema,
+ const axis2_env_t *env);
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_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_status_t AXIS2_CALL
-axis2_xml_schema_set_schema_ns_prefix(void *schema,
- const axis2_env_t *env,
- axis2_char_t *ns_prefix);
-
-
-/********************** end function prototypes ******************************/
-
+axis2_xml_schema_set_schema_ns_prefix(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *ns_prefix);
+
AXIS2_EXTERN axis2_xml_schema_t * AXIS2_CALL
axis2_xml_schema_create(const axis2_env_t *env,
@@ -358,6 +380,7 @@
axis2_xml_schema_set_schema_ns_prefix;
+
/************ create objs *******************************/
schema_impl->parent = parent;
@@ -490,8 +513,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_free(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_free(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -531,8 +555,9 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_type(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_type(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -543,8 +568,9 @@
}
axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_super_objs(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_super_objs(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -555,8 +581,9 @@
}
axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_get_base_impl(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_base_impl(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
@@ -566,211 +593,11 @@
return schema_impl->annotated;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_resolve_methods(
- axis2_xml_schema_t *schema,
- const axis2_env_t *env,
- axis2_xml_schema_t *schema_impl,
- axis2_hash_t *methods)
-{
- axis2_xml_schema_impl_t *schema_impl_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, schema_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-
- schema_impl_l = (axis2_xml_schema_impl_t *) schema_impl;
-
- schema->ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_ops_t));
- schema->ops->free = axis2_hash_get(methods, "free",
- AXIS2_HASH_KEY_STRING);
- schema->ops->super_objs = axis2_hash_get(methods, "super_objs",
- AXIS2_HASH_KEY_STRING);
- schema->ops->type = axis2_hash_get(methods, "type",
- AXIS2_HASH_KEY_STRING);
-
- schema->ops->get_namespace = axis2_hash_get(methods, "get_namespace",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_namespace)
- schema->ops->get_namespace =
- schema_impl_l->schema.ops->get_namespace;
-
- schema->ops->get_attr_form_default = axis2_hash_get(methods,
- "get_attr_form_default", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_attr_form_default)
- schema->ops->get_attr_form_default =
- schema_impl_l->schema.ops->get_attr_form_default;
-
- schema->ops->set_attr_form_default = axis2_hash_get(methods,
- "set_attr_form_default", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->set_attr_form_default)
- schema->ops->set_attr_form_default =
- schema_impl_l->schema.ops->set_attr_form_default;
-
- schema->ops->get_attr_groups = axis2_hash_get(methods,
- "get_attr_groups", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_attr_groups)
- schema->ops->get_attr_groups =
- schema_impl_l->schema.ops->get_attr_groups;
-
- schema->ops->get_attrs = axis2_hash_get(methods, "get_attrs",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_attrs)
- schema->ops->get_attrs =
- schema_impl_l->schema.ops->get_attrs;
-
- schema->ops->get_block_default = axis2_hash_get(methods, "get_block_default",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_block_default)
- schema->ops->get_block_default =
- schema_impl_l->schema.ops->get_block_default;
-
- schema->ops->set_block_default = axis2_hash_get(methods, "set_block_default",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->set_block_default)
- schema->ops->set_block_default =
- schema_impl_l->schema.ops->set_block_default;
-
- schema->ops->get_element_form_default = axis2_hash_get(methods,
- "get_element_form_default", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_element_form_default)
- schema->ops->get_element_form_default =
- schema_impl_l->schema.ops->get_element_form_default;
-
- schema->ops->set_element_form_default = axis2_hash_get(methods,
- "set_element_form_default", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->set_element_form_default)
- schema->ops->set_element_form_default =
- schema_impl_l->schema.ops->set_element_form_default;
-
- schema->ops->get_elements = axis2_hash_get(methods, "get_elements",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_elements)
- schema->ops->get_elements = schema_impl_l->schema.ops->get_elements;
-
- schema->ops->get_element_by_qname = axis2_hash_get(methods,
- "get_element_by_qname", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_element_by_qname)
- schema->ops->get_element_by_qname =
- schema_impl_l->schema.ops->get_element_by_qname;
-
- schema->ops->get_type_by_qname = axis2_hash_get(methods,
- "get_type_by_qname", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_type_by_qname)
- schema->ops->get_type_by_qname =
- schema_impl_l->schema.ops->get_type_by_qname;
-
- schema->ops->get_final_default = axis2_hash_get(methods, "get_final_default",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_final_default)
- schema->ops->get_final_default =
- schema_impl_l->schema.ops->get_final_default;
-
- schema->ops->set_final_default = axis2_hash_get(methods, "set_final_default",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->set_final_default)
- schema->ops->set_final_default =
- schema_impl_l->schema.ops->set_final_default;
-
- schema->ops->get_groups = axis2_hash_get(methods, "get_groups",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_groups)
- schema->ops->get_groups =
- schema_impl_l->schema.ops->get_groups;
-
- schema->ops->get_includes = axis2_hash_get(methods, "get_includes",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_includes)
- schema->ops->get_includes =
- schema_impl_l->schema.ops->get_includes;
-
- schema->ops->is_compiled = axis2_hash_get(methods, "is_compiled",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->is_compiled)
- schema->ops->is_compiled =
- schema_impl_l->schema.ops->is_compiled;
-
- schema->ops->get_items = axis2_hash_get(methods, "get_items",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_items)
- schema->ops->get_items =
- schema_impl_l->schema.ops->get_items;
-
- schema->ops->get_notations = axis2_hash_get(methods, "get_notations",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_notations)
- schema->ops->get_notations =
- schema_impl_l->schema.ops->get_notations;
-
- schema->ops->get_schema_types = axis2_hash_get(methods, "get_schema_types",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_schema_types)
- schema->ops->get_schema_types =
- schema_impl_l->schema.ops->get_schema_types;
-
- schema->ops->get_target_namespace = axis2_hash_get(methods,
- "get_target_namespace", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_target_namespace)
- schema->ops->get_target_namespace =
- schema_impl_l->schema.ops->get_target_namespace;
-
- schema->ops->set_target_namespace = axis2_hash_get(methods,
- "set_target_namespace", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->set_target_namespace)
- schema->ops->set_target_namespace =
- schema_impl_l->schema.ops->set_target_namespace;
-
- schema->ops->get_version = axis2_hash_get(methods, "get_version",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_version)
- schema->ops->get_version =
- schema_impl_l->schema.ops->get_version;
-
- schema->ops->compile = axis2_hash_get(methods, "compile",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->compile)
- schema->ops->compile =
- schema_impl_l->schema.ops->compile;
-
- schema->ops->write_with_out = axis2_hash_get(methods, "write_with_out",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->write_with_out)
- schema->ops->write_with_out =
- schema_impl_l->schema.ops->write_with_out;
-
- schema->ops->write_with_writer = axis2_hash_get(methods, "write_with_writer",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->write_with_writer)
- schema->ops->write_with_writer =
- schema_impl_l->schema.ops->write_with_writer;
-
- schema->ops->get_prefix_to_namespace_map = axis2_hash_get(methods,
- "get_prefix_to_namespace_map", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->get_prefix_to_namespace_map)
- schema->ops->get_prefix_to_namespace_map =
- schema_impl_l->schema.ops->get_prefix_to_namespace_map;
-
- schema->ops->set_prefix_to_namespace_map = axis2_hash_get(methods,
- "set_prefix_to_namespace_map", AXIS2_HASH_KEY_STRING);
- if(!schema->ops->set_prefix_to_namespace_map)
- schema->ops->set_prefix_to_namespace_map =
- schema_impl_l->schema.ops->set_prefix_to_namespace_map;
-
- schema->ops->add_type = axis2_hash_get(methods, "add_type",
- AXIS2_HASH_KEY_STRING);
- if(!schema->ops->add_type)
- schema->ops->add_type =
- schema_impl_l->schema.ops->add_type;
-
- return axis2_xml_schema_annotated_resolve_methods(&(schema->base),
- env, schema_impl_l->annotated, methods);
-}
-
axis2_char_t *AXIS2_CALL
-axis2_xml_schema_get_namespace(void *schema,
- const axis2_env_t *env,
- axis2_char_t *prefix)
+axis2_xml_schema_get_namespace(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_char_t *prefix)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -798,8 +625,9 @@
}
axis2_xml_schema_form_t *AXIS2_CALL
-axis2_xml_schema_get_attr_form_default(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_attr_form_default(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -817,9 +645,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_attr_form_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_form_t *value)
+axis2_xml_schema_set_attr_form_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_form_t *value)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -842,8 +671,9 @@
}
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_attr_groups(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_attr_groups(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -862,8 +692,9 @@
}
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_attrs(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_attrs(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -881,8 +712,9 @@
}
axis2_xml_schema_derivation_method_t *AXIS2_CALL
-axis2_xml_schema_get_block_default(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_block_default(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -900,9 +732,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_block_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_derivation_method_t *block_default)
+axis2_xml_schema_set_block_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_derivation_method_t *block_default)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -926,8 +759,9 @@
}
axis2_xml_schema_form_t *AXIS2_CALL
-axis2_xml_schema_get_element_form_default(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_element_form_default(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -945,9 +779,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_element_form_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_form_t *element_form_default)
+axis2_xml_schema_set_element_form_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_form_t *element_form_default)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -970,8 +805,9 @@
}
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_elements(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_elements(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -989,9 +825,10 @@
}
axis2_xml_schema_element_t *AXIS2_CALL
-axis2_xml_schema_get_element_by_qname(void *schema,
- const axis2_env_t *env,
- axis2_qname_t *qname)
+axis2_xml_schema_get_element_by_qname(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_qname_t *qname)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1014,15 +851,18 @@
}
axis2_xml_schema_type_t *AXIS2_CALL
-axis2_xml_schema_get_type_by_qname(void *schema,
- const axis2_env_t *env,
- axis2_qname_t *qname)
+axis2_xml_schema_get_type_by_qname(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_qname_t *qname)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error,qname, NULL);
+
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
+
if(NULL != ht_super)
{
schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
@@ -1039,26 +879,32 @@
}
axis2_xml_schema_derivation_method_t *AXIS2_CALL
-axis2_xml_schema_get_final_default(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_final_default(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = 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));
+
if(!schema_impl)
return NULL;
+
return schema_impl->final_default;
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_set_final_default(void *schema,
- const axis2_env_t *env,
- axis2_xml_schema_derivation_method_t *final_default)
+axis2_xml_schema_set_final_default(
+ void *schema,
+ const axis2_env_t *env,
+ axis2_xml_schema_derivation_method_t *final_default)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1066,20 +912,25 @@
ht_super = AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env);
if(!ht_super)
return AXIS2_FAILURE;
+
schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
"AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+
if(!schema_impl)
return AXIS2_FAILURE;
+
if(NULL != schema_impl->final_default)
{
+ /** TODO free */
}
schema_impl->final_default = final_default;
return AXIS2_SUCCESS;
}
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_groups(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_groups(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = NULL;
@@ -1113,49 +964,63 @@
}
axis2_bool_t AXIS2_CALL
-axis2_xml_schema_is_compiled(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_is_compiled(
+ void *schema,
+ const axis2_env_t *env)
{
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);
if(!ht_super)
return AXIS2_FAILURE;
+
schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
"AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+
if(!schema_impl)
return AXIS2_FAILURE;
+
return schema_impl->is_compiled;
}
axis2_xml_schema_obj_collection_t *AXIS2_CALL
-axis2_xml_schema_get_items(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_items(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = 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));
+
if(!schema_impl)
return NULL;
+
return schema_impl->items;
}
axis2_xml_schema_obj_table_t *AXIS2_CALL
-axis2_xml_schema_get_notations(void *schema,
- const axis2_env_t *env)
+axis2_xml_schema_get_notations(
+ void *schema,
+ const axis2_env_t *env)
{
axis2_xml_schema_impl_t *schema_impl = NULL;
axis2_hash_t *ht_super = 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));
if(!schema_impl)
@@ -1262,6 +1127,7 @@
schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
"AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+ /** TODO */
return AXIS2_SUCCESS;
}
@@ -1269,6 +1135,7 @@
axis2_xml_schema_write_with_writer(void *schema,
void *writer)
{
+ /** TODO */
return AXIS2_SUCCESS;
}
@@ -1285,6 +1152,7 @@
schema_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(ht_super,
"AXIS2_XML_SCHEMA", AXIS2_HASH_KEY_STRING));
+ /** TODO */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c?rev=411722&r1=411721&r2=411722&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c Mon Jun 5 02:15:02 2006
@@ -262,53 +262,14 @@
return any_attr_impl->annotated;
}
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_any_attribute_resolve_methods(
- axis2_xml_schema_any_attribute_t *any_attr,
- const axis2_env_t *env,
- axis2_xml_schema_any_attribute_t *any_attr_impl,
- axis2_hash_t *methods)
-{
- axis2_xml_schema_any_attribute_impl_t *any_impl_l = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, any_attr_impl, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-
- any_impl_l = (axis2_xml_schema_any_attribute_impl_t *) any_attr_impl;
-
- any_attr->ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_xml_schema_any_attribute_ops_t));
- if(NULL != any_attr->ops)
- {
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
-
- any_attr->ops->free = axis2_hash_get(methods, "free",
- AXIS2_HASH_KEY_STRING);
- any_attr->ops->get_base_impl =
- any_impl_l->any_attr.ops->get_base_impl;
- any_attr->ops->get_namespace =
- any_impl_l->any_attr.ops->get_namespace;
- any_attr->ops->set_namespace =
- any_impl_l->any_attr.ops->set_namespace;
- any_attr->ops->get_process_content =
- any_impl_l->any_attr.ops->get_process_content;
- any_attr->ops->set_process_content =
- any_impl_l->any_attr.ops->set_process_content;
-
- return axis2_xml_schema_annotated_resolve_methods(&(any_attr->base),
- env, any_impl_l->annotated, methods);
-}
-*/
axis2_char_t *AXIS2_CALL
axis2_xml_schema_any_attribute_get_namespace(void *any_attr,
const axis2_env_t *env)
{
- return AXIS2_INTF_TO_IMPL(any_attr)->ns;
+ axis2_xml_schema_any_attribute_impl_t *any_attr_impl = NULL;
+ any_attr_impl = AXIS2_INTF_TO_IMPL(any_attr);
+
+ return any_attr_impl->ns;
}
axis2_status_t AXIS2_CALL
@@ -321,12 +282,14 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
any_attr_impl = AXIS2_INTF_TO_IMPL(any_attr);
- if(!any_attr_impl->ns)
+ if(NULL != any_attr_impl->ns)
{
AXIS2_FREE(env->allocator, any_attr_impl->ns);
any_attr_impl->ns = NULL;
}
- any_attr_impl->ns = AXIS2_STRDUP(any_attr_impl->ns, env);
+
+ any_attr_impl->ns = AXIS2_STRDUP(namespc, env);
+
return AXIS2_SUCCESS;
}
@@ -337,20 +300,22 @@
return AXIS2_INTF_TO_IMPL(any_attr)->process_content;
}
+
axis2_status_t AXIS2_CALL
-axis2_xml_schema_any_attribute_set_process_content(void *any_attr,
- const axis2_env_t *env,
- axis2_xml_schema_content_processing_t *
- process_content)
+axis2_xml_schema_any_attribute_set_process_content(
+ void *any_attr,
+ const axis2_env_t *env,
+ axis2_xml_schema_content_processing_t *process_content)
{
axis2_xml_schema_any_attribute_impl_t *any_attr_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
any_attr_impl = AXIS2_INTF_TO_IMPL(any_attr);
- if(!any_attr_impl->process_content)
+ if(NULL != any_attr_impl->process_content)
{
- AXIS2_XML_SCHEMA_CONTENT_PROCESSING_FREE(any_attr_impl->process_content, env);
+ AXIS2_XML_SCHEMA_CONTENT_PROCESSING_FREE(
+ any_attr_impl->process_content, env);
any_attr_impl->process_content = NULL;
}
any_attr_impl->process_content = process_content;
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=411722&r1=411721&r2=411722&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 Mon Jun 5 02:15:02 2006
@@ -249,6 +249,8 @@
axis2_xml_schema_attribute_set_qname;
attr_impl->attr.ops->get_name =
axis2_xml_schema_attribute_get_name;
+ attr_impl->attr.ops->set_name =
+ axis2_xml_schema_attribute_set_name;
attr_impl->attr.ops->set_ref_name =
axis2_xml_schema_attribute_set_ref_name;
attr_impl->attr.ops->get_schema_type =
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org