You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/21 08:41:05 UTC
svn commit: r415926 - in /webservices/axis2/trunk/c: ./ woden/
woden/include/ woden/samples/ woden/samples/wsdl10/
woden/src/builder/wsdl10/ woden/src/wsdl10/ woden/src/wsdl10/xml/
woden/src/wsdl20/extensions/soap/
Author: damitha
Date: Tue Jun 20 23:41:04 2006
New Revision: 415926
URL: http://svn.apache.org/viewvc?rev=415926&view=rev
Log:
AXIS2C_HOME should come at the top of the page
Modified:
webservices/axis2/trunk/c/build_all.sh
webservices/axis2/trunk/c/woden/configure.ac
webservices/axis2/trunk/c/woden/include/woden_soap_module_deserializer.h
webservices/axis2/trunk/c/woden/samples/Makefile.am
webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am
webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl10/desc.c
webservices/axis2/trunk/c/woden/src/wsdl10/part.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h
webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am
webservices/axis2/trunk/c/woden/src/wsdl10/xml/desc_element.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_deserializer.c
Modified: webservices/axis2/trunk/c/build_all.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build_all.sh?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build_all.sh (original)
+++ webservices/axis2/trunk/c/build_all.sh Tue Jun 20 23:41:04 2006
@@ -1,3 +1,7 @@
+AXIS2C_HOME=`pwd`/deploy
+AXIS2C=`pwd`
+export AXIS2C_HOME AXIS2C
+
cd util
./autogen.sh
@@ -63,10 +67,6 @@
then
exit 1
fi
-
-XIS2C_HOME=`pwd`/deploy
-AXIS2C=`pwd`
-export AXIS2C_HOME AXIS2C
./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-trace=yes --with-apache2=/usr/include/apache2 --with-apr=/usr/include/apr-0 --enable-diclient=no --enable-static=no --enable-openssl=no --with-axis2_util=${AXIS2C}/util/include --with-axiom=${AXIS2C}/axiom/include
if [ "$?" -ne 0 ]
Modified: webservices/axis2/trunk/c/woden/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/configure.ac?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/configure.ac (original)
+++ webservices/axis2/trunk/c/woden/configure.ac Tue Jun 20 23:41:04 2006
@@ -129,6 +129,9 @@
src/wsdl20/extensions/soap/Makefile \
src/wsdl10/Makefile \
src/wsdl10/xml/Makefile \
+ src/wsdl10/enumeration/Makefile \
+ src/wsdl10/extensions/Makefile \
+ src/wsdl10/extensions/soap/Makefile \
src/builder/Makefile \
src/builder/wsdl10/Makefile \
samples/Makefile \
Modified: webservices/axis2/trunk/c/woden/include/woden_soap_module_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_soap_module_deserializer.h?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_soap_module_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_soap_module_deserializer.h Tue Jun 20 23:41:04 2006
@@ -73,7 +73,7 @@
const axis2_env_t *env);
void *(AXIS2_CALL *
- marshall) (
+ unmarshall) (
void *mod_deser,
const axis2_env_t *env,
axis2_char_t *parent_type,
@@ -122,10 +122,10 @@
#define WODEN_SOAP_MODULE_DESERIALIZER_GET_BASE_IMPL(mod_deser, env) \
(((woden_soap_module_deserializer_t *) mod_deser)->ops->get_base_impl(mod_deser, env))
-#define WODEN_SOAP_MODULE_DESERIALIZER_MARSHALL(mod_deser, env, \
+#define WODEN_SOAP_MODULE_DESERIALIZER_UNMARSHALL(mod_deser, env, \
parent_type, parent, element_type, el_node, desc, ext_reg) \
(((woden_soap_module_deserializer_t *) mod_deser)->\
- marshall(mod_deser, env, parent_type, parent, element_type, el_node, \
+ unmarshall(mod_deser, env, parent_type, parent, element_type, el_node, \
desc, ext_reg))
/** @} */
Modified: webservices/axis2/trunk/c/woden/samples/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/Makefile.am?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/samples/Makefile.am Tue Jun 20 23:41:04 2006
@@ -10,7 +10,7 @@
-laxis2_axiom \
-laxis2_xml_schema \
-laxis2_parser \
- -lwoden_wsdl20 \
+ ../src/wsdl20/libwoden_wsdl20.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/Makefile.am Tue Jun 20 23:41:04 2006
@@ -9,8 +9,7 @@
-laxis2_axiom \
-laxis2_xml_schema \
-laxis2_parser \
- -lwoden_wsdl10 \
- -lwoden_wsdl20 \
+ ../../src/wsdl10/libwoden_wsdl10.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Tue Jun 20 23:41:04 2006
@@ -269,21 +269,6 @@
axiom_node_t *interface_el_node,
void *desc);
-/* Parse the attributes and child elements of interface <fault>.
- * As per WSDL 2.0 spec, the child elements must be in the following order if present:
- * <documentation>
- * <feature> <property> or extension elements in any order
- *
- * TODO validate that the elements are in correct order
- */
-static void *
-parse_interface_fault(
- void *reader,
- const axis2_env_t *env,
- axiom_node_t *fault_el_node,
- void *desc,
- void *parent);
-
static void *
parse_interface_op(
void *reader,
@@ -316,14 +301,6 @@
void *desc);
static void *
-parse_binding_fault(
- void *reader,
- const axis2_env_t *env,
- axiom_node_t *fault_el_node,
- void *desc,
- void *parent);
-
-static void *
parse_binding_op(
void *reader,
const axis2_env_t *env,
@@ -1328,7 +1305,7 @@
axis2_status_t status = AXIS2_FAILURE;
desc = woden_wsdl10_desc_to_desc_element(desc, env);
- msg = WODEN_WSDL10_DESC_ELEMENT_CREATE_INTERFACE_ELEMENT(desc, env);
+ msg = WODEN_WSDL10_DESC_ELEMENT_CREATE_MSG_ELEMENT(desc, env);
msg_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_el_node, env);
name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_el, env, WODEN_ATTR_NAME);
@@ -1366,9 +1343,10 @@
while (NULL != temp_el && NULL != temp_el_node)
{
axis2_qname_t *q_elem_documentation = NULL;
- axis2_char_t *elem_part = NULL;
+ axis2_qname_t *q_elem_part = NULL;
q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
+ q_elem_part = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PART);
if(AXIS2_TRUE == axis2_qname_util_matches(env,
q_elem_documentation, temp_el_node))
@@ -1379,7 +1357,8 @@
msg = woden_wsdl10_msg_ref_to_documentable(msg, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(msg, env, documentation);
}
- if(0 == AXIS2_STRCMP(WODEN_ELEM_PART, elem_part))
+ if(AXIS2_TRUE == axis2_qname_util_matches(env,
+ q_elem_part, temp_el_node))
{
void *part = NULL;
@@ -1590,13 +1569,11 @@
while (NULL != temp_el && NULL != temp_el_node)
{
axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_fault = NULL;
axis2_qname_t *q_elem_op = NULL;
axis2_qname_t *q_elem_feature = NULL;
axis2_qname_t *q_elem_property = NULL;
q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
- q_elem_fault = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FAULT);
q_elem_op = axis2_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
@@ -1611,16 +1588,6 @@
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(intface, env, documentation);
}
else if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_fault, temp_el_node))
- {
- void *intface_fault = NULL;
-
- intface_fault = parse_interface_fault(reader, env, temp_el_node, desc,
- intface);
- intface = woden_interface_to_interface_element(intface, env);
- WODEN_INTERFACE_ELEMENT_ADD_INTERFACE_FAULT_ELEMENT(intface, env, intface_fault);
- }
- else if(AXIS2_TRUE == axis2_qname_util_matches(env,
q_elem_op, temp_el_node))
{
void *intface_op = NULL;
@@ -1669,140 +1636,6 @@
return intface;
}
-/* Parse the attributes and child elements of interface <fault>.
- * As per WSDL 2.0 spec, the child elements must be in the following order if present:
- * <documentation>
- * <feature> <property> or extension elements in any order
- *
- * TODO validate that the elements are in correct order
- */
-static void *
-parse_interface_fault(
- void *reader,
- const axis2_env_t *env,
- axiom_node_t *fault_el_node,
- void *desc,
- void *parent)
-{
- void *fault = NULL;
- axis2_char_t *name = NULL;
- axis2_char_t *element = NULL;
- axiom_element_t *fault_el = NULL;
- axiom_element_t *temp_el = NULL;
- axiom_node_t *temp_el_node = NULL;
- void *types = NULL;
- void *nested_configurable = NULL;
- axis2_status_t status = AXIS2_FAILURE;
-
- desc = woden_wsdl10_desc_to_desc_element(desc, env);
- fault = WODEN_WSDL10_DESC_ELEMENT_CREATE_INTERFACE_FAULT_ELEMENT(desc, env);
- nested_configurable = WODEN_INTERFACE_FAULT_GET_BASE_IMPL(fault, env);
- nested_configurable = woden_nested_configurable_to_nested_element(nested_configurable, env);
- WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent);
- types = WODEN_WSDL10_DESC_ELEMENT_GET_TYPES_ELEMENT(desc, env);
- WODEN_INTERFACE_FAULT_SET_TYPES(fault, env, types);
-
- fault_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_el_node, env);
- name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_el, env, WODEN_ATTR_NAME);
-
- if(NULL != name)
- {
- axis2_qname_t *qname = NULL;
- axis2_uri_t *ns = NULL;
- axis2_char_t *ns_str = NULL;
-
- ns = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- if(!ns)
- ns_str = WODEN_VALUE_EMPTY_STRING;
- ns_str = AXIS2_URI_TO_STRING(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
- qname = axis2_qname_create(env, name, ns_str, NULL);
- fault = woden_interface_fault_to_interface_fault_element(fault, env);
- WODEN_INTERFACE_FAULT_ELEMENT_SET_QNAME(fault, env, qname);
- }
-
- element = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_el, env, WODEN_ATTR_ELEMENT);
-
- if(NULL != element)
- {
- axis2_qname_t *qname = NULL;
- axis2_hash_t *namespcs = NULL;
-
- desc = woden_wsdl10_desc_to_desc_element(desc, env);
- namespcs = WODEN_WSDL10_DESC_ELEMENT_GET_NAMESPACES(desc, env);
-
- qname = woden_om_util_get_qname(env, fault_el_node, element, namespcs);
- fault = woden_interface_fault_to_interface_fault_element(fault, env);
- WODEN_INTERFACE_FAULT_ELEMENT_SET_QNAME(fault, env, qname);
- }
-
- /* TODO extends attribute */
-
- fault = woden_interface_fault_to_attr_extensible(fault, env);
- status = parse_ext_attributes(reader, env, fault_el_node, "interface_fault_element",
- fault, desc);
- if(AXIS2_SUCCESS != status)
- return NULL;
-
- temp_el = axiom_util_get_first_child_element(fault_el, env, fault_el_node,
- &temp_el_node);
-
- while (NULL != temp_el && NULL != temp_el_node)
- {
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env,
- WODEN_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
- WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
- WODEN_Q_ELEM_PROPERTY);
-
- if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_documentation, temp_el_node))
- {
- void *documentation = NULL;
-
- documentation = parse_documentation(reader, env, temp_el_node, desc);
- fault = woden_interface_fault_to_documentable(fault, env);
- WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault, env, documentation);
- }
- else if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_feature, temp_el_node))
- {
- void *feature = NULL;
-
- feature = parse_feature(reader, env, temp_el_node, desc, fault);
- fault = woden_interface_fault_to_configurable_element(fault, env);
- WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(fault, env, feature);
- }
- else if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_property, temp_el_node))
- {
- void *property = NULL;
-
- property = parse_property(reader, env, temp_el_node, desc, fault);
- fault = woden_interface_fault_to_configurable_element(fault, env);
- WODEN_CONFIGURABLE_ELEMENT_ADD_PROPERTY_ELEMENT(fault, env, property);
- }
- else
- {
- void *ext_element = NULL;
-
- ext_element = parse_ext_element(reader, env, "interface_fault_element",
- fault, temp_el_node, desc);
- fault = woden_interface_fault_to_element_extensible(fault, env);
- WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(fault, env, ext_element);
- }
-
- temp_el = axiom_util_get_next_sibling_element(temp_el, env,
- temp_el_node, &temp_el_node);
- }
-
- return fault;
-}
-
static void *
parse_interface_op(
void *reader,
@@ -2333,13 +2166,11 @@
while (NULL != temp_el && NULL != temp_el_node)
{
axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_fault = NULL;
axis2_qname_t *q_elem_op = NULL;
axis2_qname_t *q_elem_feature = NULL;
axis2_qname_t *q_elem_property = NULL;
q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
- q_elem_fault = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FAULT);
q_elem_op = axis2_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
@@ -2354,15 +2185,6 @@
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(binding, env, documentation);
}
else if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_fault, temp_el_node))
- {
- void *binding_fault = NULL;
- binding_fault = parse_binding_fault(reader, env, temp_el_node, desc,
- binding);
- binding = woden_binding_to_binding_element(binding, env);
- WODEN_BINDING_ELEMENT_ADD_BINDING_FAULT_ELEMENT(binding, env, binding_fault);
- }
- else if(AXIS2_TRUE == axis2_qname_util_matches(env,
q_elem_op, temp_el_node))
{
void *binding_op = NULL;
@@ -2405,151 +2227,6 @@
}
return binding;
-}
-
-static void *
-parse_binding_fault(
- void *reader,
- const axis2_env_t *env,
- axiom_node_t *fault_el_node,
- void *desc,
- void *parent)
-{
- void *fault = NULL;
- axis2_char_t *ref = NULL;
- axiom_element_t *fault_el;
- axiom_element_t *temp_el;
- axiom_node_t *temp_el_node;
- axis2_qname_t *attr_ref = NULL;
- axis2_qname_t *int_flt_qn = NULL;
- void *nested_configurable = NULL;
- axis2_status_t status = AXIS2_FAILURE;
-
- desc = woden_wsdl10_desc_to_desc_element(desc, env);
- fault = WODEN_WSDL10_DESC_ELEMENT_CREATE_BINDING_FAULT_ELEMENT(desc, env);
- nested_configurable = WODEN_BINDING_FAULT_GET_BASE_IMPL(fault, env);
- nested_configurable = woden_nested_configurable_to_nested_element(
- nested_configurable, env);
- WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent);
-
- attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_NAME);
- fault_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_el_node, env);
- ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_el, env, WODEN_ATTR_REF);
-
- if(NULL != ref)
- {
- axis2_hash_t *namespcs = NULL;
-
- desc = woden_wsdl10_desc_to_desc_element(desc, env);
- namespcs = WODEN_WSDL10_DESC_ELEMENT_GET_NAMESPACES(desc, env);
- int_flt_qn = woden_om_util_get_qname(env, fault_el_node, ref, namespcs);
- fault = woden_binding_fault_to_binding_fault_element(fault, env);
- WODEN_BINDING_FAULT_ELEMENT_SET_REF(fault, env, int_flt_qn);
- }
- /* Dereference the interface fault qname */
- if(NULL != int_flt_qn)
- {
- void *intface = NULL;
-
- /* Here I know that parent is an instance of binding */
- parent = woden_binding_to_binding_element(parent, env);
- intface = WODEN_BINDING_ELEMENT_GET_INTERFACE_ELEMENT(parent, env);
- if(NULL != intface)
- {
- axis2_array_list_t *int_faults = NULL;
- int i = 0, size = 0;
-
- int_faults =
- WODEN_INTERFACE_ELEMENT_GET_INTERFACE_FAULT_ELEMENTS(
- intface, env);
- size = AXIS2_ARRAY_LIST_SIZE(int_faults, env);
- for(i = 0; i < size; i++)
- {
- void *intface_flt = NULL;
- axis2_qname_t *qname = NULL;
-
- intface_flt = AXIS2_ARRAY_LIST_GET(int_faults, env, i);
- if(intface_flt)
- {
- intface_flt =
- woden_interface_fault_to_interface_fault_element(
- intface_flt, env);
- qname = WODEN_INTERFACE_FAULT_ELEMENT_GET_QNAME(
- intface_flt, env);
- }
- if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(int_flt_qn, env, qname))
- {
- WODEN_BINDING_FAULT_SET_INTERFACE_FAULT_ELEMENT(fault,
- env, intface_flt);
- }
-
- }
- }
- }
- fault = woden_binding_fault_to_attr_extensible(fault, env);
- status = parse_ext_attributes(reader, env, fault_el_node, "binding_fault_element",
- fault, desc);
- if(AXIS2_SUCCESS != status)
- return NULL;
-
- temp_el = axiom_util_get_first_child_element(fault_el, env, fault_el_node,
- &temp_el_node);
-
- while (NULL != temp_el && NULL != temp_el_node)
- {
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env,
- WODEN_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
- WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
- WODEN_Q_ELEM_PROPERTY);
-
- if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_documentation, temp_el_node))
- {
- void *documentation = NULL;
-
- documentation = parse_documentation(reader, env, temp_el_node, desc);
- fault = woden_binding_fault_to_documentable(fault, env);
- WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault, env, documentation);
- }
- else if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_feature, temp_el_node))
- {
- void *feature = NULL;
-
- feature = parse_feature(reader, env, temp_el_node, desc, fault);
- fault = woden_binding_fault_to_configurable_element(fault, env);
- WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(fault, env, feature);
- }
- else if(AXIS2_TRUE == axis2_qname_util_matches(env,
- q_elem_property, temp_el_node))
- {
- void *property = NULL;
-
- property = parse_property(reader, env, temp_el_node, desc, fault);
- fault = woden_binding_fault_to_configurable_element(fault, env);
- WODEN_CONFIGURABLE_ELEMENT_ADD_PROPERTY_ELEMENT(fault, env, property);
- }
- else
- {
- void *ext_element = NULL;
-
- ext_element = parse_ext_element(reader, env, "binding_fault_element",
- fault, temp_el_node, desc);
- fault = woden_binding_fault_to_element_extensible(fault, env);
- WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(fault, env, ext_element);
- }
-
- temp_el = axiom_util_get_next_sibling_element(temp_el, env,
- temp_el_node, &temp_el_node);
- }
-
- return fault;
}
static void *
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/Makefile.am Tue Jun 20 23:41:04 2006
@@ -1,23 +1,49 @@
-SUBDIRS = xml
+SUBDIRS = enumeration xml extensions
lib_LTLIBRARIES = libwoden_wsdl10.la
libwoden_wsdl10_la_SOURCES = \
- msg_ref.c \
- interface_msg_ref.c \
- interface_fault_ref.c \
- part.c \
- desc.c \
- binding_msg_ref.c \
- binding_op.c \
- component_model_builder.c
+ wsdl_element.c \
+ wsdl_obj.c \
+ documentable.c \
+ documentation.c \
+ wsdl_component.c \
+ nested_component.c \
+ configurable_component.c \
+ feature.c \
+ property.c \
+ types.c \
+ type_def.c \
+ msg_ref.c \
+ part.c \
+ configurable.c \
+ nested_configurable.c \
+ interface.c \
+ interface_fault_ref.c \
+ interface_msg_ref.c \
+ interface_op.c \
+ binding.c \
+ binding_fault_ref.c \
+ binding_msg_ref.c \
+ binding_op.c \
+ endpoint.c \
+ svc.c \
+ wsdl_ref.c \
+ element_decl.c \
+ import.c \
+ include.c \
+ desc.c \
+ component_model_builder.c
libwoden_wsdl10_la_LIBADD = \
$(top_builddir)/src/xml/libwoden_xml.la \
$(top_builddir)/src/util/libwoden_util.la \
$(top_builddir)/src/types/libwoden_types.la \
- $(top_builddir)/src/builder/wsdl10/libwoden_wsdl10_builder.la \
$(top_builddir)/src/schema/libwoden_schema.la \
- $(top_builddir)/src/wsdl10/xml/libwoden_wsdl10_xml.la
+ $(top_builddir)/src/builder/wsdl10/libwoden_wsdl10_builder.la \
+ $(top_builddir)/src/wsdl10/xml/libwoden_wsdl10_xml.la \
+ $(top_builddir)/src/wsdl10/enumeration/libwoden_wsdl10_enumeration.la \
+ $(top_builddir)/src/wsdl10/extensions/libwoden_wsdl10_extensions.la \
+ $(top_builddir)/src/wsdl10/extensions/soap/libwoden_wsdl10_extensions_soap.la
INCLUDES = -I$(top_builddir)/include \
@AXIOMINC@ \
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/desc.c?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/desc.c Tue Jun 20 23:41:04 2006
@@ -26,12 +26,10 @@
#include <woden_wsdl10_msg_ref.h>
#include <woden_wsdl10_part.h>
#include <woden_interface.h>
-#include <woden_interface_fault.h>
#include <woden_interface_op.h>
#include <woden_wsdl10_interface_fault_ref.h>
#include <woden_wsdl10_interface_msg_ref.h>
#include <woden_binding.h>
-#include <woden_binding_fault.h>
#include <woden_wsdl10_binding_op.h>
#include <woden_binding_fault_ref.h>
#include <woden_wsdl10_binding_msg_ref.h>
@@ -327,11 +325,6 @@
const axis2_env_t *env);
void *AXIS2_CALL
-woden_wsdl10_desc_create_interface_fault_element(
- void *desc,
- const axis2_env_t *env);
-
-void *AXIS2_CALL
woden_wsdl10_desc_create_interface_op_element(
void *desc,
const axis2_env_t *env);
@@ -352,11 +345,6 @@
const axis2_env_t *env);
void *AXIS2_CALL
-woden_wsdl10_desc_create_binding_fault_element(
- void *desc,
- const axis2_env_t *env);
-
-void *AXIS2_CALL
woden_wsdl10_desc_create_binding_op_element(
void *desc,
const axis2_env_t *env);
@@ -853,9 +841,6 @@
axis2_hash_set(desc_impl->methods, "create_interface_element",
AXIS2_HASH_KEY_STRING,
woden_wsdl10_desc_create_interface_element);
- axis2_hash_set(desc_impl->methods, "create_interface_fault_element",
- AXIS2_HASH_KEY_STRING,
- woden_wsdl10_desc_create_interface_fault_element);
axis2_hash_set(desc_impl->methods, "create_interface_op_element",
AXIS2_HASH_KEY_STRING,
woden_wsdl10_desc_create_interface_op_element);
@@ -868,9 +853,6 @@
axis2_hash_set(desc_impl->methods, "create_binding_element",
AXIS2_HASH_KEY_STRING,
woden_wsdl10_desc_create_binding_element);
- axis2_hash_set(desc_impl->methods, "create_binding_fault_element",
- AXIS2_HASH_KEY_STRING,
- woden_wsdl10_desc_create_binding_fault_element);
axis2_hash_set(desc_impl->methods, "create_binding_op_element",
AXIS2_HASH_KEY_STRING,
woden_wsdl10_desc_create_binding_op_element);
@@ -1878,14 +1860,6 @@
}
void *AXIS2_CALL
-woden_wsdl10_desc_create_interface_fault_element(
- void *desc,
- const axis2_env_t *env)
-{
- return woden_interface_fault_create(env);
-}
-
-void *AXIS2_CALL
woden_wsdl10_desc_create_interface_op_element(
void *desc,
const axis2_env_t *env)
@@ -1915,14 +1889,6 @@
const axis2_env_t *env)
{
return woden_binding_create(env);
-}
-
-void *AXIS2_CALL
-woden_wsdl10_desc_create_binding_fault_element(
- void *desc,
- const axis2_env_t *env)
-{
- return woden_binding_fault_create(env);
}
void *AXIS2_CALL
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/part.c?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/part.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/part.c Tue Jun 20 23:41:04 2006
@@ -830,7 +830,7 @@
part_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
- if(!part_impl->f_qname)
+ if(part_impl->f_qname)
{
AXIS2_QNAME_FREE(part_impl->f_qname, env);
part_impl->f_qname = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_constants.h Tue Jun 20 23:41:04 2006
@@ -46,7 +46,7 @@
#define WODEN_ELEM_IMPORT "import"
#define WODEN_ELEM_INCLUDE "include"
#define WODEN_ELEM_TYPES "types"
-#define WODEN_ELEM_INTERFACE "interface"
+#define WODEN_ELEM_INTERFACE "portType"
#define WODEN_ELEM_BINDING "binding"
#define WODEN_ELEM_SERVICE "service"
@@ -71,7 +71,8 @@
#define WODEN_Q_ELEM_INCLUDE "include|http://schemas.xmlsoap.org/wsdl"
#define WODEN_Q_ELEM_TYPES "types|http://schemas.xmlsoap.org/wsdl"
#define WODEN_Q_ELEM_MSG_REF "message|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_INTERFACE "interface|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_Q_ELEM_PART "part|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_Q_ELEM_INTERFACE "portType|http://schemas.xmlsoap.org/wsdl"
#define WODEN_Q_ELEM_BINDING "binding|http://schemas.xmlsoap.org/wsdl"
#define WODEN_Q_ELEM_SERVICE "service|http://schemas.xmlsoap.org/wsdl"
@@ -102,7 +103,7 @@
#define WODEN_ATTR_MESSAGE_LABEL "messageLabel"
#define WODEN_ATTR_REF "ref"
#define WODEN_ATTR_REQUIRED "required"
-#define WODEN_ATTR_INTERFACE "interface"
+#define WODEN_ATTR_INTERFACE "portType"
#define WODEN_ATTR_TYPE "type"
#define WODEN_ATTR_BINDING "binding"
#define WODEN_ATTR_ADDRESS "address"
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/xml/Makefile.am Tue Jun 20 23:41:04 2006
@@ -1,13 +1,31 @@
noinst_LTLIBRARIES = libwoden_wsdl10_xml.la
libwoden_wsdl10_xml_la_SOURCES = \
- msg_ref_element.c \
- interface_msg_ref_element.c \
- interface_fault_ref_element.c \
- part_element.c \
- desc_element.c \
- binding_msg_ref_element.c \
- binding_op_element.c
+ feature_element.c \
+ property_element.c \
+ documentation_element.c \
+ documentable_element.c \
+ nested_element.c \
+ configurable_element.c \
+ types_element.c \
+ msg_ref_element.c \
+ part_element.c \
+ interface_element.c \
+ interface_fault_element.c \
+ interface_fault_ref_element.c \
+ interface_msg_ref_element.c \
+ interface_op_element.c \
+ binding_element.c \
+ binding_fault_element.c \
+ binding_fault_ref_element.c \
+ binding_msg_ref_element.c \
+ binding_op_element.c \
+ include_element.c \
+ import_element.c \
+ fault_ref_element.c \
+ desc_element.c \
+ endpoint_element.c \
+ svc_element.c
INCLUDES = -I$(top_builddir)/include \
@AXIOMINC@ \
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/xml/desc_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/xml/desc_element.c?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/xml/desc_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/xml/desc_element.c Tue Jun 20 23:41:04 2006
@@ -56,10 +56,10 @@
"create_types_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_msg_element = axis2_hash_get(methods,
"create_msg_element", AXIS2_HASH_KEY_STRING);
+ desc_element->ops->create_part_element = axis2_hash_get(methods,
+ "create_part_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_interface_element = axis2_hash_get(methods,
"create_interface_element", AXIS2_HASH_KEY_STRING);
- desc_element->ops->create_interface_fault_element = axis2_hash_get(methods,
- "create_interface_fault_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_interface_op_element = axis2_hash_get(methods,
"create_interface_op_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_interface_fault_ref_element = axis2_hash_get(methods,
@@ -68,8 +68,6 @@
"create_interface_msg_ref_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_binding_element = axis2_hash_get(methods,
"create_binding_element", AXIS2_HASH_KEY_STRING);
- desc_element->ops->create_binding_fault_element = axis2_hash_get(methods,
- "create_binding_fault_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_binding_op_element = axis2_hash_get(methods,
"create_binding_op_element", AXIS2_HASH_KEY_STRING);
desc_element->ops->create_binding_fault_ref_element = axis2_hash_get(methods,
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_deserializer.c?rev=415926&r1=415925&r2=415926&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module_deserializer.c Tue Jun 20 23:41:04 2006
@@ -61,7 +61,7 @@
const axis2_env_t *env);
void *AXIS2_CALL
-woden_soap_module_deserializer_marshall(
+woden_soap_module_deserializer_unmarshall(
void *mod_deser,
const axis2_env_t *env,
axis2_char_t *parent_type,
@@ -141,8 +141,8 @@
mod_deser_impl->mod_deser.ops->type =
woden_soap_module_deserializer_type;
- mod_deser_impl->mod_deser.ops->marshall =
- woden_soap_module_deserializer_marshall;
+ mod_deser_impl->mod_deser.ops->unmarshall =
+ woden_soap_module_deserializer_unmarshall;
mod_deser_impl->methods = axis2_hash_make(env);
if(!mod_deser_impl->methods)
@@ -157,9 +157,9 @@
axis2_hash_set(mod_deser_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_module_deserializer_type);
- axis2_hash_set(mod_deser_impl->methods, "marshall",
+ axis2_hash_set(mod_deser_impl->methods, "unmarshall",
AXIS2_HASH_KEY_STRING,
- woden_soap_module_deserializer_marshall);
+ woden_soap_module_deserializer_unmarshall);
return &(mod_deser_impl->mod_deser);
}
@@ -290,17 +290,17 @@
mod_deser->ops->type = axis2_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- mod_deser->ops->marshall = axis2_hash_get(methods,
- "marshall", AXIS2_HASH_KEY_STRING);
- if(!mod_deser->ops->marshall && mod_deser_impl_l)
- mod_deser->ops->marshall =
- mod_deser_impl_l->mod_deser.ops->marshall;
+ mod_deser->ops->unmarshall = axis2_hash_get(methods,
+ "unmarshall", AXIS2_HASH_KEY_STRING);
+ if(!mod_deser->ops->unmarshall && mod_deser_impl_l)
+ mod_deser->ops->unmarshall =
+ mod_deser_impl_l->mod_deser.ops->unmarshall;
return AXIS2_SUCCESS;
}
void *AXIS2_CALL
-woden_soap_module_deserializer_marshall(
+woden_soap_module_deserializer_unmarshall(
void *mod_deser,
const axis2_env_t *env,
axis2_char_t *parent_type,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org