Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 91393 invoked from network); 14 Jun 2006 05:25:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Jun 2006 05:25:33 -0000 Received: (qmail 63571 invoked by uid 500); 14 Jun 2006 05:25:19 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 63443 invoked by uid 500); 14 Jun 2006 05:25:18 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 63400 invoked by uid 500); 14 Jun 2006 05:25:18 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 63282 invoked by uid 99); 14 Jun 2006 05:25:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 22:25:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 22:25:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 23A361A9866; Tue, 13 Jun 2006 22:23:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r414079 [23/26] - in /webservices/axis2/trunk/c/woden: include/ src/builder/ src/schema/ src/util/ src/wsdl20/ src/wsdl20/enumeration/ src/wsdl20/extensions/ src/wsdl20/extensions/soap/ src/wsdl20/xml/ src/xml/ test/ Date: Wed, 14 Jun 2006 05:23:21 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060614052355.23A361A9866@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: webservices/axis2/trunk/c/woden/src/wsdl20/property.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/property.c?rev=414079&r1=414078&r2=414079&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/property.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/property.c Tue Jun 13 22:23:14 2006 @@ -14,35 +14,35 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -typedef struct axis2_woden_property_impl axis2_woden_property_impl_t; +typedef struct woden_property_impl woden_property_impl_t; /** * @brief Feature Struct Impl * Axis2 Feature */ -struct axis2_woden_property_impl +struct woden_property_impl { - axis2_woden_property_t property; - axis2_woden_obj_types_t obj_type; - axis2_woden_documentable_t *documentable; + woden_property_t property; + woden_obj_types_t obj_type; + woden_documentable_t *documentable; axis2_hash_t *super; axis2_hash_t *methods; /* WSDL Component model data */ axis2_uri_t *f_ref; axis2_generic_obj_t *f_value; - axis2_woden_type_def_t *f_value_constraint; + woden_type_def_t *f_value_constraint; void *f_parent; /* XML Element data */ axis2_qname_t *f_constraint_qname; @@ -50,100 +50,100 @@ void *f_types; }; -#define INTF_TO_IMPL(property) ((axis2_woden_property_impl_t *) property) +#define INTF_TO_IMPL(property) ((woden_property_impl_t *) property) axis2_status_t AXIS2_CALL -axis2_woden_property_free( +woden_property_free( void *property, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_woden_property_super_objs( +woden_property_super_objs( void *property, const axis2_env_t *env); -axis2_woden_obj_types_t AXIS2_CALL -axis2_woden_property_type( +woden_obj_types_t AXIS2_CALL +woden_property_type( void *property, const axis2_env_t *env); -axis2_woden_documentable_t *AXIS2_CALL -axis2_woden_property_get_base_impl( +woden_documentable_t *AXIS2_CALL +woden_property_get_base_impl( void *property, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_property_set_ref( +woden_property_set_ref( void *property, const axis2_env_t *env, axis2_uri_t *ref); axis2_uri_t *AXIS2_CALL -axis2_woden_property_get_ref( +woden_property_get_ref( void *property, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_property_set_parent_element( +woden_property_set_parent_element( void *property, const axis2_env_t *env, - axis2_woden_wsdl_element_t *parent); + woden_wsdl_element_t *parent); void *AXIS2_CALL -axis2_woden_property_get_parent_element( +woden_property_get_parent_element( void *property, const axis2_env_t *env); void *AXIS2_CALL -axis2_woden_property_get_parent( +woden_property_get_parent( void *property, const axis2_env_t *env); void *AXIS2_CALL -axis2_woden_property_to_element( +woden_property_to_element( void *property, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_property_set_value( +woden_property_set_value( void *property, const axis2_env_t *env, axis2_generic_obj_t *value); void *AXIS2_CALL -axis2_woden_property_get_value( +woden_property_get_value( void *property, const axis2_env_t *env); void *AXIS2_CALL -axis2_woden_property_get_value_constraint( +woden_property_get_value_constraint( void *property, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_property_set_constraint_qname( +woden_property_set_constraint_qname( void *property, const axis2_env_t *env, axis2_qname_t *type_def); axis2_qname_t *AXIS2_CALL -axis2_woden_property_get_constraint_qname( +woden_property_get_constraint_qname( void *property, const axis2_env_t *env); void *AXIS2_CALL -axis2_woden_property_get_constraint( +woden_property_get_constraint( void *property, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_property_set_has_value_token( +woden_property_set_has_value_token( void *property, const axis2_env_t *env, axis2_bool_t b); axis2_bool_t AXIS2_CALL -axis2_woden_property_has_value_token( +woden_property_has_value_token( void *property, const axis2_env_t *env); @@ -151,247 +151,247 @@ * Non-API implementation methods * ***************************************************************************/ axis2_status_t AXIS2_CALL -axis2_woden_property_set_value_constraint( +woden_property_set_value_constraint( void *property, const axis2_env_t *env, void *type_def); axis2_status_t AXIS2_CALL -axis2_woden_property_set_types( +woden_property_set_types( void *property, const axis2_env_t *env, void *types); -static axis2_woden_property_t * +static woden_property_t * create(const axis2_env_t *env); static axis2_status_t -axis2_woden_property_free_ops( +woden_property_free_ops( void *property, const axis2_env_t *env); /************************Woden C Internal Methods******************************/ -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_property_element( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_property_element( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; + property_impl = (woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + woden_property_free_ops(property, env); property_impl->property.base.property_element.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_property_element_ops_t)); - axis2_woden_property_element_resolve_methods(&(property_impl->property.base. + sizeof(woden_property_element_ops_t)); + woden_property_element_resolve_methods(&(property_impl->property.base. property_element), env, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_nested_element( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_nested_element( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.property_element.base.nested_element.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_nested_element_ops_t)); - axis2_woden_nested_element_resolve_methods(&(property_impl->property.base. + sizeof(woden_nested_element_ops_t)); + woden_nested_element_resolve_methods(&(property_impl->property.base. property_element.base.nested_element), env, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_documentable_element( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_documentable_element( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.property_element.base.documentable_element.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_documentable_element_ops_t)); - axis2_woden_documentable_element_resolve_methods(&(property_impl->property.base. + sizeof(woden_documentable_element_ops_t)); + woden_documentable_element_resolve_methods(&(property_impl->property.base. property_element.base.documentable_element), env, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_documentable( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_documentable( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.documentable.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_documentable_ops_t)); - axis2_woden_documentable_resolve_methods(&(property_impl->property.base. + sizeof(woden_documentable_ops_t)); + woden_documentable_resolve_methods(&(property_impl->property.base. documentable), env, property_impl->documentable, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_wsdl_obj( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_wsdl_obj( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; - axis2_woden_wsdl_obj_t *wsdl_obj = NULL; + woden_property_impl_t *property_impl = NULL; + woden_wsdl_obj_t *wsdl_obj = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.documentable.base.wsdl_obj.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_wsdl_obj_ops_t)); - wsdl_obj = AXIS2_WODEN_DOCUMENTABLE_GET_BASE_IMPL( + sizeof(woden_wsdl_obj_ops_t)); + wsdl_obj = WODEN_DOCUMENTABLE_GET_BASE_IMPL( property_impl->documentable, env); - axis2_woden_wsdl_obj_resolve_methods(&(property_impl->property.base. + woden_wsdl_obj_resolve_methods(&(property_impl->property.base. documentable.base.wsdl_obj), env, wsdl_obj, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_nested_component( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_nested_component( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.nested_component.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_nested_component_ops_t)); - axis2_woden_nested_component_resolve_methods(&(property_impl->property.base. + sizeof(woden_nested_component_ops_t)); + woden_nested_component_resolve_methods(&(property_impl->property.base. nested_component), env, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_wsdl_component( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_wsdl_component( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.nested_component.wsdl_component.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_wsdl_component_ops_t)); - axis2_woden_wsdl_component_resolve_methods(&(property_impl->property.base. + sizeof(woden_wsdl_component_ops_t)); + woden_wsdl_component_resolve_methods(&(property_impl->property.base. nested_component.wsdl_component), env, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_attr_extensible( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_attr_extensible( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.documentable.base.wsdl_obj.base. wsdl_element.base.attr_extensible.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_attr_extensible_ops_t)); - axis2_woden_attr_extensible_resolve_methods(&(property_impl->property.base. + sizeof(woden_attr_extensible_ops_t)); + woden_attr_extensible_resolve_methods(&(property_impl->property.base. documentable.base.wsdl_obj.base.wsdl_element.base.attr_extensible), env, NULL, property_impl->methods); return property; } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_to_element_extensible( +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_to_element_extensible( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!property) { - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); } else - property_impl = (axis2_woden_property_impl_t *) property; - axis2_woden_property_free_ops(property, env); + property_impl = (woden_property_impl_t *) property; + woden_property_free_ops(property, env); property_impl->property.base.documentable.base.wsdl_obj.base.wsdl_element. base.element_extensible.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_element_extensible_ops_t)); - axis2_woden_element_extensible_resolve_methods(&(property_impl->property.base. + sizeof(woden_element_extensible_ops_t)); + woden_element_extensible_resolve_methods(&(property_impl->property.base. documentable.base.wsdl_obj.base.wsdl_element.base.element_extensible), env, NULL, property_impl->methods); return property; @@ -399,16 +399,16 @@ } /************************End of Woden C Internal Methods***********************/ -static axis2_woden_property_t * +static woden_property_t * create(const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); property_impl = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_property_impl_t)); + sizeof(woden_property_impl_t)); - property_impl->obj_type= AXIS2_WODEN_PROPERTY; + property_impl->obj_type= WODEN_PROPERTY; property_impl->super = NULL; property_impl->methods = NULL; property_impl->f_ref = NULL; @@ -433,19 +433,19 @@ base.element_extensible.ops = NULL; property_impl->property.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_property_ops_t)); + sizeof(woden_property_ops_t)); - property_impl->property.ops->free = axis2_woden_property_free; - property_impl->property.ops->super_objs = axis2_woden_property_super_objs; - property_impl->property.ops->type = axis2_woden_property_type; - property_impl->property.ops->get_base_impl = axis2_woden_property_get_base_impl; + property_impl->property.ops->free = woden_property_free; + property_impl->property.ops->super_objs = woden_property_super_objs; + property_impl->property.ops->type = woden_property_type; + property_impl->property.ops->get_base_impl = woden_property_get_base_impl; - property_impl->property.ops->get_ref = axis2_woden_property_get_ref; + property_impl->property.ops->get_ref = woden_property_get_ref; property_impl->property.ops->get_value_constraint = - axis2_woden_property_get_value_constraint; - property_impl->property.ops->get_value = axis2_woden_property_get_value; - property_impl->property.ops->get_parent = axis2_woden_property_get_parent; - property_impl->property.ops->to_element = axis2_woden_property_to_element; + woden_property_get_value_constraint; + property_impl->property.ops->get_value = woden_property_get_value; + property_impl->property.ops->get_parent = woden_property_get_parent; + property_impl->property.ops->to_element = woden_property_to_element; property_impl->methods = axis2_hash_make(env); if(!property_impl->methods) @@ -454,73 +454,73 @@ return NULL; } axis2_hash_set(property_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_woden_property_free); + woden_property_free); axis2_hash_set(property_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, - axis2_woden_property_super_objs); + woden_property_super_objs); axis2_hash_set(property_impl->methods, "type", - AXIS2_HASH_KEY_STRING, axis2_woden_property_type); + AXIS2_HASH_KEY_STRING, woden_property_type); axis2_hash_set(property_impl->methods, "set_ref", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_ref); + woden_property_set_ref); axis2_hash_set(property_impl->methods, "get_ref", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_ref); + woden_property_get_ref); axis2_hash_set(property_impl->methods, "set_parent_element", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_parent_element); + woden_property_set_parent_element); axis2_hash_set(property_impl->methods, "get_parent_element", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_parent_element); + woden_property_get_parent_element); axis2_hash_set(property_impl->methods, "get_parent", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_parent); + woden_property_get_parent); axis2_hash_set(property_impl->methods, "to_element", AXIS2_HASH_KEY_STRING, - axis2_woden_property_to_element); + woden_property_to_element); axis2_hash_set(property_impl->methods, "set_value", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_value); + woden_property_set_value); axis2_hash_set(property_impl->methods, "get_value", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_value); + woden_property_get_value); axis2_hash_set(property_impl->methods, "set_value_constraint", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_value_constraint); + woden_property_set_value_constraint); axis2_hash_set(property_impl->methods, "get_value_constraint", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_value_constraint); + woden_property_get_value_constraint); axis2_hash_set(property_impl->methods, "set_constraint_qname", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_constraint_qname); + woden_property_set_constraint_qname); axis2_hash_set(property_impl->methods, "get_constraint_qname", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_constraint_qname); + woden_property_get_constraint_qname); axis2_hash_set(property_impl->methods, "get_constraint", AXIS2_HASH_KEY_STRING, - axis2_woden_property_get_constraint); + woden_property_get_constraint); axis2_hash_set(property_impl->methods, "set_types", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_types); + woden_property_set_types); axis2_hash_set(property_impl->methods, "set_has_value_token", AXIS2_HASH_KEY_STRING, - axis2_woden_property_set_has_value_token); + woden_property_set_has_value_token); axis2_hash_set(property_impl->methods, "has_value_token", AXIS2_HASH_KEY_STRING, - axis2_woden_property_has_value_token); + woden_property_has_value_token); return &(property_impl->property); } -AXIS2_EXTERN axis2_woden_property_t * AXIS2_CALL -axis2_woden_property_create(const axis2_env_t *env) +AXIS2_EXTERN woden_property_t * AXIS2_CALL +woden_property_create(const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - property_impl = (axis2_woden_property_impl_t *) create(env); + property_impl = (woden_property_impl_t *) create(env); - property_impl->documentable = axis2_woden_documentable_create(env); + property_impl->documentable = woden_documentable_create(env); property_impl->super = axis2_hash_make(env); if(!property_impl->super) @@ -528,20 +528,20 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - axis2_hash_set(property_impl->super, "AXIS2_WODEN_PROPERTY", + axis2_hash_set(property_impl->super, "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING, &(property_impl->property)); - axis2_hash_set(property_impl->super, "AXIS2_WODEN_DOCUMENTABLE", + axis2_hash_set(property_impl->super, "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING, property_impl->documentable); return &(property_impl->property); } static axis2_status_t -axis2_woden_property_free_ops( +woden_property_free_ops( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); property_impl = INTF_TO_IMPL(property); @@ -622,10 +622,10 @@ axis2_status_t AXIS2_CALL -axis2_woden_property_free(void *property, +woden_property_free(void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); property_impl = INTF_TO_IMPL(property); @@ -652,11 +652,11 @@ if(property_impl->documentable) { - AXIS2_WODEN_DOCUMENTABLE_FREE(property_impl->documentable, env); + WODEN_DOCUMENTABLE_FREE(property_impl->documentable, env); property_impl->documentable = NULL; } - axis2_woden_property_free_ops(property, env); + woden_property_free_ops(property, env); if((&(property_impl->property))->ops) { @@ -673,11 +673,11 @@ } axis2_hash_t *AXIS2_CALL -axis2_woden_property_super_objs( +woden_property_super_objs( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); property_impl = INTF_TO_IMPL(property); @@ -685,12 +685,12 @@ return property_impl->super; } -axis2_woden_obj_types_t AXIS2_CALL -axis2_woden_property_type( +woden_obj_types_t AXIS2_CALL +woden_property_type( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); property_impl = INTF_TO_IMPL(property); @@ -698,11 +698,11 @@ return property_impl->obj_type; } -axis2_woden_documentable_t *AXIS2_CALL -axis2_woden_property_get_base_impl(void *property, +woden_documentable_t *AXIS2_CALL +woden_property_get_base_impl(void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; AXIS2_ENV_CHECK(env, NULL); property_impl = INTF_TO_IMPL(property); @@ -711,13 +711,13 @@ } axis2_status_t AXIS2_CALL -axis2_woden_property_resolve_methods( - axis2_woden_property_t *property, +woden_property_resolve_methods( + woden_property_t *property, const axis2_env_t *env, - axis2_woden_property_t *property_impl, + woden_property_t *property_impl, axis2_hash_t *methods) { - axis2_woden_property_impl_t *property_impl_l = NULL; + woden_property_impl_t *property_impl_l = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); @@ -764,18 +764,18 @@ } axis2_status_t AXIS2_CALL -axis2_woden_property_set_ref( +woden_property_set_ref( void *property, const axis2_env_t *env, axis2_uri_t *ref) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); if(property_impl->f_ref) { @@ -786,104 +786,104 @@ } axis2_uri_t *AXIS2_CALL -axis2_woden_property_get_ref( +woden_property_get_ref( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_ref; } axis2_status_t AXIS2_CALL -axis2_woden_property_set_parent_element( +woden_property_set_parent_element( void *property, const axis2_env_t *env, - axis2_woden_wsdl_element_t *parent) + woden_wsdl_element_t *parent) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); /*if(property_impl->f_parent) { - AXIS2_WODEN_WSDL_ELEMENT_FREE(parent, env); + WODEN_WSDL_ELEMENT_FREE(parent, env); }*/ property_impl->f_parent = parent; return AXIS2_SUCCESS; } void *AXIS2_CALL -axis2_woden_property_get_parent_element( +woden_property_get_parent_element( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_parent; } void *AXIS2_CALL -axis2_woden_property_get_parent( +woden_property_get_parent( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_parent; } void *AXIS2_CALL -axis2_woden_property_to_element( +woden_property_to_element( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return &(property_impl->property); } axis2_status_t AXIS2_CALL -axis2_woden_property_set_value( +woden_property_set_value( void *property, const axis2_env_t *env, axis2_generic_obj_t *value) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); if(property_impl->f_value) { @@ -895,38 +895,38 @@ } void *AXIS2_CALL -axis2_woden_property_get_value( +woden_property_get_value( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_value; } axis2_status_t AXIS2_CALL -axis2_woden_property_set_value_constraint( +woden_property_set_value_constraint( void *property, const axis2_env_t *env, void *type_def) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); /*if(property_impl->f_value_constraint) { - AXIS2_WODEN_TYPE_DEFINITION_FREE(property_impl->f_value_constraint, + WODEN_TYPE_DEFINITION_FREE(property_impl->f_value_constraint, env); property_impl->f_value_constraint = NULL; }*/ @@ -935,34 +935,34 @@ } void *AXIS2_CALL -axis2_woden_property_get_value_constraint( +woden_property_get_value_constraint( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_value_constraint; } axis2_status_t AXIS2_CALL -axis2_woden_property_set_constraint_qname( +woden_property_set_constraint_qname( void *property, const axis2_env_t *env, axis2_qname_t *constraint) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); if(property_impl->f_constraint_qname) { @@ -974,61 +974,61 @@ } axis2_qname_t *AXIS2_CALL -axis2_woden_property_get_constraint_qname( +woden_property_get_constraint_qname( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_constraint_qname; } void *AXIS2_CALL -axis2_woden_property_get_constraint( +woden_property_get_constraint( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; xml_schema_type_t *xst = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); if(property_impl->f_constraint_qname && property_impl->f_types) { xst = (xml_schema_type_t *) - AXIS2_WODEN_TYPES_GET_TYPE_DEFINITION(property_impl->f_types, env, + WODEN_TYPES_GET_TYPE_DEFINITION(property_impl->f_types, env, property_impl->f_constraint_qname); } return xst; } axis2_status_t AXIS2_CALL -axis2_woden_property_set_types( +woden_property_set_types( void *property, const axis2_env_t *env, void *types) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); /*if(property_impl->f_types) { - AXIS2_WODEN_TYPES_ELEMENT_FREE(property_impl->f_types, env); + WODEN_TYPES_ELEMENT_FREE(property_impl->f_types, env); property_impl->f_types = NULL; }*/ property_impl->f_types = types; @@ -1036,35 +1036,35 @@ } axis2_status_t AXIS2_CALL -axis2_woden_property_set_has_value_token( +woden_property_set_has_value_token( void *property, const axis2_env_t *env, axis2_bool_t b) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); property_impl->f_has_value_token = b; return AXIS2_SUCCESS; } axis2_bool_t AXIS2_CALL -axis2_woden_property_has_value_token( +woden_property_has_value_token( void *property, const axis2_env_t *env) { - axis2_woden_property_impl_t *property_impl = NULL; + woden_property_impl_t *property_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_PROPERTY_SUPER_OBJS(property, env); + super = WODEN_PROPERTY_SUPER_OBJS(property, env); property_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); + "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING)); return property_impl->f_has_value_token; } Modified: webservices/axis2/trunk/c/woden/src/wsdl20/svc.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/svc.c?rev=414079&r1=414078&r2=414079&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/svc.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/svc.c Tue Jun 13 22:23:14 2006 @@ -14,24 +14,24 @@ * limitations under the License. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -typedef struct axis2_woden_svc_impl axis2_woden_svc_impl_t; +typedef struct woden_svc_impl woden_svc_impl_t; /** * @brief Service Struct Impl * Axis2 Service */ -struct axis2_woden_svc_impl +struct woden_svc_impl { - axis2_woden_svc_t svc; - axis2_woden_obj_types_t obj_type; - axis2_woden_configurable_t *configurable; + woden_svc_t svc; + woden_obj_types_t obj_type; + woden_configurable_t *configurable; axis2_hash_t *super; axis2_hash_t *methods; axis2_qname_t *f_qname; @@ -40,25 +40,25 @@ axis2_array_list_t *f_endpoints; }; -#define INTF_TO_IMPL(svc) ((axis2_woden_svc_impl_t *) svc) +#define INTF_TO_IMPL(svc) ((woden_svc_impl_t *) svc) axis2_status_t AXIS2_CALL -axis2_woden_svc_free( +woden_svc_free( void *svc, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_woden_svc_super_objs( +woden_svc_super_objs( void *svc, const axis2_env_t *env); -axis2_woden_obj_types_t AXIS2_CALL -axis2_woden_svc_type( +woden_obj_types_t AXIS2_CALL +woden_svc_type( void *svc, const axis2_env_t *env); -axis2_woden_configurable_t *AXIS2_CALL -axis2_woden_svc_get_base_impl( +woden_configurable_t *AXIS2_CALL +woden_svc_get_base_impl( void *svc, const axis2_env_t *env); /* ************************************************************ @@ -66,17 +66,17 @@ * ************************************************************/ axis2_qname_t *AXIS2_CALL -axis2_woden_svc_get_qname( +woden_svc_get_qname( void *svc, const axis2_env_t *env); void *AXIS2_CALL -axis2_woden_svc_get_interface( +woden_svc_get_interface( void *svc, const axis2_env_t *env); axis2_array_list_t *AXIS2_CALL -axis2_woden_svc_get_endpoints( +woden_svc_get_endpoints( void *svc, const axis2_env_t *env); /* ************************************************************ @@ -84,35 +84,35 @@ * ************************************************************/ axis2_status_t AXIS2_CALL -axis2_woden_svc_set_qname( +woden_svc_set_qname( void *svc, const axis2_env_t *env, axis2_qname_t *qname); axis2_status_t AXIS2_CALL -axis2_woden_svc_set_interface_qname( +woden_svc_set_interface_qname( void *svc, const axis2_env_t *env, axis2_qname_t *interface_qname); axis2_qname_t *AXIS2_CALL -axis2_woden_svc_get_interface_qname( +woden_svc_get_interface_qname( void *svc, const axis2_env_t *env); void *AXIS2_CALL -axis2_woden_svc_get_interface_element( +woden_svc_get_interface_element( void *svc, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_svc_add_endpoint_element( +woden_svc_add_endpoint_element( void *svc, const axis2_env_t *env, void *endpoint); axis2_array_list_t *AXIS2_CALL -axis2_woden_svc_get_endpoint_elements( +woden_svc_get_endpoint_elements( void *svc, const axis2_env_t *env); @@ -121,250 +121,250 @@ *****************************************************************************/ axis2_status_t AXIS2_CALL -axis2_woden_svc_set_interface_element( +woden_svc_set_interface_element( void *svc, const axis2_env_t *env, void *interface); -static axis2_woden_svc_t * +static woden_svc_t * create(const axis2_env_t *env); static axis2_status_t -axis2_woden_svc_free_ops( +woden_svc_free_ops( void *svc, const axis2_env_t *env); /************************Woden C Internal Methods******************************/ -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_svc_element( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_svc_element( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.svc_element.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_svc_element_ops_t)); - axis2_woden_svc_element_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_svc_element_ops_t)); + woden_svc_element_resolve_methods(&(svc_impl->svc.base. svc_element), env, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_documentable_element( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_documentable_element( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.svc_element.base.documentable_element.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_documentable_element_ops_t)); - axis2_woden_documentable_element_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_documentable_element_ops_t)); + woden_documentable_element_resolve_methods(&(svc_impl->svc.base. svc_element.base.documentable_element), env, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_configurable( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_configurable( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.configurable.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_configurable_ops_t)); - axis2_woden_configurable_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_configurable_ops_t)); + woden_configurable_resolve_methods(&(svc_impl->svc.base. configurable), env, svc_impl->configurable, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_configurable_component( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_configurable_component( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.configurable_component.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_configurable_component_ops_t)); - axis2_woden_configurable_component_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_configurable_component_ops_t)); + woden_configurable_component_resolve_methods(&(svc_impl->svc.base. configurable_component), env, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_wsdl_component( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_wsdl_component( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.configurable_component.wsdl_component.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_wsdl_component_ops_t)); - axis2_woden_wsdl_component_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_wsdl_component_ops_t)); + woden_wsdl_component_resolve_methods(&(svc_impl->svc.base. configurable_component.wsdl_component), env, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_configurable_element( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_configurable_element( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.svc_element.base.configurable_element.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_configurable_element_ops_t)); - axis2_woden_configurable_element_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_configurable_element_ops_t)); + woden_configurable_element_resolve_methods(&(svc_impl->svc.base. svc_element.base.configurable_element), env, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_documentable( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_documentable( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base. configurable.base.documentable.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_documentable_ops_t)); - axis2_woden_documentable_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_documentable_ops_t)); + woden_documentable_resolve_methods(&(svc_impl->svc.base. configurable.base.documentable), env, NULL, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_attr_extensible( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_attr_extensible( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.svc_element.base.documentable_element. wsdl_element.base.attr_extensible.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_attr_extensible_ops_t)); - axis2_woden_attr_extensible_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_attr_extensible_ops_t)); + woden_attr_extensible_resolve_methods(&(svc_impl->svc.base. svc_element.base.documentable_element.wsdl_element.base. attr_extensible), env, NULL, svc_impl->methods); return svc; } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_to_element_extensible( +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_to_element_extensible( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if(!svc) { - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); } else - svc_impl = (axis2_woden_svc_impl_t *) svc; + svc_impl = (woden_svc_impl_t *) svc; - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); svc_impl->svc.base.svc_element.base.documentable_element. wsdl_element.base.element_extensible.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_element_extensible_ops_t)); - axis2_woden_element_extensible_resolve_methods(&(svc_impl->svc.base. + sizeof(woden_element_extensible_ops_t)); + woden_element_extensible_resolve_methods(&(svc_impl->svc.base. svc_element.base.documentable_element.wsdl_element.base. element_extensible), env, NULL, svc_impl->methods); return svc; @@ -372,16 +372,16 @@ /************************End of Woden C Internal Methods***********************/ -static axis2_woden_svc_t * +static woden_svc_t * create(const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); svc_impl = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_svc_impl_t)); + sizeof(woden_svc_impl_t)); - svc_impl->obj_type= AXIS2_WODEN_SVC; + svc_impl->obj_type= WODEN_SVC; svc_impl->super = NULL; svc_impl->methods = NULL; svc_impl->f_qname = NULL; @@ -405,19 +405,19 @@ documentable_element.wsdl_element.base.element_extensible.ops = NULL; svc_impl->svc.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_svc_ops_t)); + sizeof(woden_svc_ops_t)); - svc_impl->svc.ops->free = axis2_woden_svc_free; - svc_impl->svc.ops->super_objs = axis2_woden_svc_super_objs; - svc_impl->svc.ops->type = axis2_woden_svc_type; - svc_impl->svc.ops->get_base_impl = axis2_woden_svc_get_base_impl; + svc_impl->svc.ops->free = woden_svc_free; + svc_impl->svc.ops->super_objs = woden_svc_super_objs; + svc_impl->svc.ops->type = woden_svc_type; + svc_impl->svc.ops->get_base_impl = woden_svc_get_base_impl; - svc_impl->svc.ops->get_qname = axis2_woden_svc_get_qname; - svc_impl->svc.ops->get_interface = axis2_woden_svc_get_interface; + svc_impl->svc.ops->get_qname = woden_svc_get_qname; + svc_impl->svc.ops->get_interface = woden_svc_get_interface; svc_impl->svc.ops->get_endpoints = - axis2_woden_svc_get_endpoints; + woden_svc_get_endpoints; svc_impl->svc.ops->set_interface_element = - axis2_woden_svc_set_interface_element; + woden_svc_set_interface_element; svc_impl->methods = axis2_hash_make(env); if(!svc_impl->methods) @@ -426,55 +426,55 @@ return NULL; } axis2_hash_set(svc_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_free); + woden_svc_free); axis2_hash_set(svc_impl->methods, "super_objs", - AXIS2_HASH_KEY_STRING, axis2_woden_svc_super_objs); + AXIS2_HASH_KEY_STRING, woden_svc_super_objs); axis2_hash_set(svc_impl->methods, "type", - AXIS2_HASH_KEY_STRING, axis2_woden_svc_type); + AXIS2_HASH_KEY_STRING, woden_svc_type); axis2_hash_set(svc_impl->methods, "get_qname", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_get_qname); + woden_svc_get_qname); axis2_hash_set(svc_impl->methods, "get_interface", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_get_interface); + woden_svc_get_interface); axis2_hash_set(svc_impl->methods, "get_endpoints", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_get_endpoints); + woden_svc_get_endpoints); axis2_hash_set(svc_impl->methods, "set_qname", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_set_qname); + woden_svc_set_qname); axis2_hash_set(svc_impl->methods, "set_interface_qname", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_set_interface_qname); + woden_svc_set_interface_qname); axis2_hash_set(svc_impl->methods, "get_interface_qname", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_get_interface_qname); + woden_svc_get_interface_qname); axis2_hash_set(svc_impl->methods, "get_interface_element", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_get_interface_element); + woden_svc_get_interface_element); axis2_hash_set(svc_impl->methods, "add_endpoint_element", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_add_endpoint_element); + woden_svc_add_endpoint_element); axis2_hash_set(svc_impl->methods, "get_endpoint_elements", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_get_endpoint_elements); + woden_svc_get_endpoint_elements); axis2_hash_set(svc_impl->methods, "set_interface_element", AXIS2_HASH_KEY_STRING, - axis2_woden_svc_set_interface_element); + woden_svc_set_interface_element); return &(svc_impl->svc); } -AXIS2_EXTERN axis2_woden_svc_t * AXIS2_CALL -axis2_woden_svc_create(const axis2_env_t *env) +AXIS2_EXTERN woden_svc_t * AXIS2_CALL +woden_svc_create(const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - svc_impl = (axis2_woden_svc_impl_t *) create(env); + svc_impl = (woden_svc_impl_t *) create(env); - svc_impl->configurable = axis2_woden_configurable_create(env); + svc_impl->configurable = woden_configurable_create(env); svc_impl->super = axis2_hash_make(env); if(!svc_impl->super) @@ -482,20 +482,20 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - axis2_hash_set(svc_impl->super, "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING, + axis2_hash_set(svc_impl->super, "WODEN_SVC", AXIS2_HASH_KEY_STRING, &(svc_impl->svc)); - axis2_hash_set(svc_impl->super, "AXIS2_WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING, + axis2_hash_set(svc_impl->super, "WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING, svc_impl->configurable); return &(svc_impl->svc); } static axis2_status_t -axis2_woden_svc_free_ops( +woden_svc_free_ops( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); svc_impl = INTF_TO_IMPL(svc); @@ -581,10 +581,10 @@ axis2_status_t AXIS2_CALL -axis2_woden_svc_free(void *svc, +woden_svc_free(void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); svc_impl = INTF_TO_IMPL(svc); @@ -603,7 +603,7 @@ if(svc_impl->f_interface) { - AXIS2_WODEN_INTERFACE_FREE(svc_impl->f_interface, env); + WODEN_INTERFACE_FREE(svc_impl->f_interface, env); svc_impl->f_interface = NULL; } @@ -629,11 +629,11 @@ if(svc_impl->configurable) { - AXIS2_WODEN_NESTED_CONFIGURABLE_FREE(svc_impl->configurable, env); + WODEN_NESTED_CONFIGURABLE_FREE(svc_impl->configurable, env); svc_impl->configurable = NULL; } - axis2_woden_svc_free_ops(svc, env); + woden_svc_free_ops(svc, env); if((&(svc_impl->svc))->ops) { @@ -650,11 +650,11 @@ } axis2_hash_t *AXIS2_CALL -axis2_woden_svc_super_objs( +woden_svc_super_objs( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); svc_impl = INTF_TO_IMPL(svc); @@ -662,12 +662,12 @@ return svc_impl->super; } -axis2_woden_obj_types_t AXIS2_CALL -axis2_woden_svc_type( +woden_obj_types_t AXIS2_CALL +woden_svc_type( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); svc_impl = INTF_TO_IMPL(svc); @@ -675,12 +675,12 @@ return svc_impl->obj_type; } -axis2_woden_configurable_t *AXIS2_CALL -axis2_woden_svc_get_base_impl( +woden_configurable_t *AXIS2_CALL +woden_svc_get_base_impl( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; AXIS2_ENV_CHECK(env, NULL); svc_impl = INTF_TO_IMPL(svc); @@ -689,13 +689,13 @@ } axis2_status_t AXIS2_CALL -axis2_woden_svc_resolve_methods( - axis2_woden_svc_t *svc, +woden_svc_resolve_methods( + woden_svc_t *svc, const axis2_env_t *env, - axis2_woden_svc_t *svc_impl, + woden_svc_t *svc_impl, axis2_hash_t *methods) { - axis2_woden_svc_impl_t *svc_impl_l = NULL; + woden_svc_impl_t *svc_impl_l = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); @@ -739,49 +739,49 @@ * ************************************************************/ axis2_qname_t *AXIS2_CALL -axis2_woden_svc_get_qname( +woden_svc_get_qname( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); return svc_impl->f_qname; } void *AXIS2_CALL -axis2_woden_svc_get_interface( +woden_svc_get_interface( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); return svc_impl->f_interface; } axis2_array_list_t *AXIS2_CALL -axis2_woden_svc_get_endpoints( +woden_svc_get_endpoints( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); return svc_impl->f_endpoints; } @@ -790,18 +790,18 @@ * ************************************************************/ axis2_status_t AXIS2_CALL -axis2_woden_svc_set_qname( +woden_svc_set_qname( void *svc, const axis2_env_t *env, axis2_qname_t *qname) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); if(svc_impl->f_qname) { @@ -812,18 +812,18 @@ } axis2_status_t AXIS2_CALL -axis2_woden_svc_set_interface_qname( +woden_svc_set_interface_qname( void *svc, const axis2_env_t *env, axis2_qname_t *interface_qname) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); if(svc_impl->f_interface_qname) { @@ -835,50 +835,50 @@ } axis2_qname_t *AXIS2_CALL -axis2_woden_svc_get_interface_qname( +woden_svc_get_interface_qname( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); return svc_impl->f_interface_qname; } void *AXIS2_CALL -axis2_woden_svc_get_interface_element( +woden_svc_get_interface_element( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); return svc_impl->f_interface; } axis2_status_t AXIS2_CALL -axis2_woden_svc_add_endpoint_element( +woden_svc_add_endpoint_element( void *svc, const axis2_env_t *env, void *endpoint) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); if(!svc_impl->f_endpoints) { @@ -894,17 +894,17 @@ } axis2_array_list_t *AXIS2_CALL -axis2_woden_svc_get_endpoint_elements( +woden_svc_get_endpoint_elements( void *svc, const axis2_env_t *env) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, NULL); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); return svc_impl->f_endpoints; } @@ -913,18 +913,18 @@ *****************************************************************************/ axis2_status_t AXIS2_CALL -axis2_woden_svc_set_interface_element( +woden_svc_set_interface_element( void *svc, const axis2_env_t *env, void *interface) { - axis2_woden_svc_impl_t *svc_impl = NULL; + woden_svc_impl_t *svc_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_SVC_SUPER_OBJS(svc, env); + super = WODEN_SVC_SUPER_OBJS(svc, env); svc_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_SVC", AXIS2_HASH_KEY_STRING)); + "WODEN_SVC", AXIS2_HASH_KEY_STRING)); if(svc_impl->f_interface) { Modified: webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c?rev=414079&r1=414078&r2=414079&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c Tue Jun 13 22:23:14 2006 @@ -14,21 +14,21 @@ * limitations under the License. */ -#include -#include -#include -#include +#include +#include +#include +#include -typedef struct axis2_woden_type_def_impl axis2_woden_type_def_impl_t; +typedef struct woden_type_def_impl woden_type_def_impl_t; /** * @brief Type Definition Struct Impl * Axis2 Type Definition */ -struct axis2_woden_type_def_impl +struct woden_type_def_impl { - axis2_woden_type_def_t type_def; - axis2_woden_obj_types_t obj_type; + woden_type_def_t type_def; + woden_obj_types_t obj_type; axis2_hash_t *super; axis2_hash_t *methods; axis2_qname_t *f_qname; @@ -37,95 +37,95 @@ axis2_generic_obj_t *f_content; }; -#define INTF_TO_IMPL(type_def) ((axis2_woden_type_def_impl_t *) type_def) +#define INTF_TO_IMPL(type_def) ((woden_type_def_impl_t *) type_def) axis2_status_t AXIS2_CALL -axis2_woden_type_def_free( +woden_type_def_free( void *type_def, const axis2_env_t *env); axis2_hash_t *AXIS2_CALL -axis2_woden_type_def_super_objs( +woden_type_def_super_objs( void *type_def, const axis2_env_t *env); -axis2_woden_obj_types_t AXIS2_CALL -axis2_woden_type_def_type( +woden_obj_types_t AXIS2_CALL +woden_type_def_type( void *type_def, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_qname( +woden_type_def_set_qname( void *type_def, const axis2_env_t *env, axis2_qname_t *qname); axis2_qname_t *AXIS2_CALL -axis2_woden_type_def_get_qname( +woden_type_def_get_qname( void *type_def, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_system( +woden_type_def_set_system( void *type_def, const axis2_env_t *env, axis2_uri_t *type_system_uri); axis2_uri_t *AXIS2_CALL -axis2_woden_type_def_get_system( +woden_type_def_get_system( void *type_def, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_content_model( +woden_type_def_set_content_model( void *type_def, const axis2_env_t *env, axis2_char_t *content_model); axis2_char_t *AXIS2_CALL -axis2_woden_type_def_get_content_model( +woden_type_def_get_content_model( void *type_def, const axis2_env_t *env); axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_content( +woden_type_def_set_content( void *type_def, const axis2_env_t *env, void *type_def_content); void *AXIS2_CALL -axis2_woden_type_def_get_content( +woden_type_def_get_content( void *type_def, const axis2_env_t *env); -static axis2_woden_type_def_t * +static woden_type_def_t * create(const axis2_env_t *env); -static axis2_woden_type_def_t * +static woden_type_def_t * create(const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); type_def_impl = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_type_def_impl_t)); + sizeof(woden_type_def_impl_t)); type_def_impl->super = NULL; type_def_impl->methods = NULL; - type_def_impl->obj_type = AXIS2_WODEN_TYPE_DEF; + type_def_impl->obj_type = WODEN_TYPE_DEF; type_def_impl->f_qname = NULL; type_def_impl->f_system = NULL; type_def_impl->f_content_model = NULL; type_def_impl->f_content = NULL; type_def_impl->type_def.ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_type_def_ops_t)); + sizeof(woden_type_def_ops_t)); - type_def_impl->type_def.ops->free = axis2_woden_type_def_free; + type_def_impl->type_def.ops->free = woden_type_def_free; type_def_impl->type_def.ops->super_objs = - axis2_woden_type_def_super_objs; - type_def_impl->type_def.ops->type = axis2_woden_type_def_type; + woden_type_def_super_objs; + type_def_impl->type_def.ops->type = woden_type_def_type; type_def_impl->methods = axis2_hash_make(env); if(!type_def_impl->methods) @@ -134,40 +134,40 @@ return NULL; } axis2_hash_set(type_def_impl->methods, "free", AXIS2_HASH_KEY_STRING, - axis2_woden_type_def_free); + woden_type_def_free); axis2_hash_set(type_def_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, - axis2_woden_type_def_super_objs); + woden_type_def_super_objs); axis2_hash_set(type_def_impl->methods, "type", AXIS2_HASH_KEY_STRING, - axis2_woden_type_def_type); + woden_type_def_type); axis2_hash_set(type_def_impl->methods, "set_qname", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_set_qname); + AXIS2_HASH_KEY_STRING, woden_type_def_set_qname); axis2_hash_set(type_def_impl->methods, "get_qname", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_get_qname); + AXIS2_HASH_KEY_STRING, woden_type_def_get_qname); axis2_hash_set(type_def_impl->methods, "set_system", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_set_system); + AXIS2_HASH_KEY_STRING, woden_type_def_set_system); axis2_hash_set(type_def_impl->methods, "get_system", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_get_system); + AXIS2_HASH_KEY_STRING, woden_type_def_get_system); axis2_hash_set(type_def_impl->methods, "set_content_model", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_set_content_model); + AXIS2_HASH_KEY_STRING, woden_type_def_set_content_model); axis2_hash_set(type_def_impl->methods, "get_content_model", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_get_content_model); + AXIS2_HASH_KEY_STRING, woden_type_def_get_content_model); axis2_hash_set(type_def_impl->methods, "set_content", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_set_content); + AXIS2_HASH_KEY_STRING, woden_type_def_set_content); axis2_hash_set(type_def_impl->methods, "get_content", - AXIS2_HASH_KEY_STRING, axis2_woden_type_def_get_content); + AXIS2_HASH_KEY_STRING, woden_type_def_get_content); return &(type_def_impl->type_def); } -AXIS2_EXTERN axis2_woden_type_def_t * AXIS2_CALL -axis2_woden_type_def_create( +AXIS2_EXTERN woden_type_def_t * AXIS2_CALL +woden_type_def_create( const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - type_def_impl = (axis2_woden_type_def_impl_t *) create(env); + type_def_impl = (woden_type_def_impl_t *) create(env); type_def_impl->super = axis2_hash_make(env); if(!type_def_impl->super) @@ -175,18 +175,18 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - axis2_hash_set(type_def_impl->super, "AXIS2_WODEN_TYPE_DEF", + axis2_hash_set(type_def_impl->super, "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING, &(type_def_impl->type_def)); return &(type_def_impl->type_def); } axis2_status_t AXIS2_CALL -axis2_woden_type_def_free( +woden_type_def_free( void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); type_def_impl = INTF_TO_IMPL(type_def); @@ -224,11 +224,11 @@ } axis2_hash_t *AXIS2_CALL -axis2_woden_type_def_super_objs( +woden_type_def_super_objs( void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); type_def_impl = INTF_TO_IMPL(type_def); @@ -236,11 +236,11 @@ return type_def_impl->super; } -axis2_woden_obj_types_t AXIS2_CALL -axis2_woden_type_def_type(void *type_def, +woden_obj_types_t AXIS2_CALL +woden_type_def_type(void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); type_def_impl = INTF_TO_IMPL(type_def); @@ -249,20 +249,20 @@ } axis2_status_t AXIS2_CALL -axis2_woden_type_def_resolve_methods( - axis2_woden_type_def_t *type_def, +woden_type_def_resolve_methods( + woden_type_def_t *type_def, const axis2_env_t *env, - axis2_woden_type_def_t *type_def_impl, + woden_type_def_t *type_def_impl, axis2_hash_t *methods) { - axis2_woden_type_def_impl_t *type_def_impl_l = NULL; + woden_type_def_impl_t *type_def_impl_l = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); type_def_impl_l = INTF_TO_IMPL (type_def_impl); type_def->ops = AXIS2_MALLOC(env->allocator, - sizeof(axis2_woden_type_def_ops_t)); + sizeof(woden_type_def_ops_t)); type_def->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); @@ -323,19 +323,19 @@ } axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_qname( +woden_type_def_set_qname( void *type_def, const axis2_env_t *env, axis2_qname_t *qname) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); if(type_def_impl->f_qname) { @@ -347,35 +347,35 @@ } axis2_qname_t *AXIS2_CALL -axis2_woden_type_def_get_qname( +woden_type_def_get_qname( void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); return type_def_impl->f_qname; } axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_system( +woden_type_def_set_system( void *type_def, const axis2_env_t *env, axis2_uri_t *type_system_uri) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, type_system_uri, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); if(type_def_impl->f_system) { @@ -386,35 +386,35 @@ } axis2_uri_t *AXIS2_CALL -axis2_woden_type_def_get_system( +woden_type_def_get_system( void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); return type_def_impl->f_system; } axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_content_model( +woden_type_def_set_content_model( void *type_def, const axis2_env_t *env, axis2_char_t *content_model) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, content_model, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); if(type_def_impl->f_content_model) { @@ -425,35 +425,35 @@ } axis2_char_t *AXIS2_CALL -axis2_woden_type_def_get_content_model( +woden_type_def_get_content_model( void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); return type_def_impl->f_content_model; } axis2_status_t AXIS2_CALL -axis2_woden_type_def_set_content( +woden_type_def_set_content( void *type_def, const axis2_env_t *env, void *type_def_content) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, type_def, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); if(type_def_impl->f_content) { @@ -464,17 +464,17 @@ } void *AXIS2_CALL -axis2_woden_type_def_get_content( +woden_type_def_get_content( void *type_def, const axis2_env_t *env) { - axis2_woden_type_def_impl_t *type_def_impl = NULL; + woden_type_def_impl_t *type_def_impl = NULL; axis2_hash_t *super = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - super = AXIS2_WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); + super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env); type_def_impl = INTF_TO_IMPL(axis2_hash_get(super, - "AXIS2_WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); + "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING)); return type_def_impl->f_content; } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org