Author: damitha
Date: Wed Jun 14 03:37:49 2006
New Revision: 414183
URL: http://svn.apache.org/viewvc?rev=414183&view=rev
Log:
More link error fixes
Modified:
webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
webservices/axis2/trunk/c/woden/include/woden_configurable_element.h
webservices/axis2/trunk/c/woden/include/woden_interface_op.h
webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c
Modified: webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h?rev=414183&r1=414182&r2=414183&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h
(original)
+++ webservices/axis2/trunk/c/woden/include/woden_binding_op_element.h Wed Jun
14 03:37:49 2006
@@ -186,9 +186,9 @@
(((woden_binding_op_element_t *) binding_op_element)->ops->\
remove_msg_ref_element (binding_op_element, env, msg_ref))
-#define WODEN_BINDING_OP_ELEMENT_GET_MSG_REF_ELEMENTS(binding_op_element, env)
\
+#define
WODEN_BINDING_OP_ELEMENT_GET_BINDING_MSG_REF_ELEMENTS(binding_op_element, env) \
(((woden_binding_op_element_t *) binding_op_element)->ops->\
- get_msg_ref_elements (binding_op_element, env))
+ get_binding_msg_ref_elements (binding_op_element, env))
#define
WODEN_BINDING_OP_ELEMENT_ADD_BINDING_FAULT_REF_ELEMENT(binding_op_element, env,
fault_ref) \
(((woden_binding_op_element_t *) binding_op_element)->ops->\
@@ -198,9 +198,9 @@
(((woden_binding_op_element_t *) binding_op_element)->ops->\
remove_fault_ref_element (binding_op_element, env, fault_ref))
-#define WODEN_BINDING_OP_ELEMENT_GET_FAULT_REF_ELEMENTS(binding_op_element,
env) \
+#define
WODEN_BINDING_OP_ELEMENT_GET_BINDING_FAULT_REF_ELEMENTS(binding_op_element,
env) \
(((woden_binding_op_element_t *) binding_op_element)->ops->\
- get_fault_ref_elements (binding_op_element, env))
+ get_binding_fault_ref_elements (binding_op_element, env))
Modified: webservices/axis2/trunk/c/woden/include/woden_configurable_element.h
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_configurable_element.h?rev=414183&r1=414182&r2=414183&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_configurable_element.h
(original)
+++ webservices/axis2/trunk/c/woden/include/woden_configurable_element.h Wed
Jun 14 03:37:49 2006
@@ -139,7 +139,7 @@
#define WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(conf_el, env) \
(((woden_configurable_element_t *) conf_el)->ops->\
- get_propertyelements(conf_el, env))
+ get_property_elements(conf_el, env))
Modified: webservices/axis2/trunk/c/woden/include/woden_interface_op.h
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface_op.h?rev=414183&r1=414182&r2=414183&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface_op.h Wed Jun 14
03:37:49 2006
@@ -129,6 +129,11 @@
const axis2_env_t *env);
AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_nested_component(
+ void *interface_op,
+ const axis2_env_t *env);
+
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
woden_interface_op_to_configurable(
void *interface_op,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c?rev=414183&r1=414182&r2=414183&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c Wed Jun 14
03:37:49 2006
@@ -227,6 +227,31 @@
}
AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
+woden_interface_op_to_nested_component(
+ void *interface_op,
+ const axis2_env_t *env)
+{
+ woden_interface_op_impl_t *interface_op_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ if(!interface_op)
+ {
+ interface_op_impl = (woden_interface_op_impl_t *) create(env);
+ }
+ else
+ interface_op_impl = (woden_interface_op_impl_t *) interface_op;
+
+ woden_interface_op_free_ops(interface_op, env);
+
+
interface_op_impl->interface_op.base.nested_configurable.base.nested_component.ops
=
+ AXIS2_MALLOC(env->allocator,
+ sizeof(woden_nested_component_ops_t));
+
woden_nested_component_resolve_methods(&(interface_op_impl->interface_op.base.
+ nested_configurable.base.nested_component), env,
interface_op_impl->methods);
+ return interface_op;
+}
+
+AXIS2_EXTERN woden_interface_op_t * AXIS2_CALL
woden_interface_op_to_configurable(
void *interface_op,
const axis2_env_t *env)
@@ -434,6 +459,8 @@
interface_op_impl->interface_op.base.interface_op_element.ops = NULL;
interface_op_impl->interface_op.base.nested_configurable.ops = NULL;
+ interface_op_impl->interface_op.base.nested_configurable.base.
+ nested_component.ops = NULL;
interface_op_impl->interface_op.base.nested_configurable.base.configurable.ops
=
NULL;
interface_op_impl->interface_op.base.interface_op_element.base.
@@ -592,6 +619,15 @@
nested_configurable.ops);
interface_op_impl->interface_op.base.nested_configurable.ops =
NULL;
+ }
+
+ if(interface_op_impl->interface_op.base.nested_configurable.base.
+ nested_component.ops)
+ {
+ AXIS2_FREE(env->allocator, interface_op_impl->interface_op.base.
+ nested_configurable.base.nested_component.ops);
+ interface_op_impl->interface_op.base.nested_configurable.base.
+ nested_component.ops = NULL;
}
if(interface_op_impl->interface_op.base.nested_configurable.base.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
