From shortkevin@example.net Thu Jun 01 08:10:35 2006 Return-Path: <shortkevin@example.net> Delivered-To: shortkevin@example.net Received: (qmail 92243 invoked from network); 1 Jun 2006 08:10:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2006 08:10:34 -0000 Received: (qmail 31480 invoked by uid 500); 1 Jun 2006 08:10:32 -0000 Delivered-To: shortkevin@example.net Received: (qmail 31384 invoked by uid 500); 1 Jun 2006 08:10:31 -0000 Mailing-List: contact shortkevin@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shortkevin@example.net> list-unsubscribe: <mailto:shortkevin@example.net> List-Post: <mailto:shortkevin@example.net> List-Id: <axis-cvs.ws.apache.org> Delivered-To: mailing list shortkevin@example.net Received: (qmail 31373 invoked by uid 500); 1 Jun 2006 08:10:31 -0000 Delivered-To: shortkevin@example.net Received: (qmail 31370 invoked by uid 99); 1 Jun 2006 08:10:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 01:10:31 -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 [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 01:10:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 27B5C1A983A; Thu, 1 Jun 2006 01:10:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410786 - in /webservices/axis2/trunk/c/woden: include/woden/wsdl20/extensions/ include/woden/wsdl20/xml/ src/wsdl20/xml/ Date: Thu, 01 Jun 2006 08:10:02 -0000 To: shortkevin@example.net From: shortkevin@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <shortkevin@example.net> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Thu Jun 1 01:09:59 2006 New Revision: 410786 URL: http://svn.apache.org/viewvc?rev=410786&view=rev Log: To free methods are no longer needed. Removed them Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h Thu Jun 1 01:09:59 2006 @@ -39,6 +39,7 @@ #include <axis2_const.h> #include <axis2_hash.h> #include <axis2_qname.h> +#include <woden/axis2_woden.h> #ifdef __cplusplus extern "C" @@ -65,6 +66,12 @@ free) (void *ext_element, const axis2_env_t *env); + axis2_woden_obj_types_t (AXIS2_CALL * + type) ( + void *ext_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * set_ext_type) (void *ext_element, const axis2_env_t *env, @@ -98,13 +105,17 @@ * of the child class */ AXIS2_EXTERN axis2_status_t AXIS2_CALL -axis2_woden_ext_element_resolve_methods(axis2_woden_ext_element_t *ext_element, - const axis2_env_t *env, - axis2_woden_ext_element_t *ext_element_impl, - axis2_hash_t *methods); +axis2_woden_ext_element_resolve_methods( + axis2_woden_ext_element_t *ext_element, + const axis2_env_t *env, + axis2_hash_t *methods); #define AXIS2_WODEN_EXT_ELEMENT_FREE(ext_element, env) \ (((axis2_woden_ext_element_t *) ext_element)->ops->free (ext_element, env)) + +#define AXIS2_WODEN_EXT_ELEMENT_ELEMENT_TYPE(ext_element, env) \ + (((axis2_woden_ext_element_t *) ext_element)->ops->\ + type (ext_element, env)) #define AXIS2_WODEN_EXT_ELEMENT_SET_EXT_TYPE(ext_element, env, qname) \ (((axis2_woden_ext_element_t *) ext_element)->ops->set_ext_type(ext_element, env, \ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h Thu Jun 1 01:09:59 2006 @@ -61,16 +61,6 @@ void *binding_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_binding_element_free) ( - void *binding_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *binding_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *binding_element, @@ -190,10 +180,6 @@ #define AXIS2_WODEN_BINDING_ELEMENT_FREE(binding_element, env) \ (((axis2_woden_binding_element_t *) binding_element)->ops->\ free (binding_element, env)) - -#define AXIS2_WODEN_BINDING_ELEMENT_TO_BINDING_ELEMENT_FREE(binding_element, env) \ - (((axis2_woden_binding_element_t *) binding_element)->ops->\ - to_binding_element_free (binding_element, env)) #define AXIS2_WODEN_BINDING_ELEMENT_SUPER_OBJS(binding_element, env) \ (((axis2_woden_binding_element_t *) binding_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h Thu Jun 1 01:09:59 2006 @@ -62,16 +62,6 @@ void *binding_fault_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_binding_fault_element_free) ( - void *binding_fault_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *binding_fault_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *binding_fault_element, Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h Thu Jun 1 01:09:59 2006 @@ -63,16 +63,6 @@ void *binding_fault_ref_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_binding_fault_ref_element_free) ( - void *binding_fault_ref_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *binding_fault_ref_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *binding_fault_ref_element, @@ -148,14 +138,6 @@ #define AXIS2_WODEN_BINDING_FAULT_REF_ELEMENT_FREE(binding_fault_ref_element, env) \ (((axis2_woden_binding_fault_ref_element_t *) binding_fault_ref_element)->ops->\ free (binding_fault_ref_element, env)) - -#define AXIS2_WODEN_BINDING_FAULT_REF_ELEMENT_TO_BINDING_FAULT_REF_ELEMENT_FREE(binding_fault_ref_element, env) \ - (((axis2_woden_binding_fault_ref_element_t *) binding_fault_ref_element)->ops->\ - to_binding_fault_ref_element_free (binding_fault_ref_element, env)) - -#define AXIS2_WODEN_BINDING_FAULT_REF_ELEMENT_SUPER_OBJS(binding_fault_ref_element, env) \ - (((axis2_woden_binding_fault_ref_element_t *) binding_fault_ref_element)->ops->\ - super_objs (binding_fault_ref_element, env)) #define AXIS2_WODEN_BINDING_FAULT_REF_ELEMENT_TYPE(binding_fault_ref_element, env) \ (((axis2_woden_binding_fault_ref_element_t *) binding_fault_ref_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h Thu Jun 1 01:09:59 2006 @@ -63,16 +63,6 @@ void *binding_msg_ref_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_binding_msg_ref_element_free) ( - void *binding_msg_ref_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *binding_msg_ref_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *binding_msg_ref_element, @@ -131,14 +121,6 @@ #define AXIS2_WODEN_BINDING_MSG_REF_ELEMENT_FREE(binding_msg_ref_element, env) \ (((axis2_woden_binding_msg_ref_element_t *) binding_msg_ref_element)->ops->\ free (binding_msg_ref_element, env)) - -#define AXIS2_WODEN_BINDING_MSG_REF_ELEMENT_TO_BINDING_MSG_REF_ELEMENT_FREE(binding_msg_ref_element, env) \ - (((axis2_woden_binding_msg_ref_element_t *) binding_msg_ref_element)->ops->\ - to_binding_msg_ref_element_free (binding_msg_ref_element, env)) - -#define AXIS2_WODEN_BINDING_MSG_REF_ELEMENT_SUPER_OBJS(binding_msg_ref_element, env) \ - (((axis2_woden_binding_msg_ref_element_t *) binding_msg_ref_element)->ops->\ - super_objs (binding_msg_ref_element, env)) #define AXIS2_WODEN_BINDING_MSG_REF_ELEMENT_TYPE(binding_msg_ref_element, env) \ (((axis2_woden_binding_msg_ref_element_t *) binding_msg_ref_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h Thu Jun 1 01:09:59 2006 @@ -63,16 +63,6 @@ void *binding_op_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_binding_op_element_free) ( - void *binding_op_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *binding_op_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *binding_op_element, @@ -171,14 +161,6 @@ #define AXIS2_WODEN_BINDING_OP_ELEMENT_FREE(binding_op_element, env) \ (((axis2_woden_binding_op_element_t *) binding_op_element)->ops->\ free (binding_op_element, env)) - -#define AXIS2_WODEN_BINDING_OP_ELEMENT_TO_BINDING_OP_ELEMENT_FREE(binding_op_element, env) \ - (((axis2_woden_binding_op_element_t *) binding_op_element)->ops->\ - to_binding_op_element_free (binding_op_element, env)) - -#define AXIS2_WODEN_BINDING_OP_ELEMENT_SUPER_OBJS(binding_op_element, env) \ - (((axis2_woden_binding_op_element_t *) binding_op_element)->ops->\ - super_objs (binding_op_element, env)) #define AXIS2_WODEN_BINDING_OP_ELEMENT_TYPE(binding_op_element, env) \ (((axis2_woden_binding_op_element_t *) binding_op_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h Thu Jun 1 01:09:59 2006 @@ -71,11 +71,6 @@ void *conf_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_configurable_element_free) ( - void *conf_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *conf_el, @@ -123,11 +118,6 @@ #define AXIS2_WODEN_CONFIGURABLE_ELEMENT_FREE(conf_el, env) \ (((axis2_woden_configurable_element_t *) conf_el)->ops->\ free (conf_el, env)) - -#define AXIS2_WODEN_CONFIGURABLE_ELEMENT_TO_CONFIGURABLE_ELEMENT_FREE(conf_el, \ - env) \ - (((axis2_woden_configurable_element_t *) conf_el)->ops->\ - to_configurable_element_free (conf_el, env)) #define AXIS2_WODEN_CONFIGURABLE_ELEMENT_TYPE(conf_el, env) \ (((axis2_woden_configurable_element_t *) conf_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h Thu Jun 1 01:09:59 2006 @@ -68,11 +68,6 @@ void *desc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_desc_element_free) ( - void *desc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) (void *desc_el, const axis2_env_t *env); @@ -352,10 +347,6 @@ #define AXIS2_WODEN_DESC_ELEMENT_FREE(desc_el, env) \ (((axis2_woden_desc_element_t *) desc_el)->ops->\ free (desc_el, env)) - -#define AXIS2_WODEN_DESC_ELEMENT_TO_DESC_ELEMENT_FREE(desc_el, env) \ - (((axis2_woden_desc_element_t *) desc_el)->ops->\ - to_desc_element_free (desc_el, env)) #define AXIS2_WODEN_DESC_ELEMENT_TYPE(desc_el, env) \ (((axis2_woden_desc_element_t *) desc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h Thu Jun 1 01:09:59 2006 @@ -63,11 +63,6 @@ void *doc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_documentable_element_free) ( - void *doc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *doc_el, @@ -101,11 +96,6 @@ #define AXIS2_WODEN_DOCUMENTABLE_ELEMENT_FREE(doc_el, env) \ (((axis2_woden_documentable_element_t *) doc_el)->ops->\ free (doc_el, env)) - -#define AXIS2_WODEN_DOCUMENTABLE_ELEMENT_TO_DOCUMENTABLE_ELEMENT_FREE(doc_el, \ - env) \ - (((axis2_woden_documentable_element_t *) doc_el)->ops->\ - to_documentable_element_free (doc_el, env)) #define AXIS2_WODEN_DOCUMENTABLE_ELEMENT_TYPE(doc_el, env) \ (((axis2_woden_documentable_element_t *) doc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h Thu Jun 1 01:09:59 2006 @@ -63,11 +63,6 @@ void *doc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_documentation_element_free) ( - void *doc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) (void *doc_el, const axis2_env_t *env); @@ -100,11 +95,6 @@ #define AXIS2_WODEN_DOCUMENTATION_ELEMENT_FREE(doc_el, env) \ (((axis2_woden_documentation_element_t *) doc_el)->ops->\ free (doc_el, env)) - -#define AXIS2_WODEN_DOCUMENTATION_ELEMENT_TO_DOCUMENTATION_ELEMENT_FREE(doc_el, \ - env) \ - (((axis2_woden_documentation_element_t *) doc_el)->ops->\ - to_documentation_element_free (doc_el, env)) #define AXIS2_WODEN_DOCUMENTATION_ELEMENT_TYPE(doc_el, env) \ (((axis2_woden_documentation_element_t *) doc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h Thu Jun 1 01:09:59 2006 @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef AXIS2_WODEN_SVC_ELEMENT_H -#define AXIS2_WODEN_SVC_ELEMENT_H +#ifndef AXIS2_WODEN_ENDPOINT_ELEMENT_H +#define AXIS2_WODEN_ENDPOINT_ELEMENT_H /** * @file axis2_woden_endpoint_element.h @@ -64,11 +64,6 @@ void *endpoint_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_endpoint_element_free) ( - void *endpoint_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *endpoint_el, @@ -135,43 +130,39 @@ axis2_hash_t *methods); /************************End of Woden C Internal Methods***********************/ -#define AXIS2_WODEN_SVC_ELEMENT_FREE(endpoint_el, env) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_FREE(endpoint_el, env) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ free (endpoint_el, env)) -#define AXIS2_WODEN_SVC_ELEMENT_TO_SVC_ELEMENT_FREE(endpoint_el, env) \ - (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ - to_endpoint_element_free (endpoint_el, env)) - -#define AXIS2_WODEN_SVC_ELEMENT_TYPE(endpoint_el, env) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_TYPE(endpoint_el, env) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ type (endpoint_el, env)) -#define AXIS2_WODEN_SVC_ELEMENT_SET_NAME(endpoint_el, env, name) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_SET_NAME(endpoint_el, env, name) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ set_name(endpoint_el, env, name)) -#define AXIS2_WODEN_SVC_ELEMENT_GET_NAME(endpoint_el, env) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_GET_NAME(endpoint_el, env) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ get_name(endpoint_el, env)) -#define AXIS2_WODEN_SVC_ELEMENT_SET_BINDING_QNAME(endpoint_el, env, qname) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_SET_BINDING_QNAME(endpoint_el, env, qname) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ set_binding_qname(endpoint_el, env, qname)) -#define AXIS2_WODEN_SVC_ELEMENT_GET_BINDING_QNAME(endpoint_el, env) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_GET_BINDING_QNAME(endpoint_el, env) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ get_binding_qname(endpoint_el, env)) -#define AXIS2_WODEN_SVC_ELEMENT_GET_BINDING_ELEMENT(endpoint_el, env) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_GET_BINDING_ELEMENT(endpoint_el, env) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ get_binding_element(endpoint_el, env)) -#define AXIS2_WODEN_SVC_ELEMENT_SET_ADDRESS(endpoint_el, env, uri) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_SET_ADDRESS(endpoint_el, env, uri) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ set_address(endpoint_el, env, uri)) -#define AXIS2_WODEN_SVC_ELEMENT_GET_ADDRESS(endpoint_el, env) \ +#define AXIS2_WODEN_ENDPOINT_ELEMENT_GET_ADDRESS(endpoint_el, env) \ (((axis2_woden_endpoint_element_t *) endpoint_el)->ops->\ get_address(endpoint_el, env)) @@ -179,4 +170,4 @@ #ifdef __cplusplus } #endif -#endif /* AXIS2_WODEN_SVC_ELEMENT_H */ +#endif /* AXIS2_WODEN_ENDPOINT_ELEMENT_H */ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h Thu Jun 1 01:09:59 2006 @@ -61,11 +61,6 @@ void *doc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_feature_element_free) ( - void *doc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) (void *doc_el, const axis2_env_t *env); @@ -113,10 +108,6 @@ #define AXIS2_WODEN_FEATURE_ELEMENT_FREE(doc_el, env) \ (((axis2_woden_feature_element_t *) doc_el)->ops->\ free (doc_el, env)) - -#define AXIS2_WODEN_FEATURE_ELEMENT_TO_FEATURE_ELEMENT_FREE(doc_el, env) \ - (((axis2_woden_feature_element_t *) doc_el)->ops->\ - to_feature_element_free (doc_el, env)) #define AXIS2_WODEN_FEATURE_ELEMENT_TYPE(doc_el, env) \ (((axis2_woden_feature_element_t *) doc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h Thu Jun 1 01:09:59 2006 @@ -63,11 +63,6 @@ void *import_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_import_element_free) ( - void *import_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) (void *import_el, const axis2_env_t *env); @@ -120,17 +115,6 @@ #define AXIS2_WODEN_IMPORT_ELEMENT_FREE(import_el, env) \ (((axis2_woden_import_element_t *) import_el)->ops->\ free (import_el, env)) - -#define AXIS2_WODEN_IMPORT_ELEMENT_TO_IMPORT_ELEMENT_FREE(import_el, env) \ - (((axis2_woden_import_element_t *) import_el)->ops->\ - to_import_element_free (import_el, env)) -#define AXIS2_WODEN_IMPORT_ELEMENT_FREE(import_el, env) \ - (((axis2_woden_import_element_t *) import_el)->ops->\ - free (import_el, env)) - -#define AXIS2_WODEN_IMPORT_ELEMENT_TO_IMPORT_ELEMENT_FREE(import_el, env) \ - (((axis2_woden_import_element_t *) import_el)->ops->\ - to_import_element_free (import_el, env)) #define AXIS2_WODEN_IMPORT_ELEMENT_TYPE(import_el, env) \ (((axis2_woden_import_element_t *) import_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h Thu Jun 1 01:09:59 2006 @@ -63,11 +63,6 @@ void *include_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_include_element_free) ( - void *include_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) (void *include_el, const axis2_env_t *env); @@ -110,10 +105,6 @@ #define AXIS2_WODEN_INCLUDE_ELEMENT_FREE(include_el, env) \ (((axis2_woden_include_element_t *) include_el)->ops->\ free (include_el, env)) - -#define AXIS2_WODEN_INCLUDE_ELEMENT_TO_INCLUDE_ELEMENT_FREE(include_el, env) \ - (((axis2_woden_include_element_t *) include_el)->ops->\ - to_include_element_free (include_el, env)) #define AXIS2_WODEN_INCLUDE_ELEMENT_TYPE(include_el, env) \ (((axis2_woden_include_element_t *) include_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h Thu Jun 1 01:09:59 2006 @@ -65,16 +65,6 @@ void *interface_fault_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_interface_fault_element_free) ( - void *interface_fault_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *interface_fault_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *interface_fault_element, @@ -159,14 +149,6 @@ #define AXIS2_WODEN_INTERFACE_FAULT_ELEMENT_FREE(interface_fault_element, env) \ (((axis2_woden_interface_fault_element_t *) interface_fault_element)->ops->\ free (interface_fault_element, env)) - -#define AXIS2_WODEN_INTERFACE_FAULT_ELEMENT_TO_INTERFACE_FAULT_ELEMENT_FREE(interface_fault_element, env) \ - (((axis2_woden_interface_fault_element_t *) interface_fault_element)->ops->\ - to_interface_fault_element_free (interface_fault_element, env)) - -#define AXIS2_WODEN_INTERFACE_FAULT_ELEMENT_SUPER_OBJS(interface_fault_element, env) \ - (((axis2_woden_interface_fault_element_t *) interface_fault_element)->ops->\ - super_objs (interface_fault_element, env)) #define AXIS2_WODEN_INTERFACE_FAULT_ELEMENT_TYPE(interface_fault_element, env) \ (((axis2_woden_interface_fault_element_t *) interface_fault_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h Thu Jun 1 01:09:59 2006 @@ -65,16 +65,6 @@ void *interface_fault_ref_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_interface_fault_ref_element_free) ( - void *interface_fault_ref_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *interface_fault_ref_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *interface_fault_ref_element, @@ -149,14 +139,6 @@ #define AXIS2_WODEN_INTERFACE_FAULT_REF_ELEMENT_FREE(interface_fault_ref_element, env) \ (((axis2_woden_interface_fault_ref_element_t *) interface_fault_ref_element)->ops->\ free (interface_fault_ref_element, env)) - -#define AXIS2_WODEN_INTERFACE_FAULT_REF_ELEMENT_TO_INTERFACE_FAULT_REF_ELEMENT_FREE(interface_fault_ref_element, env) \ - (((axis2_woden_interface_fault_ref_element_t *) interface_fault_ref_element)->ops->\ - to_interface_fault_ref_element_free (interface_fault_ref_element, env)) - -#define AXIS2_WODEN_INTERFACE_FAULT_REF_ELEMENT_SUPER_OBJS(interface_fault_ref_element, env) \ - (((axis2_woden_interface_fault_ref_element_t *) interface_fault_ref_element)->ops->\ - super_objs (interface_fault_ref_element, env)) #define AXIS2_WODEN_INTERFACE_FAULT_REF_ELEMENT_TYPE(interface_fault_ref_element, env) \ (((axis2_woden_interface_fault_ref_element_t *) interface_fault_ref_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h Thu Jun 1 01:09:59 2006 @@ -63,16 +63,6 @@ void *interface_msg_ref_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_interface_msg_ref_element_free) ( - void *interface_msg_ref_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *interface_msg_ref_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *interface_msg_ref_element, @@ -175,14 +165,6 @@ #define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_FREE(interface_msg_ref_element, env) \ (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\ free (interface_msg_ref_element, env)) - -#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_TO_INTERFACE_MSG_REF_ELEMENT_FREE(interface_msg_ref_element, env) \ - (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\ - to_interface_msg_ref_element_free (interface_msg_ref_element, env)) - -#define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_SUPER_OBJS(interface_msg_ref_element, env) \ - (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\ - super_objs (interface_msg_ref_element, env)) #define AXIS2_WODEN_INTERFACE_MSG_REF_ELEMENT_TYPE(interface_msg_ref_element, env) \ (((axis2_woden_interface_msg_ref_element_t *) interface_msg_ref_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h Thu Jun 1 01:09:59 2006 @@ -65,16 +65,6 @@ void *interface_op_element, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_interface_op_element_free) ( - void *interface_op_element, - const axis2_env_t *env); - - axis2_hash_t *(AXIS2_CALL * - super_objs) ( - void *interface_op_element, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *interface_op_element, @@ -184,14 +174,6 @@ #define AXIS2_WODEN_INTERFACE_OP_ELEMENT_FREE(interface_op_element, env) \ (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\ free (interface_op_element, env)) - -#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_TO_INTERFACE_OP_ELEMENT_FREE(interface_op_element, env) \ - (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\ - to_interface_op_element_free (interface_op_element, env)) - -#define AXIS2_WODEN_INTERFACE_OP_ELEMENT_SUPER_OBJS(interface_op_element, env) \ - (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\ - super_objs (interface_op_element, env)) #define AXIS2_WODEN_INTERFACE_OP_ELEMENT_TYPE(interface_op_element, env) \ (((axis2_woden_interface_op_element_t *) interface_op_element)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h Thu Jun 1 01:09:59 2006 @@ -67,11 +67,6 @@ void *doc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_nested_element_free) ( - void *doc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *doc_el, @@ -107,10 +102,6 @@ #define AXIS2_WODEN_NESTED_ELEMENT_FREE(doc_el, env) \ (((axis2_woden_nested_element_t *) doc_el)->ops->\ free (doc_el, env)) - -#define AXIS2_WODEN_NESTED_ELEMENT_TO_NESTED_ELEMENT_FREE(doc_el, env) \ - (((axis2_woden_nested_element_t *) doc_el)->ops->\ - to_nested_element_free (doc_el, env)) #define AXIS2_WODEN_NESTED_ELEMENT_TYPE(doc_el, env) \ (((axis2_woden_nested_element_t *) doc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h Thu Jun 1 01:09:59 2006 @@ -72,11 +72,6 @@ void *doc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_property_element_free) ( - void *doc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *doc_el, @@ -183,10 +178,6 @@ #define AXIS2_WODEN_PROPERTY_ELEMENT_FREE(doc_el, env) \ (((axis2_woden_property_element_t *) doc_el)->ops->\ free (doc_el, env)) - -#define AXIS2_WODEN_PROPERTY_ELEMENT_TO_PROPERTY_ELEMENT_FREE(doc_el, env) \ - (((axis2_woden_property_element_t *) doc_el)->ops->\ - to_property_element_free (doc_el, env)) #define AXIS2_WODEN_PROPERTY_ELEMENT_TYPE(doc_el, env) \ (((axis2_woden_property_element_t *) doc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h Thu Jun 1 01:09:59 2006 @@ -63,11 +63,6 @@ void *svc_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_svc_element_free) ( - void *svc_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) ( void *svc_el, @@ -137,10 +132,6 @@ #define AXIS2_WODEN_SVC_ELEMENT_FREE(svc_el, env) \ (((axis2_woden_svc_element_t *) svc_el)->ops->\ free (svc_el, env)) - -#define AXIS2_WODEN_SVC_ELEMENT_TO_SVC_ELEMENT_FREE(svc_el, env) \ - (((axis2_woden_svc_element_t *) svc_el)->ops->\ - to_svc_element_free (svc_el, env)) #define AXIS2_WODEN_SVC_ELEMENT_TYPE(svc_el, env) \ (((axis2_woden_svc_element_t *) svc_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h Thu Jun 1 01:09:59 2006 @@ -71,11 +71,6 @@ void *types_el, const axis2_env_t *env); - axis2_status_t (AXIS2_CALL * - to_types_element_free) ( - void *types_el, - const axis2_env_t *env); - axis2_woden_obj_types_t (AXIS2_CALL * type) (void *types_el, const axis2_env_t *env); @@ -188,10 +183,6 @@ #define AXIS2_WODEN_TYPES_ELEMENT_FREE(types_el, env) \ (((axis2_woden_types_element_t *) types_el)->ops->\ free (types_el, env)) - -#define AXIS2_WODEN_TYPES_ELEMENT_TO_TYPES_ELEMENT_FREE(types_el, env) \ - (((axis2_woden_types_element_t *) types_el)->ops->\ - to_types_element_free (types_el, env)) #define AXIS2_WODEN_TYPES_ELEMENT_TYPE(types_el, env) \ (((axis2_woden_types_element_t *) types_el)->ops->\ Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ binding_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - binding_element->ops->to_binding_element_free = - axis2_hash_get(methods, "to_binding_element_free", - AXIS2_HASH_KEY_STRING); binding_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ binding_fault_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - binding_fault_element->ops->to_binding_fault_element_free = - axis2_hash_get(methods, "to_binding_fault_element_free", - AXIS2_HASH_KEY_STRING); binding_fault_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_fault_ref_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ binding_fault_ref_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - binding_fault_ref_element->ops->to_binding_fault_ref_element_free = - axis2_hash_get(methods, "to_binding_fault_ref_element_free", - AXIS2_HASH_KEY_STRING); binding_fault_ref_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_msg_ref_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ binding_msg_ref_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - binding_msg_ref_element->ops->to_binding_msg_ref_element_free = - axis2_hash_get(methods, "to_binding_msg_ref_element_free", - AXIS2_HASH_KEY_STRING); binding_msg_ref_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/binding_op_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ binding_op_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - binding_op_element->ops->to_binding_op_element_free = - axis2_hash_get(methods, "to_binding_op_element_free", - AXIS2_HASH_KEY_STRING); binding_op_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/configurable_element.c Thu Jun 1 01:09:59 2006 @@ -27,10 +27,9 @@ configurable_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - configurable_element->ops->to_configurable_element_free = axis2_hash_get(methods, - "to_configurable_element_free", AXIS2_HASH_KEY_STRING); configurable_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); + configurable_element->ops->add_feature_element = axis2_hash_get(methods, "add_feature_element", AXIS2_HASH_KEY_STRING); configurable_element->ops->get_feature_elements = axis2_hash_get(methods, Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/desc_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ desc_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - desc_element->ops->to_desc_element_free = axis2_hash_get(methods, - "to_desc_element_free", AXIS2_HASH_KEY_STRING); desc_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentable_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ documentable_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - documentable_element->ops->to_documentable_element_free = - axis2_hash_get(methods, "to_documentable_element_free", - AXIS2_HASH_KEY_STRING); documentable_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); documentable_element->ops->add_documentation_element = Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/documentation_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ documentation_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - documentation_element->ops->to_documentation_element_free = - axis2_hash_get(methods, "to_documentation_element_free", - AXIS2_HASH_KEY_STRING); documentation_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); documentation_element->ops->set_content = Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/endpoint_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ endpoint_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - endpoint_element->ops->to_endpoint_element_free = axis2_hash_get(methods, - "to_endpoint_element_free", AXIS2_HASH_KEY_STRING); endpoint_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); endpoint_element->ops->set_name = axis2_hash_get(methods, Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/fault_ref_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ interface_fault_ref_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - interface_fault_ref_element->ops->to_interface_fault_ref_element_free = - axis2_hash_get(methods, "to_interface_fault_ref_element_free", - AXIS2_HASH_KEY_STRING); interface_fault_ref_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/feature_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ feature_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - feature_element->ops->to_feature_element_free = axis2_hash_get(methods, - "to_feature_element_free", AXIS2_HASH_KEY_STRING); feature_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); feature_element->ops->set_ref = axis2_hash_get(methods, Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/import_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ import_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - import_element->ops->to_import_element_free = axis2_hash_get(methods, - "to_import_element_free", AXIS2_HASH_KEY_STRING); import_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/include_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ include_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - include_element->ops->to_include_element_free = axis2_hash_get(methods, - "to_include_element_free", AXIS2_HASH_KEY_STRING); include_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ interface_fault_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - interface_fault_element->ops->to_interface_fault_element_free = - axis2_hash_get(methods, "to_interface_fault_element_free", - AXIS2_HASH_KEY_STRING); interface_fault_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_fault_ref_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ interface_fault_ref_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - interface_fault_ref_element->ops->to_interface_fault_ref_element_free = - axis2_hash_get(methods, "to_interface_fault_ref_element_free", - AXIS2_HASH_KEY_STRING); interface_fault_ref_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_msg_ref_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ interface_msg_ref_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - interface_msg_ref_element->ops->to_interface_msg_ref_element_free = - axis2_hash_get(methods, "to_interface_msg_ref_element_free", - AXIS2_HASH_KEY_STRING); interface_msg_ref_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/interface_op_element.c Thu Jun 1 01:09:59 2006 @@ -27,9 +27,6 @@ interface_op_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - interface_op_element->ops->to_interface_op_element_free = - axis2_hash_get(methods, "to_interface_op_element_free", - AXIS2_HASH_KEY_STRING); interface_op_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/nested_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ nested_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - nested_element->ops->to_nested_element_free = axis2_hash_get(methods, - "to_nested_element_free", AXIS2_HASH_KEY_STRING); nested_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); nested_element->ops->set_parent_element = axis2_hash_get(methods, Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/property_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ property_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - property_element->ops->to_property_element_free = axis2_hash_get(methods, - "to_property_element_free", AXIS2_HASH_KEY_STRING); property_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); property_element->ops->set_ref = axis2_hash_get(methods, Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/svc_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ svc_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - svc_element->ops->to_svc_element_free = axis2_hash_get(methods, - "to_svc_element_free", AXIS2_HASH_KEY_STRING); svc_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); svc_element->ops->set_qname = axis2_hash_get(methods, Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c?rev=410786&r1=410785&r2=410786&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/types_element.c Thu Jun 1 01:09:59 2006 @@ -27,8 +27,6 @@ types_element->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING); - types_element->ops->to_types_element_free = axis2_hash_get(methods, - "to_types_element_free", AXIS2_HASH_KEY_STRING); types_element->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING); types_element->ops->set_type_system = axis2_hash_get(methods, --------------------------------------------------------------------- To unsubscribe, e-mail: shortkevin@example.net For additional commands, e-mail: shortkevin@example.net From shortkevin@example.net Thu Jun 01 08:52:22 2006 Return-Path: <shortkevin@example.net> Delivered-To: shortkevin@example.net Received: (qmail 3969 invoked from network); 1 Jun 2006 08:52:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2006 08:52:21 -0000 Received: (qmail 77468 invoked by uid 500); 1 Jun 2006 08:52:20 -0000 Delivered-To: shortkevin@example.net Received: (qmail 77222 invoked by uid 500); 1 Jun 2006 08:52:20 -0000 Mailing-List: contact shortkevin@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shortkevin@example.net> list-unsubscribe: <mailto:shortkevin@example.net> List-Post: <mailto:shortkevin@example.net> List-Id: <axis-cvs.ws.apache.org> Delivered-To: mailing list shortkevin@example.net Received: (qmail 77211 invoked by uid 500); 1 Jun 2006 08:52:19 -0000 Delivered-To: shortkevin@example.net Received: (qmail 77204 invoked by uid 99); 1 Jun 2006 08:52:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 01:52:19 -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 [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 01:52:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 60A961A983A; Thu, 1 Jun 2006 01:51:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410799 - in /webservices/axis2/trunk/c: util/include/platforms/windows/ util/src/ util/src/platforms/windows/ xml_schema/include/xml_schema/ xml_schema/src/ xml_schema/test/ Date: Thu, 01 Jun 2006 08:51:52 -0000 To: shortkevin@example.net From: shortkevin@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <shortkevin@example.net> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: nandika Date: Thu Jun 1 01:51:51 2006 New Revision: 410799 URL: http://svn.apache.org/viewvc?rev=410799&view=rev Log: compilation problems fixed on windows Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c webservices/axis2/trunk/c/util/src/url.c webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h webservices/axis2/trunk/c/xml_schema/src/om_util.c webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h (original) +++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_dir_windows.h Thu Jun 1 01:51:51 2006 @@ -53,39 +53,43 @@ * open a directory on a given name * returns a DIR if successful, or NULL if the path cannot be opened */ -AXIS2_DECLARE (DIR *) opendir(const char *); +AXIS2_EXTERN DIR* AXIS2_CALL opendir(const char *); /** * Close the directory stream DIRP. * Return 0 if successful, -1 otherwise. */ -AXIS2_EXTERN int) closedir(DIR *); +AXIS2_EXTERN int AXIS2_CALL closedir(DIR *); /** * Read a directory entry from DIRP. Return a pointer to a `struct * dirent' describing the entry, or NULL for EOF or error. */ -AXIS2_EXTERN truct dirent *) readdir(DIR *); +AXIS2_EXTERN struct dirent* AXIS2_CALL +readdir(DIR *); /** * Reentrant version of `readdir' */ -AXIS2_EXTERN int) readdir_r(DIR *, struct dirent *, struct dirent **); +AXIS2_EXTERN int AXIS2_CALL +readdir_r(DIR *, struct dirent *, struct dirent **); /** * Rewind DIRP to the beginning of the directory. */ -AXIS2_EXTERN int) rewinddir(DIR *); +AXIS2_EXTERN int AXIS2_CALL rewinddir(DIR *); /** * Scan the directory DIR * Returns the number of entries selected, or -1 on error */ -AXIS2_EXTERN int) scandir(const char *_dirname, struct dirent **__namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b)); +AXIS2_EXTERN int AXIS2_CALL +scandir(const char *_dirname, struct dirent **__namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b)); /** * Compare two `struct dirent's alphabetically */ -AXIS2_DECLARE_DATA int alphasort(const struct dirent **__d1, const struct dirent **__d2); +extern int +alphasort(const struct dirent **__d1, const struct dirent **__d2); #endif /* READDIR_H */ Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h (original) +++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_getopt_windows.h Thu Jun 1 01:51:51 2006 @@ -36,7 +36,8 @@ * @param __shortopts options * @return option char if successful, -1 if over, ':' or '?' if error */ -AXIS2_EXTERN int) axis2_getopt(int __argc, char * const *__argv, const char *__shortopts); +AXIS2_EXTERN int AXIS2_CALL +axis2_getopt(int __argc, char * const *__argv, const char *__shortopts); /** @} */ Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h (original) +++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_uuid_gen_windows.h Thu Jun 1 01:51:51 2006 @@ -30,7 +30,7 @@ * Generate universally unique id * @return a char pointer to uuid */ -AXIS2_EXTERN axis2_char_t *) axis2_platform_uuid_gen(char *s); +AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_platform_uuid_gen(char *s); /** @} */ #ifdef __cplusplus Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h (original) +++ webservices/axis2/trunk/c/util/include/platforms/windows/axis2_windows.h Thu Jun 1 01:51:51 2006 @@ -144,7 +144,8 @@ #define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER "%I64d" #define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER_CHARS "I64d" -AXIS2_EXTERN HMODULE) callLoadLib(LPCTSTR lib); +AXIS2_EXTERN HMODULE AXIS2_CALL +callLoadLib(LPCTSTR lib); /** * Platform specific path separator char Modified: webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c (original) +++ webservices/axis2/trunk/c/util/src/platforms/windows/axis2_windows.c Thu Jun 1 01:51:51 2006 @@ -40,7 +40,8 @@ return returningString; } */ -AXIS2_EXTERN HMODULE) callLoadLib(LPCTSTR lib AXIS2_CALL +AXIS2_EXTERN HMODULE AXIS2_CALL +callLoadLib(LPCTSTR lib) { SetErrorMode(SEM_FAILCRITICALERRORS); //Disable display of the critical-error-handler message box Modified: webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c (original) +++ webservices/axis2/trunk/c/util/src/platforms/windows/getopt_windows.c Thu Jun 1 01:51:51 2006 @@ -36,7 +36,8 @@ return (int)'?'; } -AXIS2_EXTERN int) axis2_getopt(int __argc, char * const *__argv, const char *__shortopts AXIS2_CALL +AXIS2_EXTERN int AXIS2_CALL +axis2_getopt(int __argc, char * const *__argv, const char *__shortopts) { static char *pos = ""; char *olstindex; Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c (original) +++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_mutex_windows.c Thu Jun 1 01:51:51 2006 @@ -67,7 +67,8 @@ return mutex; } -AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex AXIS2_CALL +AXIS2_EXTERN axis2_status_t AXIS2_CALL +axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex) { if (mutex->type == thread_mutex_critical_section) { @@ -85,7 +86,8 @@ return AXIS2_SUCCESS; } -AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex AXIS2_CALL +AXIS2_EXTERN axis2_status_t AXIS2_CALL +axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex) { if (mutex->type == thread_mutex_critical_section) Modified: webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c (original) +++ webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c Thu Jun 1 01:51:51 2006 @@ -22,7 +22,8 @@ #include <axis2_utils_defines.h> -AXIS2_EXTERN axis2_char_t *) axis2_platform_uuid_gen(char *s AXIS2_CALL +AXIS2_EXTERN axis2_char_t* AXIS2_CALL +axis2_platform_uuid_gen(char *s) { RPC_STATUS retval; UUID uuid; Modified: webservices/axis2/trunk/c/util/src/url.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/url.c (original) +++ webservices/axis2/trunk/c/util/src/url.c Thu Jun 1 01:51:51 2006 @@ -424,7 +424,7 @@ axis2_url_t* AXIS2_CALL axis2_url_clone( axis2_url_t *url, - axis2_env_t **env) + axis2_env_t *env) { axis2_url_impl_t *url_impl = NULL; Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h Thu Jun 1 01:51:51 2006 @@ -287,7 +287,11 @@ #define AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK_RESOLVED(element, env) \ (((axis2_xml_schema_element_t *) element)->ops->get_block_resolved(\ - element, env)) + element, env)) + +#define AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK(element, env) \ + (((axis2_xml_schema_element_t *) element)->ops->get_block(\ + element, env)) #define AXIS2_XML_SCHEMA_ELEMENT_GET_FIXED_VALUE(element, env) \ (((axis2_xml_schema_element_t *) element)->ops->get_fixed_value(\ Modified: webservices/axis2/trunk/c/xml_schema/src/om_util.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/om_util.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/om_util.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/om_util.c Thu Jun 1 01:51:51 2006 @@ -276,7 +276,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_next_siblng_element_with_localname(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_om_node_t **next_node) @@ -314,7 +314,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_first_child_element_with_uri_localname(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_char_t *uri, @@ -397,7 +397,7 @@ } AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_last_child_element_with_uri_localname(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_char_t *uri, @@ -448,7 +448,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_next_sibling_element_with_uri_localname(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_char_t *uri, @@ -495,7 +495,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_first_child_element_with_localnames(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_array_list_t *names, axis2_om_node_t **child_node) @@ -579,7 +579,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_last_child_element_with_localnames(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_array_list_t *names, axis2_om_node_t **child_node) @@ -629,7 +629,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_next_siblng_element_with_localnames(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_array_list_t *names, axis2_om_node_t **next_node) @@ -679,7 +679,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_first_child_element_with_localname_attr(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_char_t *attr_name, @@ -811,7 +811,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_last_child_element_with_localname_attr(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_char_t *attr_name, @@ -890,7 +890,7 @@ AXIS2_EXTERN axis2_om_element_t * AXIS2_CALL axis2_om_util_get_next_siblng_element_with_localname_attr(axis2_om_element_t *ele, - axis2_env_t **env, + axis2_env_t *env, axis2_om_node_t *ele_node, axis2_char_t *localname, axis2_char_t *attr_name, Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original) +++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Thu Jun 1 01:51:51 2006 @@ -601,6 +601,7 @@ if(NULL != sch_ele) { axis2_qname_t *qualified_qname = NULL; + axis2_char_t *qname_uri = NULL; /* for debuging */ axis2_qname_t *ref_qname = NULL; axis2_xml_schema_obj_table_t *elements = NULL; @@ -611,6 +612,7 @@ if(NULL != qualified_qname && NULL != elements) { + qname_uri = AXIS2_QNAME_GET_URI(qualified_qname, env); AXIS2_XML_SCHEMA_OBJ_TABLE_ADD(elements, env, qualified_qname, sch_ele); } @@ -1449,7 +1451,7 @@ else if(AXIS2_STRCMP(localname, "anyAttribute") == 0) { void *any_attr = NULL; - any_attr = handle_any_attribute(builder, env, any_attr, schema_node); + any_attr = handle_any_attribute(builder, env, node1, schema_node); AXIS2_XML_SCHEMA_COMPLEX_TYPE_SET_ANY_ATTRIBUTE(cmp_type, env, any_attr); } ele1 = axis2_om_util_get_next_sibling_element_with_uri(node1, env, @@ -2245,7 +2247,7 @@ AXIS2_XML_SCHEMA_ANNOTATED_SET_ANNOTATION(sequence, env, annotation); } - ele1 = axis2_om_util_get_first_child_element_with_uri(node1, env, + ele1 = axis2_om_util_get_next_sibling_element_with_uri(node1, env, AXIS2_XML_SCHEMA_NS, &node1); } return sequence; @@ -2593,6 +2595,8 @@ axis2_xml_schema_builder_impl_t *builder_impl = NULL; builder_impl = AXIS2_INTF_TO_IMPL(builder); + + any_attr = axis2_xml_schema_any_attribute_create(env); any_attr_ele = (axis2_om_element_t*) AXIS2_OM_NODE_GET_DATA_ELEMENT(any_attr_node, env); Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?rev=410799&r1=410798&r2=410799&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original) +++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Thu Jun 1 01:51:51 2006 @@ -45,20 +45,20 @@ CuSuite* xml_schema_GetSuite() { CuSuite* suite = CuSuiteNew(); - SUITE_ADD_TEST(suite, test_simple_type_schema_generation); + /* SUITE_ADD_TEST(suite, test_simple_type_schema_generation); SUITE_ADD_TEST(suite, test_any_attribute); SUITE_ADD_TEST(suite, test_block_content); SUITE_ADD_TEST(suite, test_circular_schema); SUITE_ADD_TEST(suite, test_schema_import1); - SUITE_ADD_TEST(suite, test_schema_import2); + SUITE_ADD_TEST(suite, test_schema_import2);*/ SUITE_ADD_TEST(suite, test_mixed_content); - SUITE_ADD_TEST(suite, test_local_elements); +/* SUITE_ADD_TEST(suite, test_local_elements); SUITE_ADD_TEST(suite, test_element_refs); SUITE_ADD_TEST(suite, test_forward_refs); SUITE_ADD_TEST(suite, test_local_unnamed_simple_type); SUITE_ADD_TEST(suite, test_simple_restriction); SUITE_ADD_TEST(suite, test_unqualified_schemas); - SUITE_ADD_TEST(suite, test_two_schmes); + SUITE_ADD_TEST(suite, test_two_schmes);*/ return suite; } @@ -107,21 +107,181 @@ ele = NULL; sch_type = NULL; } + AXIS2_OM_DOCUMENT_FREE(om_doc, env); + } -void test_any_attribute(CuTest *tc){} -void test_block_content(CuTest *tc){} +void test_any_attribute(CuTest *tc) +{ + axis2_env_t *env = NULL; + axis2_om_document_t *om_doc = NULL; + axis2_xml_schema_collection_t *sch_collection = NULL; + axis2_xml_schema_t *schema = NULL; + axis2_qname_t *qn = NULL; + void *ele = NULL; + void *sch_type = NULL; + void *particle = NULL; + void *any_attr = NULL; + + axis2_char_t *filename = "./..//test-resources/anyAttTest.xsd"; + + env = axis2_env_create_all("test.log", 1); + + om_doc = get_root_element_from_filename(env, filename); + + sch_collection = axis2_xml_schema_collection_create(env); + + schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT( + sch_collection, env, om_doc); + + qn = axis2_qname_create(env, "AnyAttContainer", + "http://unqualified-elements.example.com", NULL); + + ele = AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn); + + CuAssertPtrNotNull(tc, ele); + + sch_type = AXIS2_XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(ele, env); + + CuAssertPtrNotNull(tc, sch_type); + + particle = AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_PARTICLE(sch_type, env); + + CuAssertPtrNotNull(tc, particle); + + any_attr = AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_ANY_ATTRIBUTE(sch_type, env); + + CuAssertPtrNotNull(tc, any_attr); +} + +void test_block_content(CuTest *tc) +{ + axis2_env_t *env = NULL; + axis2_om_document_t *om_doc = NULL; + axis2_xml_schema_collection_t *sch_collection = NULL; + axis2_xml_schema_t *schema = NULL; + axis2_qname_t *qn = NULL; + void *ele = NULL; + void *block = NULL; + void *value = NULL; + + axis2_char_t *filename = "./..//test-resources/block.xsd"; + + env = axis2_env_create_all("test.log", 1); + + om_doc = get_root_element_from_filename(env, filename); + + sch_collection = axis2_xml_schema_collection_create(env); + + schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT( + sch_collection, env, om_doc); + + qn = axis2_qname_create(env, "complexElt", + "http://soapinterop.org/xsd", NULL); + + ele = AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn); + + CuAssertPtrNotNull(tc, ele); + + block = AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK(ele, env); + + CuAssertPtrNotNull(tc, block); + + value = AXIS2_XML_SCHEMA_ENUM_GET_VALUE(block, env); + + CuAssertPtrNotNull(tc, value); +} + + void test_circular_schema(CuTest *tc){} void test_schema_import1(CuTest *tc){} void test_schema_import2(CuTest *tc){} -void test_mixed_content(CuTest *tc){} +void test_mixed_content(CuTest *tc) +{ + axis2_env_t *env = NULL; + axis2_om_document_t *om_doc = NULL; + axis2_xml_schema_collection_t *sch_collection = NULL; + axis2_xml_schema_t *schema = NULL; + axis2_qname_t *qn = NULL; + void *ele = NULL; + void *cmp_type = NULL; + void *seq = NULL; + axis2_xml_schema_obj_collection_t *items = NULL; + void *sub_element = NULL; + axis2_qname_t *qn1 = NULL; + axis2_char_t *uri = NULL; + + + axis2_char_t *filename = "./..//test-resources/elementForm.xsd"; + + env = axis2_env_create_all("test.log", 1); + + om_doc = get_root_element_from_filename(env, filename); + + sch_collection = axis2_xml_schema_collection_create(env); + + schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT( + sch_collection, env, om_doc); + + qn = axis2_qname_create(env, "unQualifiedLocals", + "http://unqualified-elements.example.com", NULL); + + ele = AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn); + + CuAssertPtrNotNull(tc, ele); + + cmp_type = AXIS2_XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(ele, env); + + CuAssertPtrNotNull(tc, cmp_type); + + seq = AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_PARTICLE(cmp_type, env); + + CuAssertPtrNotNull(tc, seq); + + items = AXIS2_XML_SCHEMA_GROUP_BASE_GET_ITEMS(seq, env); + + CuAssertPtrNotNull(tc, items); + + sub_element = AXIS2_XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(items, env, 0); + + CuAssertPtrNotNull(tc, sub_element); + + qn1 = AXIS2_XML_SCHEMA_ELEMENT_GET_QNAME(sub_element, env); + + CuAssertPtrNotNull(tc, qn1); + + uri = AXIS2_QNAME_GET_URI(qn1, env); + + CuAssertPtrNotNull(tc, uri); + + sub_element = NULL; + qn1 = NULL; + uri = NULL; + + sub_element = AXIS2_XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(items, env, 0); + + CuAssertPtrNotNull(tc, sub_element); + + qn1 = AXIS2_XML_SCHEMA_ELEMENT_GET_QNAME(sub_element, env); + + CuAssertPtrNotNull(tc, qn1); + + uri = AXIS2_QNAME_GET_URI(qn1, env); + + CuAssertPtrNotNull(tc, uri); + +} void test_local_elements(CuTest *tc){} void test_element_refs(CuTest *tc){} void test_forward_refs(CuTest *tc){} void test_local_unnamed_simple_type(CuTest *tc){} void test_simple_restriction(CuTest *tc){} void test_unqualified_schemas(CuTest *tc){} -void test_two_schmes(CuTest *tc){} + +void test_two_schmes(CuTest *tc) +{ + +} static axis2_om_document_t* get_root_element_from_filename(const axis2_env_t *env, --------------------------------------------------------------------- To unsubscribe, e-mail: shortkevin@example.net For additional commands, e-mail: shortkevin@example.net From shortkevin@example.net Thu Jun 01 10:32:55 2006 Return-Path: <shortkevin@example.net> Delivered-To: shortkevin@example.net Received: (qmail 52165 invoked from network); 1 Jun 2006 10:32:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2006 10:32:53 -0000 Received: (qmail 77196 invoked by uid 500); 1 Jun 2006 10:32:51 -0000 Delivered-To: shortkevin@example.net Received: (qmail 77117 invoked by uid 500); 1 Jun 2006 10:32:51 -0000 Mailing-List: contact shortkevin@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shortkevin@example.net> list-unsubscribe: <mailto:shortkevin@example.net> List-Post: <mailto:shortkevin@example.net> List-Id: <axis-cvs.ws.apache.org> Delivered-To: mailing list shortkevin@example.net Received: (qmail 77106 invoked by uid 500); 1 Jun 2006 10:32:51 -0000 Delivered-To: shortkevin@example.net Received: (qmail 77103 invoked by uid 99); 1 Jun 2006 10:32:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 03:32:51 -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 [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 03:32:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B28A51A983A; Thu, 1 Jun 2006 03:32:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410825 - /webservices/axis2/trunk/c/util/src/url.c Date: Thu, 01 Jun 2006 10:32:29 -0000 To: shortkevin@example.net From: shortkevin@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <shortkevin@example.net> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: samisa Date: Thu Jun 1 03:32:21 2006 New Revision: 410825 URL: http://svn.apache.org/viewvc?rev=410825&view=rev Log: Fixed build break Modified: webservices/axis2/trunk/c/util/src/url.c Modified: webservices/axis2/trunk/c/util/src/url.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=410825&r1=410824&r2=410825&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/url.c (original) +++ webservices/axis2/trunk/c/util/src/url.c Thu Jun 1 03:32:21 2006 @@ -69,7 +69,7 @@ axis2_url_t* AXIS2_CALL axis2_url_clone( axis2_url_t *url, - axis2_env_t **env); + const axis2_env_t *env); /***************************** End of function headers ************************/ AXIS2_EXTERN axis2_url_t * AXIS2_CALL @@ -424,7 +424,7 @@ axis2_url_t* AXIS2_CALL axis2_url_clone( axis2_url_t *url, - axis2_env_t *env) + const axis2_env_t *env) { axis2_url_impl_t *url_impl = NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: shortkevin@example.net For additional commands, e-mail: shortkevin@example.net From shortkevin@example.net Thu Jun 01 10:49:28 2006 Return-Path: <shortkevin@example.net> Delivered-To: shortkevin@example.net Received: (qmail 56284 invoked from network); 1 Jun 2006 10:49:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2006 10:49:26 -0000 Received: (qmail 97657 invoked by uid 500); 1 Jun 2006 10:49:25 -0000 Delivered-To: shortkevin@example.net Received: (qmail 97571 invoked by uid 500); 1 Jun 2006 10:49:24 -0000 Mailing-List: contact shortkevin@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shortkevin@example.net> list-unsubscribe: <mailto:shortkevin@example.net> List-Post: <mailto:shortkevin@example.net> List-Id: <axis-cvs.ws.apache.org> Delivered-To: mailing list shortkevin@example.net Received: (qmail 97555 invoked by uid 500); 1 Jun 2006 10:49:24 -0000 Delivered-To: shortkevin@example.net Received: (qmail 97551 invoked by uid 99); 1 Jun 2006 10:49:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 03:49:24 -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 [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 03:49:23 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E33DD1A983A; Thu, 1 Jun 2006 03:49:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410829 - in /webservices/axis2/trunk/c/woden: include/woden/wsdl20/extensions/soap/ src/wsdl20/extensions/soap/ Date: Thu, 01 Jun 2006 10:49:01 -0000 To: shortkevin@example.net From: shortkevin@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <shortkevin@example.net> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Thu Jun 1 03:49:01 2006 New Revision: 410829 URL: http://svn.apache.org/viewvc?rev=410829&view=rev Log: added new files Added: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_element.c webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_element.c Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am Added: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h?rev=410829&view=auto ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h (added) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h Thu Jun 1 03:49:01 2006 @@ -0,0 +1,211 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_H +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_H + +/** + * @file axis2_woden_soap_header_block_element.h + * @brief Axis2 Soap Header Block Element Soap Header Block + * This interface represents the &lt;wsoap:header&gt; extension element that + * can appear within a Binding Fault or Binding Message Reference. + */ + +#include <axis2_allocator.h> +#include <axis2_env.h> +#include <axis2_error.h> +#include <axis2_string.h> +#include <axis2_const.h> +#include <axis2_hash.h> +#include <axis2_qname.h> +#include <axis2_url.h> +#include <axis2_array_list.h> +#include <woden/axis2_woden.h> +#include <woden/wsdl20/extensions/axis2_woden_ext_element.h> +#include <woden/wsdl20/extensions/axis2_woden_attr_extensible.h> +#include <woden/wsdl20/extensions/axis2_woden_element_extensible.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +typedef struct axis2_woden_soap_header_block_element axis2_woden_soap_header_block_element_t; +typedef struct axis2_woden_soap_header_block_element_ops axis2_woden_soap_header_block_element_ops_t; +typedef union axis2_woden_soap_header_block_element_base axis2_woden_soap_header_block_element_base_t; + +/** @defgroup axis2_woden_soap_header_block_element Soap Header Block Element + * @ingroup axis2_soap_header_block + * @{ + */ + +struct axis2_woden_soap_header_block_element_ops +{ + /** + * Deallocate memory + * @return status code + */ + axis2_status_t (AXIS2_CALL * + free) ( + void *soap_header_block_element, + const axis2_env_t *env); + + axis2_woden_obj_types_t (AXIS2_CALL * + type) ( + void *soap_header_block_element, + const axis2_env_t *env); + + /** + * Set the QName that identifies the Schema element declaration + * relating to this soap header. + * + * @param qname the QName that identifies a Schema element declaration + */ + axis2_status_t (AXIS2_CALL * + set_element_qname) ( + void *soap_header_block_element, + const axis2_env_t *env, + axis2_qname_t *qname); + + axis2_qname_t *(AXIS2_CALL * + get_element_qname) ( + void *soap_header_block_element, + const axis2_env_t *env); + + /** + * Returns the Schema element declaration identified by the QName in the 'element' + * attribute of the &lt;wsoap:header&gt; element. + * If this QName does not resolve to an element declaration in a schema that is visible + * to the containing WSDL description, null will be returned by this method. + * To be visible, the Schema must have been correctly imported or inlined within + * the &lt;types&gt; element. + * + * @return the Xml Schema Element identified by the 'element' attribute + */ + void *(AXIS2_CALL * + get_element) ( + void *soap_header_block_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * + set_must_understand) ( + void *soap_header_block_element, + const axis2_env_t *env, + axis2_bool_t understood); + + axis2_bool_t (AXIS2_CALL * + must_understand) ( + void *soap_header_block_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * + set_parent_element) ( + void *soap_header_block_element, + const axis2_env_t *env, + void *wsdl_el); + + void *(AXIS2_CALL * + get_parent_element) ( + void *soap_header_block_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * + add_documentation_element) ( + void *soap_header_block_element, + const axis2_env_t *env, + void *doc_el); + + axis2_array_list_t *(AXIS2_CALL * + get_documentation_elements) ( + void *soap_header_block_element, + const axis2_env_t *env); + +}; + +union axis2_woden_soap_header_block_element_base +{ + axis2_woden_ext_element_t ext_element; + axis2_woden_attr_extensible_t attr_extensible; + axis2_woden_element_extensible_t element_extensible; +}; + +struct axis2_woden_soap_header_block_element +{ + axis2_woden_soap_header_block_element_base_t base; + axis2_woden_soap_header_block_element_ops_t *ops; +}; + +AXIS2_EXTERN axis2_woden_soap_header_block_element_t * AXIS2_CALL +axis2_woden_soap_header_block_element_create( + const axis2_env_t *env); + +/************************Woden C Internal Methods******************************/ +AXIS2_EXTERN axis2_status_t AXIS2_CALL +axis2_woden_soap_header_block_element_resolve_methods( + axis2_woden_soap_header_block_element_t *soap_header_block_element, + const axis2_env_t *env, + axis2_hash_t *methods); +/************************End of Woden C Internal Methods***********************/ + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_FREE(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + free (soap_header_block_element, env)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_TYPE(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + type (soap_header_block_element, env)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_SET_ELEMENT_QNAME(soap_header_block_element, env, qname) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + set_element_qname (soap_header_block_element, env, qname)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_GET_ELEMENT_QNAME(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + get_element_qname (soap_header_block_element, env)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_GET_ELEMENT(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + get_element (soap_header_block_element, env)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_SET_MUST_UNDERSTAND(soap_header_block_element, env, understood) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + set_must_understand (soap_header_block_element, env, understood)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_MUST_UNDERSTAND(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + must_understand (soap_header_block_element, env)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_SET_PARENT_ELEMENT(soap_header_block_element, env, wsdl_el) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + set_parent_element (soap_header_block_element, env, wsdl_el)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_GET_PARENT_ELEMENT(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + get_parent_element (soap_header_block_element, env)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_ADD_DOCUMENTATION_ELEMENT(soap_header_block_element, env, doc_el) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + add_documentation_element (soap_header_block_element, env, doc_el)) + +#define AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_GET_DOCUMENTATION_ELEMENTS(soap_header_block_element, env) \ + (((axis2_woden_soap_header_block_element_t *) soap_header_block_element)->ops->\ + get_documentation_elements (soap_header_block_element, env)) + +/** @} */ +#ifdef __cplusplus +} +#endif +#endif /* AXIS2_WODEN_SOAP_HEADER_BLOCK_ELEMENT_H */ Added: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h?rev=410829&view=auto ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h (added) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h Thu Jun 1 03:49:01 2006 @@ -0,0 +1,168 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AXIS2_WODEN_SOAP_MODULE_ELEMENT_H +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_H + +/** + * @file axis2_woden_soap_module_element.h + * @brief Axis2 Soap Module Element Soap Module + * This interface represents the &lt;wsoap:module&gt; extension element that + * can appear within a Binding, Binding Fault, Binding Operation, Binding + * Fault Reference or Binding Message Reference. + */ + +#include <axis2_allocator.h> +#include <axis2_env.h> +#include <axis2_error.h> +#include <axis2_string.h> +#include <axis2_const.h> +#include <axis2_hash.h> +#include <axis2_qname.h> +#include <axis2_url.h> +#include <axis2_array_list.h> +#include <woden/axis2_woden.h> +#include <woden/wsdl20/extensions/axis2_woden_ext_element.h> +#include <woden/wsdl20/extensions/axis2_woden_attr_extensible.h> +#include <woden/wsdl20/extensions/axis2_woden_element_extensible.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +typedef struct axis2_woden_soap_module_element axis2_woden_soap_module_element_t; +typedef struct axis2_woden_soap_module_element_ops axis2_woden_soap_module_element_ops_t; +typedef union axis2_woden_soap_module_element_base axis2_woden_soap_module_element_base_t; + +/** @defgroup axis2_woden_soap_module_element Soap Module Element + * @ingroup axis2_soap_module + * @{ + */ + +struct axis2_woden_soap_module_element_ops +{ + /** + * Deallocate memory + * @return status code + */ + axis2_status_t (AXIS2_CALL * + free) ( + void *soap_module_element, + const axis2_env_t *env); + + axis2_woden_obj_types_t (AXIS2_CALL * + type) ( + void *soap_module_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * + set_ref) ( + void *soap_module_element, + const axis2_env_t *env, + axis2_url_t *uri); + + axis2_url_t *(AXIS2_CALL * + get_ref) ( + void *soap_module_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * + set_parent_element) ( + void *soap_module_element, + const axis2_env_t *env, + void *wsdl_el); + + void *(AXIS2_CALL * + get_parent_element) ( + void *soap_module_element, + const axis2_env_t *env); + + axis2_status_t (AXIS2_CALL * + add_documentation_element) ( + void *soap_module_element, + const axis2_env_t *env, + void *doc_el); + + axis2_array_list_t *(AXIS2_CALL * + get_documentation_elements) ( + void *soap_module_element, + const axis2_env_t *env); + +}; + +union axis2_woden_soap_module_element_base +{ + axis2_woden_ext_element_t ext_element; + axis2_woden_attr_extensible_t attr_extensible; + axis2_woden_element_extensible_t element_extensible; +}; + +struct axis2_woden_soap_module_element +{ + axis2_woden_soap_module_element_base_t base; + axis2_woden_soap_module_element_ops_t *ops; +}; + +AXIS2_EXTERN axis2_woden_soap_module_element_t * AXIS2_CALL +axis2_woden_soap_module_element_create( + const axis2_env_t *env); + +/************************Woden C Internal Methods******************************/ +AXIS2_EXTERN axis2_status_t AXIS2_CALL +axis2_woden_soap_module_element_resolve_methods( + axis2_woden_soap_module_element_t *soap_module_element, + const axis2_env_t *env, + axis2_hash_t *methods); +/************************End of Woden C Internal Methods***********************/ + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_FREE(soap_module_element, env) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + free (soap_module_element, env)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_TYPE(soap_module_element, env) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + type (soap_module_element, env)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_SET_REF(soap_module_element, env, uri) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + set_ref (soap_module_element, env, uri)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_GET_REF(soap_module_element, env) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + get_ref (soap_module_element, env)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_SET_PARENT_ELEMENT(soap_module_element, env, wsdl_el) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + set_parent_element (soap_module_element, env, wsdl_el)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_GET_PARENT_ELEMENT(soap_module_element, env) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + get_parent_element (soap_module_element, env)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_ADD_DOCUMENTATION_ELEMENT(soap_module_element, env, doc_el) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + add_documentation_element (soap_module_element, env, doc_el)) + +#define AXIS2_WODEN_SOAP_MODULE_ELEMENT_GET_DOCUMENTATION_ELEMENTS(soap_module_element, env) \ + (((axis2_woden_soap_module_element_t *) soap_module_element)->ops->\ + get_documentation_elements (soap_module_element, env)) + +/** @} */ +#ifdef __cplusplus +} +#endif +#endif /* AXIS2_WODEN_SOAP_MODULE_ELEMENT_H */ Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am?rev=410829&r1=410828&r2=410829&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am (original) +++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/Makefile.am Thu Jun 1 03:49:01 2006 @@ -5,7 +5,9 @@ soap_binding_fault_exts.c \ soap_binding_fault_ref_exts.c \ soap_binding_msg_ref_exts.c \ - soap_binding_op_exts.c + soap_binding_op_exts.c \ + soap_header_block_element.c \ + soap_module_element.c INCLUDES = -I$(top_builddir)/include \ @AXIOMINC@ \ Added: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_element.c?rev=410829&view=auto ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_element.c (added) +++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block_element.c Thu Jun 1 03:49:01 2006 @@ -0,0 +1,71 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h> + +axis2_status_t AXIS2_CALL +axis2_woden_soap_header_block_element_resolve_methods( + axis2_woden_soap_header_block_element_t *soap_header_block_element, + const axis2_env_t *env, + axis2_hash_t *methods) +{ + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); + + soap_header_block_element->ops->free = axis2_hash_get(methods, "free", + AXIS2_HASH_KEY_STRING); + soap_header_block_element->ops->type = axis2_hash_get(methods, "type", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->set_element_qname = + axis2_hash_get(methods, "set_element_qname", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->get_element_qname = + axis2_hash_get(methods, "get_element_qname", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->get_element = + axis2_hash_get(methods, "get_element", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->set_must_understand = + axis2_hash_get(methods, "set_must understand", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->must_understand = + axis2_hash_get(methods, "must_understand", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->set_parent_element = + axis2_hash_get(methods, "set_parent_element", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->get_parent_element = + axis2_hash_get(methods, "get_parent_element", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->add_documentation_element = + axis2_hash_get(methods, "add_documentation_element", + AXIS2_HASH_KEY_STRING); + + soap_header_block_element->ops->get_documentation_elements = + axis2_hash_get(methods, "get_documentation_elements", + AXIS2_HASH_KEY_STRING); + + return AXIS2_SUCCESS; +} + Added: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_element.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_element.c?rev=410829&view=auto ============================================================================== --- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_element.c (added) +++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_element.c Thu Jun 1 03:49:01 2006 @@ -0,0 +1,59 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h> + +axis2_status_t AXIS2_CALL +axis2_woden_soap_module_element_resolve_methods( + axis2_woden_soap_module_element_t *soap_module_element, + const axis2_env_t *env, + axis2_hash_t *methods) +{ + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE); + + soap_module_element->ops->free = axis2_hash_get(methods, "free", + AXIS2_HASH_KEY_STRING); + soap_module_element->ops->type = axis2_hash_get(methods, "type", + AXIS2_HASH_KEY_STRING); + + soap_module_element->ops->set_ref = + axis2_hash_get(methods, "set_ref", + AXIS2_HASH_KEY_STRING); + + soap_module_element->ops->get_ref = + axis2_hash_get(methods, "get_ref", + AXIS2_HASH_KEY_STRING); + + soap_module_element->ops->set_parent_element = + axis2_hash_get(methods, "set_parent_element", + AXIS2_HASH_KEY_STRING); + + soap_module_element->ops->get_parent_element = + axis2_hash_get(methods, "get_parent_element", + AXIS2_HASH_KEY_STRING); + + soap_module_element->ops->add_documentation_element = + axis2_hash_get(methods, "add_documentation_element", + AXIS2_HASH_KEY_STRING); + + soap_module_element->ops->get_documentation_elements = + axis2_hash_get(methods, "get_documentation_elements", + AXIS2_HASH_KEY_STRING); + + return AXIS2_SUCCESS; +} + --------------------------------------------------------------------- To unsubscribe, e-mail: shortkevin@example.net For additional commands, e-mail: shortkevin@example.net From shortkevin@example.net Thu Jun 01 12:09:23 2006 Return-Path: <shortkevin@example.net> Delivered-To: shortkevin@example.net Received: (qmail 82282 invoked from network); 1 Jun 2006 12:09:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2006 12:09:21 -0000 Received: (qmail 15025 invoked by uid 500); 1 Jun 2006 12:09:14 -0000 Delivered-To: shortkevin@example.net Received: (qmail 14902 invoked by uid 500); 1 Jun 2006 12:09:14 -0000 Mailing-List: contact shortkevin@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shortkevin@example.net> list-unsubscribe: <mailto:shortkevin@example.net> List-Post: <mailto:shortkevin@example.net> List-Id: <axis-cvs.ws.apache.org> Delivered-To: mailing list shortkevin@example.net Received: (qmail 14891 invoked by uid 500); 1 Jun 2006 12:09:13 -0000 Delivered-To: shortkevin@example.net Received: (qmail 14888 invoked by uid 99); 1 Jun 2006 12:09:13 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 05:09:13 -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 [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 05:09:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 30F241A983A; Thu, 1 Jun 2006 05:08:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410850 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Date: Thu, 01 Jun 2006 12:08:52 -0000 To: shortkevin@example.net From: shortkevin@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <shortkevin@example.net> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chinthaka Date: Thu Jun 1 05:08:52 2006 New Revision: 410850 URL: http://svn.apache.org/viewvc?rev=410850&view=rev Log: Fixing an issue in toOM method. Thanks Chamikara for pointing that out. Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java?rev=410850&r1=410849&r2=410850&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Thu Jun 1 05:08:52 2006 @@ -227,20 +227,15 @@ } } - public void toOM() { - throw new UnsupportedOperationException("Yet to be implemented !!"); - } - - public OMElement toOM(String nsurl,String localName,String prefix) throws AxisFault{ OMFactory fac = OMAbstractFactory.getOMFactory(); if(prefix!=null){ OMNamespace wrapNs = fac.createOMNamespace(nsurl,prefix); OMElement epr = fac.createOMElement(localName,wrapNs); - OMNamespace wsans = fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE,AddressingConstants.WSA_DEFAULT_PREFIX); - OMElement addressE = fac.createOMElement(AddressingConstants.EPR_ADDRESS,wsans,epr); + OMNamespace wsaNS = fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE,AddressingConstants.WSA_DEFAULT_PREFIX); + OMElement addressE = fac.createOMElement(AddressingConstants.EPR_ADDRESS,wsaNS,epr); addressE.setText(address); - OMElement metadataE = fac.createOMElement(AddressingConstants.Final.WSA_METADATA,wsans,epr); + OMElement metadataE = fac.createOMElement(AddressingConstants.Final.WSA_METADATA,wsaNS,epr); if(this.metaData != null){ Iterator metadata = this.metaData.iterator(); @@ -250,9 +245,10 @@ } if(this.referenceParameters != null){ + OMElement refParameterElement = fac.createOMElement(AddressingConstants.Final.WSA_METADATA, wsaNS, epr); Iterator refParms = referenceParameters.values().iterator(); while(refParms.hasNext()){ - metadataE.addChild((OMNode)refParms.next()); + refParameterElement.addChild((OMNode)refParms.next()); } } return epr; --------------------------------------------------------------------- To unsubscribe, e-mail: shortkevin@example.net For additional commands, e-mail: shortkevin@example.net From shortkevin@example.net Thu Jun 01 13:23:42 2006 Return-Path: <shortkevin@example.net> Delivered-To: shortkevin@example.net Received: (qmail 16154 invoked from network); 1 Jun 2006 13:23:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2006 13:23:41 -0000 Received: (qmail 41914 invoked by uid 500); 1 Jun 2006 13:23:40 -0000 Delivered-To: shortkevin@example.net Received: (qmail 41661 invoked by uid 500); 1 Jun 2006 13:23:38 -0000 Mailing-List: contact shortkevin@example.net; run by ezmlm Precedence: bulk list-help: <mailto:shortkevin@example.net> list-unsubscribe: <mailto:shortkevin@example.net> List-Post: <mailto:shortkevin@example.net> List-Id: <axis-cvs.ws.apache.org> Delivered-To: mailing list shortkevin@example.net Received: (qmail 41649 invoked by uid 500); 1 Jun
{'source': 'Apache Software Foundation Public Mail Archives'}