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 sa...@apache.org on 2006/05/04 16:41:42 UTC
svn commit: r399718 - in /webservices/axis2/trunk/c:
include/axis2_svc_client.h modules/core/clientapi/svc_client.c
modules/core/context/msg_ctx.c modules/core/phaseresolver/phase_resolver.c
modules/util/stream.c samples/user_guide/clients/Makefile.am
Author: samisa
Date: Thu May 4 07:41:40 2006
New Revision: 399718
URL: http://svn.apache.org/viewcvs?rev=399718&view=rev
Log:
Fixes related to module engaging in service client
Modified:
webservices/axis2/trunk/c/include/axis2_svc_client.h
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/util/stream.c
webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
Modified: webservices/axis2/trunk/c/include/axis2_svc_client.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc_client.h?rev=399718&r1=399717&r2=399718&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_client.h Thu May 4 07:41:40 2006
@@ -109,12 +109,12 @@
axis2_status_t (AXIS2_CALL *
engage_module)(struct axis2_svc_client *svc_client,
axis2_env_t **env,
- axis2_qname_t *module_name);
+ axis2_char_t *module_name);
axis2_status_t (AXIS2_CALL *
disengage_module)(struct axis2_svc_client *svc_client,
axis2_env_t **env,
- axis2_qname_t *module_name);
+ axis2_char_t *module_name);
/**
* Add an XML element as a header to be sent with interactions. This allows
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?rev=399718&r1=399717&r2=399718&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu May 4 07:41:40 2006
@@ -88,12 +88,12 @@
axis2_status_t AXIS2_CALL
axis2_svc_client_engage_module(struct axis2_svc_client *svc_client,
axis2_env_t **env,
- axis2_qname_t *module_name);
+ axis2_char_t *module_name);
axis2_status_t AXIS2_CALL
axis2_svc_client_disengage_module(struct axis2_svc_client *svc_client,
axis2_env_t **env,
- axis2_qname_t *module_name);
+ axis2_char_t *module_name);
axis2_status_t AXIS2_CALL
axis2_svc_client_add_header(struct axis2_svc_client *svc_client,
@@ -384,15 +384,19 @@
axis2_status_t AXIS2_CALL
axis2_svc_client_engage_module(struct axis2_svc_client *svc_client,
axis2_env_t **env,
- axis2_qname_t *module_name)
+ axis2_char_t *module_name)
{
axis2_svc_client_impl_t *svc_client_impl = NULL;
axis2_module_desc_t *module = NULL;
+ axis2_qname_t *mod_qname = NULL;
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FAILURE);
svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-
- module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, module_name);
+ mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
+
+ module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, mod_qname);
if (module)
{
@@ -405,15 +409,19 @@
axis2_status_t AXIS2_CALL
axis2_svc_client_disengage_module(struct axis2_svc_client *svc_client,
axis2_env_t **env,
- axis2_qname_t *module_name)
+ axis2_char_t *module_name)
{
axis2_svc_client_impl_t *svc_client_impl = NULL;
axis2_module_desc_t *module = NULL;
+ axis2_qname_t *mod_qname = NULL;
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+ AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FAILURE);
+
svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
-
- module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, module_name);
+ mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
+
+ module = AXIS2_CONF_GET_MODULE(svc_client_impl->conf, env, mod_qname);
/**TODO:uncomment once axis2_svc_disengage_module is implemented
if (module)
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?rev=399718&r1=399717&r2=399718&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Thu May 4 07:41:40 2006
@@ -1971,6 +1971,8 @@
AXIS2_OPTIONS_GET_PROPERTIES(options, env));
rest_val = (axis2_char_t *)AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_ENABLE_REST, AXIS2_FALSE);
+ axis2_msg_ctx_set_soap_action(msg_ctx, env,
+ AXIS2_OPTIONS_GET_ACTION(options, env));
if (rest_val)
{
if (AXIS2_STRCMP(rest_val, AXIS2_VALUE_TRUE) == 0)
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=399718&r1=399717&r2=399718&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Thu May 4 07:41:40 2006
@@ -1106,7 +1106,7 @@
}
index_i = axis2_hash_next (env, index_i);
- }
+ }
return status;
}
@@ -1496,6 +1496,7 @@
int size = 0;
int j = 0;
void *v = NULL;
+ axis2_bool_t engaged = AXIS2_FALSE;
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
@@ -1505,7 +1506,6 @@
{
axis2_module_desc_t *module_desc_l = NULL;
axis2_qname_t *module_d_qname_l = NULL;
- axis2_bool_t engaged = AXIS2_FALSE;
module_desc_l = AXIS2_ARRAY_LIST_GET(modules, env, j);
module_d_qname_l = AXIS2_MODULE_DESC_GET_NAME(module_desc_l, env);
@@ -1514,7 +1514,7 @@
engaged = AXIS2_TRUE;
break;
}
- if(AXIS2_FALSE == engaged)
+ /*if(AXIS2_FALSE == engaged)
{
status = axis2_phase_resolver_engage_module_to_op(
phase_resolver, env, op_desc, module_desc);
@@ -1525,7 +1525,20 @@
status = AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op_desc, env,
module_desc);
- }
+ }*/
+ }
+
+ if(AXIS2_FALSE == engaged)
+ {
+ status = axis2_phase_resolver_engage_module_to_op(
+ phase_resolver, env, op_desc, module_desc);
+ if(AXIS2_SUCCESS != status)
+ {
+ return status;
+ }
+
+ status = AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op_desc, env,
+ module_desc);
}
}
Modified: webservices/axis2/trunk/c/modules/util/stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/stream.c?rev=399718&r1=399717&r2=399718&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/stream.c Thu May 4 07:41:40 2006
@@ -584,6 +584,9 @@
void *buffer, size_t count)
{
int len = 0;
+#ifdef AXIS2_TCPMON
+ axis2_char_t *temp = NULL;
+#endif
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
@@ -623,6 +626,9 @@
const void *buffer, size_t count)
{
int len = 0;
+#ifdef AXIS2_TCPMON
+ axis2_char_t *temp = NULL;
+#endif
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am?rev=399718&r1=399717&r2=399718&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am Thu May 4 07:41:40 2006
@@ -1,36 +1,30 @@
prgbindir=$(prefix)/bin/samples
-prgbin_PROGRAMS = echo_blocking echo_rest
+prgbin_PROGRAMS = echo_blocking echo_blocking_addr echo_rest
samplesdir=$(prefix)/samples/user_guide/clients
-samples_DATA=echo_util.h echo_util.c echo_blocking.c echo_rest.c Makefile.am Makefile.in
+samples_DATA=echo_util.h echo_util.c echo_blocking.c echo_blocking_addr.c echo_rest.c Makefile.am Makefile.in
+
echo_blocking_SOURCES = echo_blocking.c echo_util.c
-echo_blocking_LDADD = $(LDFLAGS) \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_om \
- -laxis2_wsdl \
- -laxis2_engine \
- -laxis2_parser \
- -laxis2_unix \
- -lpthread \
- -laxis2_soap \
- -laxis2_http_sender \
- -laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+echo_blocking_addr_SOURCES = echo_blocking_addr.c echo_util.c
echo_rest_SOURCES = echo_util.c echo_rest.c
-echo_rest_LDADD = $(LDFLAGS) \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_om \
- -laxis2_wsdl \
- -laxis2_engine \
- -laxis2_parser \
- -laxis2_unix \
- -lpthread \
- -laxis2_soap \
- -laxis2_http_sender \
- -laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+
+LINK_FLAGS = $(LDFLAGS) \
+ -L$(AXIS2C_HOME)/lib \
+ -laxis2_util \
+ -laxis2_om \
+ -laxis2_wsdl \
+ -laxis2_engine \
+ -laxis2_parser \
+ -laxis2_unix \
+ -lpthread \
+ -laxis2_soap \
+ -laxis2_http_sender \
+ -laxis2_http_receiver \
+ $(GUTHTHILA_LIBS) \
+ $(LIBXML2_LIBS)
+
+echo_blocking_LDADD = $(LINK_FLAGS)
+echo_blocking_addr_LDADD = $(LINK_FLAGS)
+echo_rest_LDADD = $(LINK_FLAGS)
+
INCLUDES = -I$(AXIS2C_HOME)/include \
-I$(AXIS2C_HOME)/platforms