You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/06/01 06:20:43 UTC
svn commit: r410738 - in /webservices/axis2/trunk/c/woden: ./ include/woden/
include/woden/wsdl20/ include/woden/wsdl20/extensions/
include/woden/wsdl20/xml/ include/woden/xml/ src/wsdl20/
src/wsdl20/extensions/ src/xml/
Author: damitha
Date: Wed May 31 21:20:38 2006
New Revision: 410738
URL: http://svn.apache.org/viewvc?rev=410738&view=rev
Log:
Resolving Conflicts after env change
Removed:
webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_documentation.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_endpoint.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_feature.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface.h
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/axis2_woden_svc.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_type_def.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_types.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_element_extensible.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_wsdl_element.h
webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h
webservices/axis2/trunk/c/woden/src/wsdl20/documentation.c
webservices/axis2/trunk/c/woden/src/wsdl20/endpoint.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/component_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/feature.c
webservices/axis2/trunk/c/woden/src/wsdl20/interface.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
webservices/axis2/trunk/c/woden/src/wsdl20/svc.c
webservices/axis2/trunk/c/woden/src/wsdl20/types.c
webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c
webservices/axis2/trunk/c/woden/src/xml/qname_or_token_any_attr.c
Modified:
webservices/axis2/trunk/c/woden/configure.ac
webservices/axis2/trunk/c/woden/include/woden/axis2_woden.h
webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h
webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h
webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h
webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c
webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c
webservices/axis2/trunk/c/woden/src/xml/xml_attr.c
Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Wed May 31 21:20:38 2006
@@ -124,7 +124,9 @@
src/types/Makefile \
src/wsdl20/Makefile \
src/wsdl20/xml/Makefile \
- src/wsdl20/extensions/Makefile
+ src/wsdl20/enumeration/Makefile \
+ src/wsdl20/extensions/Makefile \
+ src/wsdl20/extensions/soap/Makefile
])
AC_OUTPUT
Modified: webservices/axis2/trunk/c/woden/include/woden/axis2_woden.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/axis2_woden.h?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/axis2_woden.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/axis2_woden.h Wed May 31 21:20:38 2006
@@ -77,7 +77,15 @@
AXIS2_WODEN_ENDPOINT,
AXIS2_WODEN_SVC,
AXIS2_WODEN_ELEMENT_DECL,
- AXIS2_WODEN_DIRECTION
+ AXIS2_WODEN_SOAP_BINDING_EXTS,
+ AXIS2_WODEN_SOAP_BINDING_FAULT_EXTS,
+ AXIS2_WODEN_SOAP_BINDING_FAULT_REF_EXTS,
+ AXIS2_WODEN_SOAP_BINDING_MSG_REF_EXTS,
+ AXIS2_WODEN_SOAP_BINDING_OP_EXTS,
+ AXIS2_WODEN_IMPORT,
+ AXIS2_WODEN_INCLUDE,
+ AXIS2_QNAME,
+ AXIS2_QNAME_LIST
} axis2_woden_obj_types_t;
/** @} */
Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h Wed May 31 21:20:38 2006
@@ -100,6 +100,10 @@
struct axis2_woden_wsdl_element *parent_el,
axis2_url_t *namespc);
+ void *(AXIS2_CALL *
+ get_parent_element) (
+ void *component_exts,
+ axis2_env_t **env);
};
struct axis2_woden_component_exts
@@ -141,6 +145,9 @@
(((axis2_woden_component_exts_t *) component_exts)->ops->\
get_namespace(component_exts, env))
+#define AXIS2_WODEN_COMPONENT_EXTS_GET_PARENT_ELEMENT(component_exts, env) \
+ (((axis2_woden_component_exts_t *) component_exts)->ops->\
+ get_parent_element(component_exts, env))
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h Wed May 31 21:20:38 2006
@@ -54,17 +54,17 @@
*/
axis2_status_t (AXIS2_CALL *
free) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
to_qname_or_token_any_attr_free) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
axis2_woden_obj_types_t (AXIS2_CALL *
type) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
/**
@@ -72,7 +72,7 @@
*/
axis2_woden_xml_attr_t *(AXIS2_CALL *
get_base_impl) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
/* ************************************************************
@@ -81,23 +81,23 @@
axis2_bool_t (AXIS2_CALL *
is_qname) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
axis2_bool_t (AXIS2_CALL *
is_token) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
- axis2_array_list_t *(AXIS2_CALL *
- get_qnames) (
- void *list_token_attr,
+ axis2_qname_t *(AXIS2_CALL *
+ get_qname) (
+ void *token_attr,
const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
get_token) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env);
/* ************************************************************
@@ -112,7 +112,7 @@
*/
void *(AXIS2_CALL *
convert) (
- void *list_token_attr,
+ void *token_attr,
const axis2_env_t *env,
struct axis2_om_element *owner_el,
struct axis2_om_node *owner_node,
@@ -142,57 +142,43 @@
/************************Woden C Internal Methods******************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_woden_qname_or_token_any_attr_resolve_methods(
- axis2_woden_qname_or_token_any_attr_t *list_token_attr,
+ axis2_woden_qname_or_token_any_attr_t *token_attr,
const axis2_env_t *env,
axis2_hash_t *methods);
/************************End of Woden C Internal Methods***********************/
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_FREE(list_token_attr, env) \
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_FREE(token_attr, env) \
(((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->free(list_token_attr, env))
+ token_attr)->ops->free(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_TO_QNAME_OR_TOKEN_ANY_ATTR_FREE(\
- list_token_attr, env) \
- (((axis2_woden_qname_or_token_any_attr_t *) list_token_attr)->ops->\
- to_qname_or_token_any_attr_free(list_token_attr, env))
-
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_TYPE(list_token_attr, env) \
- (((axis2_woden_qname_or_token_any_attr_t *) list_token_attr)->ops->\
- type(list_token_attr, env))
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_TYPE(token_attr, env) \
+ (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+ type(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_BASE_IMPL(list_token_attr, \
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_BASE_IMPL(token_attr, \
env) \
- (((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->get_base_impl(list_token_attr, \
- env))
+ (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+ get_base_impl(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_QNAME(list_token_attr, \
- env) \
- (((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->is_qname(list_token_attr, \
- env))
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_QNAME(token_attr, env) \
+ (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+ is_qname(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_TOKEN(list_token_attr, env) \
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_IS_TOKEN(token_attr, env) \
(((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->is_token(list_token_attr, \
- env))
+ token_attr)->ops->is_token(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_QNAMES(list_token_attr, \
- env) \
- (((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->get_qnames(list_token_attr, \
- env))
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_QNAME(token_attr, env) \
+ (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+ get_qname(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_TOKEN(list_token_attr, \
- env) \
- (((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->get_token(list_token_attr, \
- env))
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_GET_TOKEN(token_attr, env) \
+ (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+ get_token(token_attr, env))
-#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_CONVERT(list_token_attr, env) \
- (((axis2_woden_qname_or_token_any_attr_t *) \
- list_token_attr)->ops->convert(list_token_attr, \
- env))
+#define AXIS2_WODEN_QNAME_OR_TOKEN_ANY_ATTR_CONVERT(token_attr, env) \
+ (((axis2_woden_qname_or_token_any_attr_t *) token_attr)->ops->\
+ convert(token_attr, env))
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h Wed May 31 21:20:38 2006
@@ -130,10 +130,6 @@
(((axis2_woden_string_attr_t *) string_attr)->ops->\
free(string_attr, env))
-#define AXIS2_WODEN_STRING_ATTR_TO_STRING_ATTR_FREE(string_attr, env) \
- (((axis2_woden_string_attr_t *) string_attr)->ops->\
- to_string_attr_free(string_attr, env))
-
#define AXIS2_WODEN_STRING_ATTR_TYPE(string_attr, env) \
(((axis2_woden_string_attr_t *) string_attr)->ops->\
type(string_attr, env))
@@ -142,7 +138,7 @@
(((axis2_woden_string_attr_t *) string_attr)->ops->\
get_base_impl(string_attr, env))
-#define AXIS2_WODEN_STRING_ATTR_GET_URI(string_attr, env) \
+#define AXIS2_WODEN_STRING_ATTR_GET_STRING(string_attr, env) \
(((axis2_woden_string_attr_t *) string_attr)->ops->\
get_string(string_attr, env))
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/Makefile.am Wed May 31 21:20:38 2006
@@ -1,4 +1,4 @@
-SUBDIRS = xml extensions
+SUBDIRS = enumeration xml extensions
noinst_LTLIBRARIES = libaxis2_woden_wsdl20.la
libaxis2_woden_wsdl20_la_SOURCES = \
@@ -28,7 +28,9 @@
endpoint.c \
svc.c \
wsdl_ref.c \
- element_decl.c
+ element_decl.c \
+ import.c \
+ include.c
INCLUDES = -I$(top_builddir)/include \
@AXIOMINC@ \
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/Makefile.am Wed May 31 21:20:38 2006
@@ -1,4 +1,5 @@
noinst_LTLIBRARIES = libaxis2_woden_extensions.la
+SUBDIRS = soap
libaxis2_woden_extensions_la_SOURCES = \
element_extensible.c \
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c Wed May 31 21:20:38 2006
@@ -220,8 +220,6 @@
extensible->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- extensible->ops->to_element_extensible_free = axis2_hash_get(methods,
- "to_element_extensible_free", AXIS2_HASH_KEY_STRING);
extensible->ops->super_objs = axis2_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
extensible->ops->type = axis2_hash_get(methods, "type",
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c Wed May 31 21:20:38 2006
@@ -266,8 +266,6 @@
type_def->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- type_def->ops->to_type_def_free = axis2_hash_get(methods,
- "to_type_def_free", AXIS2_HASH_KEY_STRING);
type_def->ops->super_objs = axis2_hash_get(methods,
"super_objs", AXIS2_HASH_KEY_STRING);
type_def->ops->type = axis2_hash_get(methods, "type",
Modified: webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/qname_list_or_token_any_attr.c Wed May 31 21:20:38 2006
@@ -264,10 +264,14 @@
{
axis2_woden_qname_list_or_token_any_attr_impl_t *
list_token_attr_impl = NULL;
+ axis2_generic_obj_t *content = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
- if(AXIS2_FALSE == list_token_attr_impl->is_token)
+
+ content = AXIS2_WODEN_XML_ATTR_GET_CONTENT(list_token_attr_impl->xml_attr,
+ env);
+ if(AXIS2_QNAME_LIST == AXIS2_GENERIC_OBJ_GET_TYPE(content, env))
return AXIS2_TRUE;
return AXIS2_FALSE;
}
@@ -283,8 +287,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
- if(AXIS2_TRUE == AXIS2_WODEN_XML_ATTR_IS_VALID(list_token_attr_impl->xml_attr, env) &&
- list_token_attr_impl->is_token)
+ if(AXIS2_TRUE != axis2_woden_qname_list_or_token_any_attr_is_qname_list(
+ list_token_attr, env) && AXIS2_TRUE ==
+ AXIS2_WODEN_XML_ATTR_IS_VALID(list_token_attr_impl->xml_attr, env))
{
return AXIS2_TRUE;
} else
Modified: webservices/axis2/trunk/c/woden/src/xml/xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/xml_attr.c?rev=410738&r1=410737&r2=410738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/xml_attr.c Wed May 31 21:20:38 2006
@@ -30,7 +30,7 @@
{
axis2_woden_xml_attr_t xml_attr;
axis2_qname_t *f_attr_type;
- void *f_content;
+ axis2_generic_obj_t *f_content;
axis2_char_t *f_external_form;
axis2_bool_t f_valid;
};
@@ -56,7 +56,7 @@
void *xml_attr,
const axis2_env_t *env);
-void *AXIS2_CALL
+axis2_generic_obj_t *AXIS2_CALL
axis2_woden_xml_attr_get_content(
void *xml_attr,
const axis2_env_t *env);
@@ -163,8 +163,6 @@
xml_attr->ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_xml_attr_ops_t));
xml_attr->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
- xml_attr->ops->to_xml_attr_free = axis2_hash_get(methods,
- "to_xml_attr_free", AXIS2_HASH_KEY_STRING);
xml_attr->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
xml_attr->ops->init = axis2_hash_get(methods,
"init", AXIS2_HASH_KEY_STRING);
@@ -235,7 +233,7 @@
return xml_attr_impl->f_attr_type;
}
-void *AXIS2_CALL
+axis2_generic_obj_t *AXIS2_CALL
axis2_woden_xml_attr_get_content(
void *xml_attr,
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