Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 87710 invoked from network); 9 Jun 2006 12:39:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Jun 2006 12:39:47 -0000 Received: (qmail 22542 invoked by uid 500); 9 Jun 2006 12:39:44 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 22352 invoked by uid 500); 9 Jun 2006 12:39:43 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 22120 invoked by uid 500); 9 Jun 2006 12:39:42 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 21936 invoked by uid 99); 9 Jun 2006 12:39:40 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 05:39:40 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 05:39:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 759C11A983A; Fri, 9 Jun 2006 05:39:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413030 [1/3] - in /webservices/axis2/trunk/c: util/include/ util/src/ util/test/unit/util/ util/test/util/ woden/include/woden/wsdl20/ woden/include/woden/wsdl20/enumeration/ woden/include/woden/wsdl20/xml/ woden/src/builder/ woden/src/wsd... Date: Fri, 09 Jun 2006 12:39:12 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060609123916.759C11A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Fri Jun 9 05:39:10 2006 New Revision: 413030 URL: http://svn.apache.org/viewvc?rev=413030&view=rev Log: modified string trim functions to return a newly allocated string after trimming. More work on woden Modified: webservices/axis2/trunk/c/util/include/axis2_string.h webservices/axis2/trunk/c/util/src/string.c webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c webservices/axis2/trunk/c/util/test/util/Makefile.am webservices/axis2/trunk/c/util/test/util/test_string.c webservices/axis2/trunk/c/util/test/util/test_util.c webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault_ref.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_msg_ref.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h webservices/axis2/trunk/c/woden/src/builder/reader.c webservices/axis2/trunk/c/woden/src/wsdl20/desc.c webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/direction.c webservices/axis2/trunk/c/woden/src/wsdl20/enumeration/msg_label.c webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault_ref.c webservices/axis2/trunk/c/woden/src/wsdl20/interface_msg_ref.c webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c webservices/axis2/trunk/c/woden/src/wsdl20/property.c Modified: webservices/axis2/trunk/c/util/include/axis2_string.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_string.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/include/axis2_string.h (original) +++ webservices/axis2/trunk/c/util/include/axis2_string.h Fri Jun 9 05:39:10 2006 @@ -121,16 +121,22 @@ int s2); AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_strltrim(axis2_char_t *_s, - const axis2_char_t *_trim); + axis2_strltrim( + const axis2_env_t *env, + const axis2_char_t *_s, + const axis2_char_t *_trim); AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_strrtrim(axis2_char_t *_s, - const axis2_char_t *_trim); + axis2_strrtrim( + const axis2_env_t *env, + const axis2_char_t *_s, + const axis2_char_t *_trim); AXIS2_EXTERN axis2_char_t* AXIS2_CALL - axis2_strtrim(axis2_char_t *_s, - const axis2_char_t *_trim); + axis2_strtrim( + const axis2_env_t *env, + const axis2_char_t *_s, + const axis2_char_t *_trim); #define AXIS2_STRDUP(pts, env) \ axis2_strdup(pts, env) @@ -168,14 +174,14 @@ #define AXIS2_REPLACE(env, str, s1, s2) \ axis2_replace(env, str, s1, s2) -#define AXIS2_STRLTRIM(s, trim) \ - axis2_strltrim(s, trim) +#define AXIS2_STRLTRIM(env, s, trim) \ + axis2_strltrim(env, s, trim) -#define AXIS2_STRRTRIM(s, trim) \ - axis2_strrtrim(s, trim) +#define AXIS2_STRRTRIM(env, s, trim) \ + axis2_strrtrim(env, s, trim) -#define AXIS2_STRTRIM(s, trim) \ - axis2_strtrim(s, trim) +#define AXIS2_STRTRIM(env, s, trim) \ + axis2_strtrim(env, s, trim) /** @} */ Modified: webservices/axis2/trunk/c/util/src/string.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/string.c (original) +++ webservices/axis2/trunk/c/util/src/string.c Fri Jun 9 05:39:10 2006 @@ -291,43 +291,62 @@ return newstr; } -AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_strltrim(axis2_char_t *_s, - const axis2_char_t *_trim) +AXIS2_EXTERN axis2_char_t* AXIS2_CALL +axis2_strltrim( + const axis2_env_t *env, + const axis2_char_t *_s, + const axis2_char_t *_trim) { + axis2_char_t *_p = NULL; + if(!_s) return NULL; + _p = (axis2_char_t *) _s; if(!_trim) _trim = " \t\r\n"; - while(*_s) + while(*_p) { - if(!strchr(_trim, *_s)) - return _s; - ++_s; + if(!strchr(_trim, *_p)) + return _p; + ++_p; } - return _s; + return AXIS2_STRDUP(_p, env); } -AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_strrtrim(axis2_char_t *_s, - const axis2_char_t *_trim) +AXIS2_EXTERN axis2_char_t* AXIS2_CALL +axis2_strrtrim( + const axis2_env_t *env, + const axis2_char_t *_s, + const axis2_char_t *_trim) { axis2_char_t *__tail; if(!_s) return NULL; - __tail = _s + axis2_strlen(_s); + __tail = (axis2_char_t *) _s + axis2_strlen(_s); if(!_trim) _trim = " \t\n\r"; while(_s < __tail--) { if(!strchr(_trim, *__tail)) - return _s; + return (axis2_char_t *) _s; *__tail = 0; } - return _s; + return AXIS2_STRDUP(_s, env); } -AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_strtrim(axis2_char_t *_s, - const axis2_char_t *_trim) +AXIS2_EXTERN axis2_char_t* AXIS2_CALL +axis2_strtrim( + const axis2_env_t *env, + const axis2_char_t *_s, + const axis2_char_t *_trim) { - return axis2_strltrim(axis2_strrtrim(_s, _trim), _trim); + axis2_char_t *_p = NULL; + axis2_char_t *_q = NULL; + + _p = axis2_strrtrim(env, _s, _trim); + _q = axis2_strltrim(env, _p, _trim); + AXIS2_FREE(env->allocator,_p); + return _q; } + Modified: webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c (original) +++ webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c Fri Jun 9 05:39:10 2006 @@ -62,8 +62,9 @@ axis2_allocator_t *allocator = axis2_allocator_init (NULL); const axis2_env_t *env = axis2_env_create (allocator); - base_str = "http://myserver:80/home/damitha"; - uri_str = "../../temp/checkout.sh"; + /*base_str = "http://myserver:80/home/damitha";*/ + base_str = "file://home/damitha/temp"; + uri_str = "temp/checkout.sh"; base = axis2_uri_parse_string(env, base_str); new_uri = axis2_uri_parse_relative(env, base, uri_str); actual = AXIS2_URI_TO_STRING(new_uri, env, AXIS2_URI_UNP_OMITUSERINFO); Modified: webservices/axis2/trunk/c/util/test/util/Makefile.am URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/Makefile.am?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/test/util/Makefile.am (original) +++ webservices/axis2/trunk/c/util/test/util/Makefile.am Fri Jun 9 05:39:10 2006 @@ -5,7 +5,7 @@ test_thread.h check_PROGRAMS = test_util test_thread SUBDIRS = -test_util_SOURCES = test_util.c test_log.c +test_util_SOURCES = test_util.c test_log.c test_string.c test_thread_SOURCES = test_thread.c test_util_LDADD = \ Modified: webservices/axis2/trunk/c/util/test/util/test_string.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_string.c?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/test/util/test_string.c (original) +++ webservices/axis2/trunk/c/util/test/util/test_string.c Fri Jun 9 05:39:10 2006 @@ -7,7 +7,7 @@ { axis2_char_t s[100]=" abcd efgh "; axis2_char_t *trimmed; - trimmed = AXIS2_STRLTRIM(s, " \t\r\n"); + trimmed = AXIS2_STRLTRIM(env, s, " \t\r\n"); if (0 == AXIS2_STRCMP(trimmed, "abcd efgh ")) printf("AXIS2_STRLTRIM successful\n"); else @@ -18,7 +18,7 @@ { axis2_char_t s[100]=" abcd efgh "; axis2_char_t *trimmed; - trimmed = AXIS2_STRRTRIM(s, " \t\r\n"); + trimmed = AXIS2_STRRTRIM(env, s, " \t\r\n"); if (0 == AXIS2_STRCMP(trimmed, " abcd efgh")) printf("AXIS2_STRRTRIM successful\n"); else @@ -29,7 +29,7 @@ { axis2_char_t s[100]=" abcd efgh "; axis2_char_t *trimmed; - trimmed = AXIS2_STRTRIM(s, " \t\r\n"); + trimmed = AXIS2_STRTRIM(env, s, " \t\r\n"); if (0 == AXIS2_STRCMP(trimmed, "abcd efgh")) printf("AXIS2_STRTRIM successful\n"); else Modified: webservices/axis2/trunk/c/util/test/util/test_util.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/test/util/test_util.c (original) +++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Jun 9 05:39:10 2006 @@ -267,5 +267,6 @@ axis2_allocator_t *allocator = env->allocator; axis2_env_free(env); axis2_allocator_free(allocator); + run_test_string(env); return 0; } Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault.h Fri Jun 9 05:39:10 2006 @@ -124,17 +124,42 @@ const axis2_env_t *env); AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL +axis2_woden_interface_fault_to_nested_configurable( + void *interface_fault, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL +axis2_woden_interface_fault_to_configurable( + void *interface_fault, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL axis2_woden_interface_fault_to_nested_element( void *interface_fault, const axis2_env_t *env); AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL -axis2_woden_interface_fault_to_nested_configurable( +axis2_woden_interface_fault_to_configurable_element( void *interface_fault, const axis2_env_t *env); AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL -axis2_woden_interface_fault_to_configurable( +axis2_woden_interface_fault_to_documentable_element( + void *interface_fault, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL +axis2_woden_interface_fault_to_documentable( + void *interface_fault, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL +axis2_woden_interface_fault_to_attr_extensible( + void *interface_fault, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_t * AXIS2_CALL +axis2_woden_interface_fault_to_element_extensible( void *interface_fault, const axis2_env_t *env); Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault_ref.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault_ref.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault_ref.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_fault_ref.h Fri Jun 9 05:39:10 2006 @@ -126,6 +126,37 @@ void *interface_fault_ref, const axis2_env_t *env); +AXIS2_EXTERN axis2_woden_interface_fault_ref_t * AXIS2_CALL +axis2_woden_interface_fault_ref_to_nested_element( + void *interface_fault_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_ref_t * AXIS2_CALL +axis2_woden_interface_fault_ref_to_configurable_element( + void *interface_fault_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_ref_t * AXIS2_CALL +axis2_woden_interface_fault_ref_to_documentable_element( + void *interface_fault_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_ref_t * AXIS2_CALL +axis2_woden_interface_fault_ref_to_documentable( + void *interface_fault_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_ref_t * AXIS2_CALL +axis2_woden_interface_fault_ref_to_attr_extensible( + void *interface_fault_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_fault_ref_t * AXIS2_CALL +axis2_woden_interface_fault_ref_to_element_extensible( + void *interface_fault_ref, + const axis2_env_t *env); + + AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_woden_interface_fault_ref_resolve_methods( axis2_woden_interface_fault_ref_t *interface_fault_ref, Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_msg_ref.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_msg_ref.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_msg_ref.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_msg_ref.h Fri Jun 9 05:39:10 2006 @@ -149,6 +149,37 @@ void *interface_msg_ref, const axis2_env_t *env); +AXIS2_EXTERN axis2_woden_interface_msg_ref_t * AXIS2_CALL +axis2_woden_interface_msg_ref_to_nested_element( + void *interface_msg_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_msg_ref_t * AXIS2_CALL +axis2_woden_interface_msg_ref_to_configurable_element( + void *interface_msg_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_msg_ref_t * AXIS2_CALL +axis2_woden_interface_msg_ref_to_documentable_element( + void *interface_msg_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_msg_ref_t * AXIS2_CALL +axis2_woden_interface_msg_ref_to_documentable( + void *interface_msg_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_msg_ref_t * AXIS2_CALL +axis2_woden_interface_msg_ref_to_attr_extensible( + void *interface_msg_ref, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_msg_ref_t * AXIS2_CALL +axis2_woden_interface_msg_ref_to_element_extensible( + void *interface_msg_ref, + const axis2_env_t *env); + + AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_woden_interface_msg_ref_resolve_methods( axis2_woden_interface_msg_ref_t *interface_msg_ref, Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h Fri Jun 9 05:39:10 2006 @@ -133,6 +133,37 @@ void *interface_op, const axis2_env_t *env); +AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL +axis2_woden_interface_op_to_nested_element( + void *interface_op, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL +axis2_woden_interface_op_to_configurable_element( + void *interface_op, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL +axis2_woden_interface_op_to_documentable_element( + void *interface_op, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL +axis2_woden_interface_op_to_documentable( + void *interface_op, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL +axis2_woden_interface_op_to_attr_extensible( + void *interface_op, + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_interface_op_t * AXIS2_CALL +axis2_woden_interface_op_to_element_extensible( + void *interface_op, + const axis2_env_t *env); + + AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_woden_interface_op_resolve_methods( axis2_woden_interface_op_t *interface_op, Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h Fri Jun 9 05:39:10 2006 @@ -99,6 +99,21 @@ void *property, const axis2_env_t *env); + /* **************************************************************************** + * Non-API implementation methods + * ***************************************************************************/ + axis2_status_t (AXIS2_CALL * + set_value_constraint) ( + void *property, + const axis2_env_t *env, + void *type_def); + + axis2_status_t (AXIS2_CALL * + set_types) ( + void *property, + const axis2_env_t *env, + void *types); + }; union axis2_woden_property_base @@ -205,6 +220,14 @@ #define AXIS2_WODEN_PROPERTY_TO_ELEMENT(property, env) \ (((axis2_woden_property_t *) property)->ops->\ to_element(property, env)) + +#define AXIS2_WODEN_PROPERTY_SET_VALUE_CONSTRAINT(property, env, type_def) \ + (((axis2_woden_property_t *) property)->ops->\ + set_value_constraint(property, env, type_def)) + +#define AXIS2_WODEN_PROPERTY_SET_TYPES(property, env, types) \ + (((axis2_woden_property_t *) property)->ops->\ + set_types(property, env, types)) /** @} */ #ifdef __cplusplus Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h Fri Jun 9 05:39:10 2006 @@ -80,16 +80,6 @@ void *direction, const axis2_env_t *env); - void *(AXIS2_CALL * - get_direction_in) ( - void *direction, - const axis2_env_t *env); - - void *(AXIS2_CALL * - get_direction_out) ( - void *direction, - const axis2_env_t *env); - axis2_char_t *(AXIS2_CALL * to_string) ( void *direction, @@ -104,22 +94,17 @@ }; -AXIS2_EXTERN axis2_woden_direction_t * AXIS2_CALL -axis2_woden_direction_create( - const axis2_env_t *env, - axis2_char_t *value); +AXIS2_EXTERN axis2_woden_direction_t *AXIS2_CALL +axis2_woden_direction_get_direction_in( + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_direction_t *AXIS2_CALL +axis2_woden_direction_get_direction_out( + const axis2_env_t *env); #define AXIS2_WODEN_DIRECTION_FREE(direction, env) \ (((axis2_woden_direction_t *) direction)->ops->\ free (direction, env)) - -#define AXIS2_WODEN_DIRECTION_GET_DIRECTION_IN(direction, env) \ - (((axis2_woden_direction_t *) direction)->ops->\ - get_direction_in (direction, env)) - -#define AXIS2_WODEN_DIRECTION_GET_DIRECTION_OUT(direction, env) \ - (((axis2_woden_direction_t *) direction)->ops->\ - get_direction_out (direction, env)) #define AXIS2_WODEN_DIRECTION_TO_STRING(direction, env) \ (((axis2_woden_direction_t *) direction)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h?rev=413030&r1=413029&r2=413030&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h (original) +++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h Fri Jun 9 05:39:10 2006 @@ -81,16 +81,6 @@ void *msg_label, const axis2_env_t *env); - void *(AXIS2_CALL * - get_msg_label_in) ( - void *msg_label, - const axis2_env_t *env); - - void *(AXIS2_CALL * - get_msg_label_out) ( - void *msg_label, - const axis2_env_t *env); - axis2_char_t *(AXIS2_CALL * to_string) ( void *msg_label, @@ -116,23 +106,22 @@ }; -AXIS2_EXTERN axis2_woden_msg_label_t * AXIS2_CALL -axis2_woden_msg_label_create( +AXIS2_EXTERN axis2_woden_msg_label_t *AXIS2_CALL +axis2_woden_msg_label_get_msg_label_in( + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_msg_label_t *AXIS2_CALL +axis2_woden_msg_label_get_msg_label_out( + const axis2_env_t *env); + +AXIS2_EXTERN axis2_woden_msg_label_t *AXIS2_CALL +axis2_woden_msg_label_get_invalid_value( const axis2_env_t *env, - axis2_char_t *value, - axis2_bool_t valid); + const axis2_char_t *value); #define AXIS2_WODEN_MSG_LABEL_FREE(msg_label, env) \ (((axis2_woden_msg_label_t *) msg_label)->ops->\ free (msg_label, env)) - -#define AXIS2_WODEN_MSG_LABEL_GET_MSG_LABEL_IN(msg_label, env) \ - (((axis2_woden_msg_label_t *) msg_label)->ops->\ - get_msg_label_in (msg_label, env)) - -#define AXIS2_WODEN_MSG_LABEL_GET_MSG_LABEL_OUT(msg_label, env) \ - (((axis2_woden_msg_label_t *) msg_label)->ops->\ - get_msg_label_out (msg_label, env)) #define AXIS2_WODEN_MSG_LABEL_TO_STRING(msg_label, env) \ (((axis2_woden_msg_label_t *) msg_label)->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=413030&r1=413029&r2=413030&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 Fri Jun 9 05:39:10 2006 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -89,9 +90,9 @@ axis2_status_t (AXIS2_CALL * set_value) (void *doc_el, const axis2_env_t *env, - void *value); + axis2_generic_obj_t *value); - void *(AXIS2_CALL * + axis2_generic_obj_t *(AXIS2_CALL * get_value) (void *doc_el, const axis2_env_t *env); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org