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/07/26 08:03:16 UTC
svn commit: r425636 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/description/
woden/src/wsdl10/extensions/soap/
Author: damitha
Date: Tue Jul 25 23:03:16 2006
New Revision: 425636
URL: http://svn.apache.org/viewvc?rev=425636&view=rev
Log:
Moved listener_manager.h from clientapi folder to main include folder
and renamed axis2_listner_manager.h.
Dynamic client sample is now working in client side.
Added:
webservices/axis2/trunk/c/include/axis2_listener_manager.h
- copied unchanged from r425633, webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.h
Removed:
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.h
Modified:
webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/description/client_utils.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c
Modified: webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am Tue Jul 25 23:03:16 2006
@@ -13,7 +13,6 @@
svc_client.c
noinst_HEADERS = callback_recv.h \
- listener_manager.h \
axis2_msg_sender.h
Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Tue Jul 25 23:03:16 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "listener_manager.h"
+#include <axis2_listener_manager.h>
#include <axis2_const.h>
#include <axis2_hash.h>
#include <axis2_transport_receiver.h>
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Tue Jul 25 23:03:16 2006
@@ -19,7 +19,7 @@
#include <axis2_hash.h>
#include <axis2_mep_client.h>
#include <axis2_uuid_gen.h>
-#include "listener_manager.h"
+#include <axis2_listener_manager.h>
#include <axis2_engine.h>
#include "callback_recv.h"
#include <axiom_xml_reader.h>
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Tue Jul 25 23:03:16 2006
@@ -23,7 +23,7 @@
#include <axiom_soap_const.h>
#include <axiom_soap_body.h>
#include <axiom_soap_header.h>
-#include "listener_manager.h"
+#include <axis2_listener_manager.h>
#include <axis2_module_desc.h>
#include <axis2_array_list.h>
#include <axis2_options.h>
@@ -206,6 +206,7 @@
axis2_svc_grp_t *svc_grp = NULL;
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
axis2_char_t *svc_grp_name = NULL;
+ axis2_hash_t *ops = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -251,6 +252,25 @@
svc_client_impl->svc = axis2_client_utils_create_axis2_svc(env, wsdl_uri,
wsdl_svc_qname, endpoint_name, wsdl_path, NULL);
+ if(svc_client_impl->svc)
+ {
+ axis2_hash_index_t *i = NULL;
+ void *v = NULL;
+ axis2_op_t *op = NULL;
+
+ ops = AXIS2_SVC_GET_OPS(svc_client_impl->svc, env);
+ for (i = axis2_hash_first (ops, env); i; i = axis2_hash_next (env, i))
+ {
+ axis2_hash_this (i, NULL, NULL, &v);
+ op = (axis2_op_t *) v;
+ axis2_phases_info_t *info = NULL;
+
+ /*AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);*/
+ /* Setting operation phase */
+ info = AXIS2_CONF_GET_PHASESINFO(svc_client_impl->conf, env);
+ AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
+ }
+ }
/** add the service to the config context if it isn't in there already */
if (NULL == AXIS2_CONF_GET_SVC(svc_client_impl->conf, env,
AXIS2_SVC_GET_NAME(svc_client_impl->svc, env)))
Modified: webservices/axis2/trunk/c/modules/core/description/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/client_utils.c?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/client_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/client_utils.c Tue Jul 25 23:03:16 2006
@@ -78,7 +78,6 @@
axis2_bool_t svc_found = AXIS2_FALSE;
axis2_bool_t endpoint_found = AXIS2_FALSE;
axis2_qname_t *svc_qname = NULL;
- int i = 0;
axis2_array_list_t *wsdl_svcs = NULL;
axis2_array_list_t *endpoints = NULL;
axis2_array_list_t *binding_ops = NULL;
@@ -96,9 +95,10 @@
{
int no_of_svcs = 0;
int no_of_endpoints = 0;
- int no_of_bindings = 0;
+ int no_of_binding_ops = 0;
int no_of_interface_msg_refs = 0;
axis2_svc = axis2_svc_create(env);
+ int i = 0;
wsdl_svcs = WODEN_DESC_GET_SVCS(desc, env);
if(wsdl_svcs)
@@ -126,6 +126,7 @@
{
axis2_char_t *localname = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
AXIS2_SVC_SET_NAME(axis2_svc, env, localname);
+ AXIS2_SVC_SET_QNAME(axis2_svc, env, svc_qname);
}
endpoints = WODEN_SVC_GET_ENDPOINTS(wsdl_svc, env);
if(endpoints)
@@ -169,8 +170,8 @@
if(binding)
binding_ops = WODEN_BINDING_GET_BINDING_OPS(binding, env);
if(binding_ops)
- no_of_bindings = AXIS2_ARRAY_LIST_SIZE(binding_ops, env);
- for(i = 0; i < no_of_bindings; i++)
+ no_of_binding_ops = AXIS2_ARRAY_LIST_SIZE(binding_ops, env);
+ for(i = 0; i < no_of_binding_ops; i++)
{
void *binding_op = NULL;
void *interface_op = NULL;
@@ -179,7 +180,7 @@
axis2_uri_t *soap_action_uri = NULL;
axis2_array_list_t *interface_msg_refs = NULL;
axis2_array_list_t *ext_elements = NULL;
- int i = 0;
+ int j = 0;
axis2_bool_t in = AXIS2_FALSE;
axis2_bool_t out = AXIS2_FALSE;
axis2_qname_t *op_qname = NULL;
@@ -192,13 +193,13 @@
if(interface_msg_refs)
no_of_interface_msg_refs = AXIS2_ARRAY_LIST_SIZE(
interface_msg_refs, env);
- for(i = 0; i < no_of_interface_msg_refs; i++)
+ for(j = 0; j < no_of_interface_msg_refs; j++)
{
void *interface_msg_ref = NULL;
void *direction = NULL;
axis2_char_t *str_direction = NULL;
- interface_msg_ref = AXIS2_ARRAY_LIST_GET(interface_msg_refs, env, i);
+ interface_msg_ref = AXIS2_ARRAY_LIST_GET(interface_msg_refs, env, j);
direction = WODEN_INTERFACE_MSG_REF_GET_DIRECTION(
interface_msg_ref, env);
str_direction = WODEN_DIRECTION_TO_STRING(direction, env);
@@ -231,8 +232,9 @@
axis2_svc = axis2_svc_create(env);
int no_of_svcs = 0;
int no_of_endpoints = 0;
- int no_of_bindings = 0;
+ int no_of_binding_ops = 0;
int no_of_interface_msg_refs = 0;
+ int i = 0;
wsdl_svcs = WODEN_WSDL10_DESC_GET_SVCS(desc, env);
if(wsdl_svcs)
@@ -260,6 +262,7 @@
{
axis2_char_t *localname = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
AXIS2_SVC_SET_NAME(axis2_svc, env, localname);
+ AXIS2_SVC_SET_QNAME(axis2_svc, env, svc_qname);
}
endpoints = WODEN_SVC_GET_ENDPOINTS(wsdl_svc, env);
if(endpoints)
@@ -302,17 +305,16 @@
if(binding)
binding_ops = WODEN_BINDING_GET_BINDING_OPS(binding, env);
if(binding_ops)
- no_of_bindings = AXIS2_ARRAY_LIST_SIZE(binding_ops, env);
- for(i = 0; i < no_of_bindings; i++)
+ no_of_binding_ops = AXIS2_ARRAY_LIST_SIZE(binding_ops, env);
+ for(i = 0; i < no_of_binding_ops; i++)
{
void *binding_op = NULL;
void *interface_op = NULL;
axis2_op_t *axis2_op = NULL;
void *ext_element = NULL;
- axis2_uri_t *soap_action_uri = NULL;
axis2_array_list_t *interface_msg_refs = NULL;
axis2_array_list_t *ext_elements = NULL;
- int i = 0, size = 0;
+ int j = 0, size = 0;
axis2_bool_t in = AXIS2_FALSE;
axis2_bool_t out = AXIS2_FALSE;
axis2_qname_t *op_qname = NULL;
@@ -328,14 +330,14 @@
if(interface_msg_refs)
no_of_interface_msg_refs = AXIS2_ARRAY_LIST_SIZE(
interface_msg_refs, env);
- for(i = 0; i < no_of_interface_msg_refs; i++)
+ for(j = 0; j < no_of_interface_msg_refs; j++)
{
void *interface_msg_ref = NULL;
void *direction = NULL;
axis2_char_t *str_direction = NULL;
interface_msg_ref = AXIS2_ARRAY_LIST_GET(interface_msg_refs,
- env, i);
+ env, j);
direction = WODEN_WSDL10_INTERFACE_MSG_REF_GET_DIRECTION(
interface_msg_ref, env);
str_direction = WODEN_DIRECTION_TO_STRING(direction, env);
@@ -359,13 +361,14 @@
env);
if(ext_elements)
size = AXIS2_ARRAY_LIST_SIZE(ext_elements, env);
- for(i = 0; i < size; i++)
+ for(j = 0; j < size; j++)
{
- ext_element = AXIS2_ARRAY_LIST_GET(ext_elements, env, i);
+ ext_element = AXIS2_ARRAY_LIST_GET(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
if(AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
{
void *soap_binding_op = NULL;
+ axis2_uri_t *soap_action_uri = NULL;
ext_element =
woden_wsdl10_soap_module_to_soap_module_element (
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module.c?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module.c Tue Jul 25 23:03:16 2006
@@ -131,13 +131,13 @@
axis2_status_t AXIS2_CALL
-woden_wsdl10_soap_module_set_extension_type(
+woden_wsdl10_soap_module_set_ext_type(
void *module,
axis2_env_t *env,
axis2_qname_t *qname);
axis2_qname_t *AXIS2_CALL
-woden_wsdl10_soap_module_get_extension_type(
+woden_wsdl10_soap_module_get_ext_type(
void *module,
axis2_env_t *env);
@@ -423,11 +423,11 @@
axis2_hash_set(module_impl->methods, "set_ext_type",
AXIS2_HASH_KEY_STRING,
- woden_wsdl10_soap_module_set_extension_type);
+ woden_wsdl10_soap_module_set_ext_type);
axis2_hash_set(module_impl->methods, "get_ext_type",
AXIS2_HASH_KEY_STRING,
- woden_wsdl10_soap_module_get_extension_type);
+ woden_wsdl10_soap_module_get_ext_type);
axis2_hash_set(module_impl->methods, "set_required",
AXIS2_HASH_KEY_STRING,
@@ -913,7 +913,7 @@
axis2_status_t AXIS2_CALL
-woden_wsdl10_soap_module_set_extension_type(
+woden_wsdl10_soap_module_set_ext_type(
void *module,
axis2_env_t *env,
axis2_qname_t *qname)
@@ -938,7 +938,7 @@
}
axis2_qname_t *AXIS2_CALL
-woden_wsdl10_soap_module_get_extension_type(
+woden_wsdl10_soap_module_get_ext_type(
void *module,
axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c?rev=425636&r1=425635&r2=425636&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c Tue Jul 25 23:03:16 2006
@@ -328,8 +328,9 @@
mod_deser_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_WSDL10_SOAP_MODULE_DESERIALIZER", AXIS2_HASH_KEY_STRING));
- soap_mod = WODEN_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env,
- parent_type, element_type);
+ /*soap_mod = WODEN_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env,
+ parent_type, element_type);*/
+ soap_mod = woden_wsdl10_soap_module_create(env);
soap_mod = woden_wsdl10_soap_module_to_ext_element(soap_mod, env);
WODEN_EXT_ELEMENT_SET_EXT_TYPE(soap_mod, env, element_type);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org