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 2007/08/02 11:22:30 UTC
svn commit: r562052 - in /webservices/axis2/trunk/c: ./ neethi/ neethi/src/
src/core/clientapi/ src/core/deployment/ src/core/description/
src/core/engine/ src/core/phaseresolver/ src/core/transport/
src/core/transport/tcp/receiver/ tools/tcpmon/ xdocs...
Author: damitha
Date: Thu Aug 2 02:22:29 2007
New Revision: 562052
URL: http://svn.apache.org/viewvc?view=rev&rev=562052
Log:
fixed AXIS2C-624
Modified:
webservices/axis2/trunk/c/Makefile.am
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/dist.sh
webservices/axis2/trunk/c/neethi/configure.ac
webservices/axis2/trunk/c/neethi/src/Makefile.am
webservices/axis2/trunk/c/src/core/clientapi/op_client.c
webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/src/core/deployment/conf_builder.c
webservices/axis2/trunk/c/src/core/deployment/phases_info.c
webservices/axis2/trunk/c/src/core/description/msg.c
webservices/axis2/trunk/c/src/core/description/op.c
webservices/axis2/trunk/c/src/core/description/svc.c
webservices/axis2/trunk/c/src/core/engine/Makefile.am
webservices/axis2/trunk/c/src/core/engine/engine.c
webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/src/core/transport/Makefile.am
webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_worker.c
webservices/axis2/trunk/c/tools/tcpmon/configure.ac
webservices/axis2/trunk/c/xdocs/api/doxygenconf
Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Thu Aug 2 02:22:29 2007
@@ -1,19 +1,21 @@
datadir=$(prefix)
+samplesdir=$(prefix)/samples/axis2c
logsdir=$(prefix)/logs
-docsdir=$(prefix)/docs
+docsdir=$(prefix)/docs/axis2c
includedir=$(prefix)/include/axis2-1.1
-samplesdir=$(prefix)/samples
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = axis2c.pc
-samples_DATA=
-SUBDIRS = util $(GUTHTHILA_DIR) axiom neethi src $(TESTDIR) include ides
-include_HEADERS=$(top_builddir)/include/*.h
+
+SUBDIRS = util $(GUTHTHILA_DIR) axiom neethi src $(TESTDIR) include ides tools/tcpmon
+include_HEADERS=$(top_builddir)/include/*.h
data_DATA= samples/server/axis2.xml README \
- INSTALL CREDITS COPYING NEWS NOTICE config.guess missing install-sh depcomp config.sub ltmain.sh
+ INSTALL CREDITS COPYING NEWS NOTICE
logs_DATA=
-docs_DATA=docs/*
-EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh xdocs guththila tools AUTHORS NOTICE
+docs_DATA=
+samples_DATA=
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh guththila tools AUTHORS NOTICE xdocs
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
@@ -39,4 +41,4 @@
install-data-hook:
cp -rf samples/* $(samplesdir)
- sh copy_samples.sh $(prefix)
+
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Aug 2 02:22:29 2007
@@ -314,8 +314,36 @@
CFLAGS="$CFLAGS"
)
+AC_MSG_CHECKING(whether to use XMPP as a transport)
+AC_ARG_WITH(xmpp,
+[ --with-xmpp[=PATH] Whether to build XMPP transport support.
+ ],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ XMPP_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ dnl Find iksemel include dir
+ if test -d $withval; then
+ iksemelinc="-I$withval"
+ XMPP_DIR="xmpp"
+ dnl else find the iksemel include dir in /usr/include
+ elif test -d '/usr/include'; then
+ iksemelinc="-I/usr/include"
+ XMPP_DIR="xmpp"
+ else
+ AC_MSG_ERROR(could not find iksemel. stop)
+ fi
+ XMPP_DIR="xmpp"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(whether to use gssapi)
-AC_ARG_ENABLE(openssl, [ --enable-gssapi enable gssapi (default=no)],
+AC_ARG_ENABLE(gssapi, [ --enable-gssapi enable gssapi (default=no)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -332,8 +360,29 @@
CFLAGS="$CFLAGS"
)
+#AC_MSG_CHECKING(whether to build xmpp)
+#AC_ARG_ENABLE(xmpp, [ --enable-xmpp
+# enable xmpp build (default=no)],
+#[ case "${enableval}" in
+# no)
+# AC_MSG_RESULT(no)
+# CFLAGS="$CFLAGS"
+# xmpp_enabled=false
+# ;;
+# *)
+# AC_MSG_RESULT(yes)
+# XMPP_DIR="xmpp"
+# CFLAGS="$CFLAGS -DAXIS2_XMPP_ENABLED"
+# xmpp_enabled=false
+# ;;
+# esac ],
+# AC_MSG_RESULT(no)
+# CFLAGS="$CFLAGS"
+#)
+
APACHE2INC=$apache2inc
+IKSEMELINC=$iksemelinc
APRINC=$aprinc
VERSION_NO="1:0:1"
@@ -355,6 +404,7 @@
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_XMPP_GSSAPI, test x$gssapi_enabled = xtrue)
+AM_CONDITIONAL(AXIS2_XMPP_ENABLED, test x$xmpp_enabled = xtrue)
#export PARSER_DIR
export WRAPPER_DIR
@@ -384,6 +434,11 @@
src/core/transport/tcp/receiver/Makefile \
src/core/transport/tcp/server/Makefile \
src/core/transport/tcp/server/simple_tcp_server/Makefile \
+ src/core/transport/xmpp/Makefile \
+ src/core/transport/xmpp/sender/Makefile \
+ src/core/transport/xmpp/receiver/Makefile \
+ src/core/transport/xmpp/server/Makefile \
+ src/core/transport/xmpp/server/simple_xmpp_server/Makefile \
src/core/deployment/Makefile \
src/core/clientapi/Makefile \
src/core/receivers/Makefile \
Modified: webservices/axis2/trunk/c/dist.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/dist.sh?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/dist.sh (original)
+++ webservices/axis2/trunk/c/dist.sh Thu Aug 2 02:22:29 2007
@@ -8,12 +8,6 @@
cp -r xdocs/api/html target/docs/api/
cp xdocs/docs/mod_log/module.xml target/docs/docs/mod_log
cp -r target/docs axis2c-src-1.1.0
-cd samples
-make dist
-tar -xf axis2c-src-1.1.0.tar.gz
-mv axis2c-src-1.1.0 ../axis2c-src-1.1.0
-cd ../axis2c-src-1.1.0
-mv axis2c-src-1.1.0 samples
for i in `find . -name "*.la"`
do
Modified: webservices/axis2/trunk/c/neethi/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/configure.ac?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/neethi/configure.ac (original)
+++ webservices/axis2/trunk/c/neethi/configure.ac Thu Aug 2 02:22:29 2007
@@ -64,6 +64,7 @@
AC_CONFIG_FILES([Makefile \
src/Makefile \
+ src/util/Makefile \
src/secpolicy/Makefile \
src/secpolicy/model/Makefile \
src/secpolicy/builder/Makefile \
Modified: webservices/axis2/trunk/c/neethi/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/Makefile.am?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/neethi/src/Makefile.am Thu Aug 2 02:22:29 2007
@@ -1,4 +1,4 @@
-SUBDIRS = secpolicy
+SUBDIRS = secpolicy util
lib_LTLIBRARIES=libneethi.la
libneethi_la_SOURCES= all.c \
Modified: webservices/axis2/trunk/c/src/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/clientapi/op_client.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/src/core/clientapi/op_client.c Thu Aug 2 02:22:29 2007
@@ -806,9 +806,12 @@
axis2_endpoint_ref_t *epr)
{
axis2_char_t *transport = NULL;
+ axis2_transport_out_desc_t *transport_out_desc = NULL;
AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Start:axis2_op_client_infer_transport");
if (epr)
{
const axis2_char_t *to_url = axis2_endpoint_ref_get_address(epr, env);
@@ -820,7 +823,6 @@
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- axis2_transport_out_desc_t *transport_out_desc = NULL;
AXIS2_TRANSPORT_ENUMS transport_enum = 0;
if (!axutil_strcmp(transport, "http"))
@@ -854,12 +856,18 @@
AXIS2_FREE(env->allocator, transport);
transport = NULL;
- return transport_out_desc;
}
-
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CANNOT_INFER_TRANSPORT, AXIS2_FAILURE);
- return NULL;
+ if(!transport_out_desc)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[axis2c] Cannot infer transport");
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CANNOT_INFER_TRANSPORT,
+ AXIS2_FAILURE);
+ }
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "End:axis2_op_client_infer_transport");
+ return transport_out_desc;
}
AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/arch_file_data.c Thu Aug 2 02:22:29 2007
@@ -150,6 +150,7 @@
svc = (axis2_svc_t *) val;
if (svc)
{
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dam_svc_name:%s", axis2_svc_get_name(svc, env));
axis2_svc_free(svc, env);
}
}
Modified: webservices/axis2/trunk/c/src/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/conf_builder.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/conf_builder.c Thu Aug 2 02:22:29 2007
@@ -669,6 +669,7 @@
AXIS2_TRANSPORT_ENUMS transport_enum;
name = axiom_attribute_get_value(trs_name, env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dam_transport_name:%s", name);
if (name)
{
if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
Modified: webservices/axis2/trunk/c/src/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/phases_info.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/phases_info.c Thu Aug 2 02:22:29 2007
@@ -84,7 +84,7 @@
}
if (phases_info->op_in_phases)
{
- axutil_hash_index_t *i = NULL;
+ /*axutil_hash_index_t *i = NULL;
for (i = axutil_hash_first (phases_info->op_in_phases, env); i; i =
axutil_hash_next (env, i))
{
@@ -97,12 +97,12 @@
{
axis2_phase_free(phase, env);
}
- }
+ }*/
axutil_hash_free(phases_info->op_in_phases, env);
}
if (phases_info->op_out_phases)
{
- axutil_hash_index_t *i = NULL;
+ /*axutil_hash_index_t *i = NULL;
for (i = axutil_hash_first (phases_info->op_out_phases, env); i; i =
axutil_hash_next (env, i))
{
@@ -115,12 +115,12 @@
{
axis2_phase_free(phase, env);
}
- }
+ }*/
axutil_hash_free(phases_info->op_out_phases, env);
}
if (phases_info->op_in_faultphases)
{
- axutil_hash_index_t *i = NULL;
+ /*axutil_hash_index_t *i = NULL;
for (i = axutil_hash_first (phases_info->op_in_faultphases, env);
i; i = axutil_hash_next (env, i))
{
@@ -133,12 +133,12 @@
{
axis2_phase_free(phase, env);
}
- }
+ }*/
axutil_hash_free(phases_info->op_in_faultphases, env);
}
if (phases_info->op_out_faultphases)
{
- axutil_hash_index_t *i = NULL;
+ /*axutil_hash_index_t *i = NULL;
for (i = axutil_hash_first (phases_info->op_out_faultphases, env);
i; i = axutil_hash_next (env, i))
{
@@ -151,7 +151,7 @@
{
axis2_phase_free(phase, env);
}
- }
+ }*/
axutil_hash_free(phases_info->op_out_faultphases, env);
}
@@ -299,14 +299,18 @@
}
else
{
- phase = axutil_hash_get(phases_info->op_in_phases, phase_name,
+ /* This is the cause for jira AXIS2C-. As solution I create new
+ * phases for each operation specific flow making the operation
+ * the owner of the flow and the phases contained within it*/
+ /*phase = axutil_hash_get(phases_info->op_in_phases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
{
phase = axis2_phase_create(env, phase_name);
axutil_hash_set(phases_info->op_in_phases, phase_name,
AXIS2_HASH_KEY_STRING, phase);
- }
+ }*/
+ phase = axis2_phase_create(env, phase_name);
status = axutil_array_list_add(op_in_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
@@ -358,14 +362,15 @@
{
phase_name = (axis2_char_t *) axutil_array_list_get(phases_info->
out_phases, env, i);
- phase = axutil_hash_get(phases_info->op_out_phases, phase_name,
+ /*phase = axutil_hash_get(phases_info->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
{
phase = axis2_phase_create(env, phase_name);
axutil_hash_set(phases_info->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING, phase);
- }
+ }*/
+ phase = axis2_phase_create(env, phase_name);
status = axutil_array_list_add(op_out_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
@@ -421,14 +426,15 @@
{
phase_name = (axis2_char_t *)
axutil_array_list_get(phases_info->in_faultphases, env, i);
- phase = axutil_hash_get(phases_info->op_in_faultphases, phase_name,
+ /*phase = axutil_hash_get(phases_info->op_in_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
{
phase = axis2_phase_create(env, phase_name);
axutil_hash_set(phases_info->op_in_faultphases,
phase_name, AXIS2_HASH_KEY_STRING, phase);
- }
+ }*/
+ phase = axis2_phase_create(env, phase_name);
status = axutil_array_list_add(op_in_faultphases, env, phase);
if (AXIS2_SUCCESS != status)
{
@@ -486,14 +492,15 @@
{
phase_name = (axis2_char_t *)
axutil_array_list_get(phases_info->out_faultphases, env, i);
- phase = axutil_hash_get(phases_info->op_out_faultphases, phase_name,
+ /*phase = axutil_hash_get(phases_info->op_out_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
{
phase = axis2_phase_create(env, phase_name);
axutil_hash_set(phases_info->op_out_faultphases,
phase_name, AXIS2_HASH_KEY_STRING, phase);
- }
+ }*/
+ phase = axis2_phase_create(env, phase_name);
status = axutil_array_list_add(op_out_faultphases, env, phase);
if (AXIS2_SUCCESS != status)
{
Modified: webservices/axis2/trunk/c/src/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/msg.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/src/core/description/msg.c Thu Aug 2 02:22:29 2007
@@ -92,6 +92,16 @@
if (msg->flow)
{
+ int i = 0, size = 0;
+ size = axutil_array_list_size(msg->flow, env);
+ for(i = 0; i < size; i++)
+ {
+ axis2_phase_t *phase = NULL;
+ phase = axutil_array_list_get(msg->flow, env, i);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dam_phase_name:%s", axis2_phase_get_name(phase, env));
+ if(phase)
+ axis2_phase_free(phase, env);
+ }
axutil_array_list_free(msg->flow, env);
}
Modified: webservices/axis2/trunk/c/src/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/op.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/op.c (original)
+++ webservices/axis2/trunk/c/src/core/description/op.c Thu Aug 2 02:22:29 2007
@@ -568,17 +568,14 @@
}
size = axutil_array_list_size(op->engaged_module_list, env);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
- {
- return AXIS2_ERROR_GET_STATUS_CODE(env->error);
- }
module_qname = axis2_module_desc_get_qname(module_desc, env);
for (index = 0; index < size; index++)
{
const axutil_qname_t *module_qname_l = NULL;
module_desc_l =
- (axis2_module_desc_t *) axutil_array_list_get(op->engaged_module_list, env, index);
+ (axis2_module_desc_t *) axutil_array_list_get(
+ op->engaged_module_list, env, index);
module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (axutil_qname_equals(module_qname, env, module_qname_l))
Modified: webservices/axis2/trunk/c/src/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/svc.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/svc.c Thu Aug 2 02:22:29 2007
@@ -612,7 +612,8 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_svc_engage_module(axis2_svc_t *svc,
+axis2_svc_engage_module(
+ axis2_svc_t *svc,
const axutil_env_t *env,
axis2_module_desc_t *module_desc,
axis2_conf_t *conf)
@@ -697,7 +698,8 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_svc_add_module_ops(axis2_svc_t *svc,
+axis2_svc_add_module_ops(
+ axis2_svc_t *svc,
const axutil_env_t *env,
axis2_module_desc_t *module_desc,
axis2_conf_t *conf)
@@ -708,18 +710,19 @@
axis2_op_t *op_desc = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Start:axis2_svc_add_module_ops");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
map = axis2_module_desc_get_all_ops(module_desc, env);
- phase_resolver = axis2_phase_resolver_create_with_config_and_svc(env, conf, svc);
-
+ phase_resolver = axis2_phase_resolver_create_with_config_and_svc(env, conf,
+ svc);
if (!phase_resolver)
{
return AXIS2_FAILURE;
}
-
for (index = axutil_hash_first(map, env); index; index =
axutil_hash_next(env, index))
{
@@ -784,6 +787,8 @@
{
axis2_phase_resolver_free(phase_resolver, env);
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "End:axis2_svc_add_module_ops");
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/src/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/Makefile.am?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/engine/Makefile.am Thu Aug 2 02:22:29 2007
@@ -13,8 +13,8 @@
engine.c
libaxis2_engine_la_LIBADD=$(top_builddir)/src/core/description/libaxis2_description.la \
- $(top_builddir)/src/core/receivers/libaxis2_receivers.la \
- $(top_builddir)/src/core/deployment/libaxis2_deployment.la \
+ $(top_builddir)/src/core/receivers/libaxis2_receivers.la \
+ $(top_builddir)/src/core/deployment/libaxis2_deployment.la \
$(top_builddir)/src/core/context/libaxis2_context.la \
$(top_builddir)/src/core/addr/libaxis2_addr.la \
$(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
@@ -23,10 +23,16 @@
$(top_builddir)/util/src/libaxutil.la \
$(top_builddir)/neethi/src/libneethi.la \
$(top_builddir)/axiom/src/om/libaxis2_axiom.la
+if AXIS2_XMPP_ENABLED
+libaxis2_engine_la_LIBADD+=$(top_builddir)/src/core/transport/xmpp/receiver/libaxis2_xmpp_receiver.la \
+ $(top_builddir)/src/core/transport/xmpp/sender/libaxis2_xmpp_sender.la
+else
+libaxis2_engine_la_LIBADD+=$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
+ $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
+endif
-libaxis2_engine_la_LDFLAGS = -version-info $(VERSION_NO)
-INCLUDES = -I$(top_builddir)/include \
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/wsdl \
-I$(top_builddir)/src/core/description \
-I$(top_builddir)/src/core/engine \
@@ -40,3 +46,4 @@
-I$(top_builddir)/axiom/include
EXTRA_DIST=axis2_disp_checker.h
+
Modified: webservices/axis2/trunk/c/src/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/engine.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/src/core/engine/engine.c Thu Aug 2 02:22:29 2007
@@ -561,6 +561,8 @@
int count = 0;
axis2_status_t status = AXIS2_SUCCESS;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Start:axis2_engine_invoke_phases");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, phases, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -582,6 +584,8 @@
return status;
}
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "End:axis2_engine_invoke_phases");
return AXIS2_SUCCESS;
}
@@ -596,6 +600,8 @@
int count = 0;
axis2_bool_t found_match = AXIS2_FALSE;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Start:axis2_engine_resume_invocation_phases");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, phases, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -636,6 +642,8 @@
}
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "End:axis2_engine_resume_invocation_phases");
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/src/core/phaseresolver/phase_resolver.c Thu Aug 2 02:22:29 2007
@@ -176,6 +176,8 @@
int i = 0;
axis2_status_t status = AXIS2_FAILURE;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Start:axis2_phase_resolver_build_module_op");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
@@ -187,10 +189,12 @@
status = axis2_phase_resolver_build_execution_chains(phase_resolver,
env, i, op);
if(!status)
- {
- break;
- }
+ {
+ break;
+ }
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "End:axis2_phase_resolver_build_module_op");
return status;
}
@@ -208,18 +212,13 @@
int status = AXIS2_FAILURE;
axis2_flow_t *flow = NULL;
axis2_phase_holder_t *phase_holder = NULL;
-
- /* engage handlers from axis2.xml from modules */
+
+ /* engage handlers from axis2.xml and from modules */
moduleqnames = axis2_conf_get_all_engaged_modules(
phase_resolver->axis2_config, env);
size = axutil_array_list_size(moduleqnames, env);
- status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
- if (AXIS2_SUCCESS != status)
- {
- return status;
- }
for (i = 0; i < size; i++)
{
@@ -304,9 +303,9 @@
{
all_handlers = axutil_array_list_create(env, 0);
if (!all_handlers)
- {
+ {
return AXIS2_FAILURE;
- }
+ }
}
status = axutil_array_list_add(all_handlers, env, metadata);
if (AXIS2_SUCCESS != status)
@@ -485,9 +484,9 @@
status = axis2_phase_holder_add_handler(phase_holder,
env, metadata);
if(!status)
- {
+ {
break;
- }
+ }
}
}
@@ -1251,8 +1250,15 @@
axis2_status_t status = AXIS2_FAILURE;
const axutil_qname_t *module_d_qname = NULL;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Start:axis2_phase_resolver_engage_module_to_svc");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Module %s will be engaged to %s",
+ axutil_qname_get_localpart(axis2_module_desc_get_qname(module_desc,
+ env), env),
+ axis2_svc_get_name(svc, env));
ops = axis2_svc_get_all_ops(svc, env);
if (!ops)
{
@@ -1296,8 +1302,11 @@
engaged = AXIS2_TRUE;
status = AXIS2_SUCCESS;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Module %s already engaged.",
- axutil_qname_get_localpart(module_d_qname, env));
+ "Module %s already engaged to %s of %s",
+ axutil_qname_get_localpart(module_d_qname, env),
+ axutil_qname_get_localpart(axis2_op_get_qname(op_desc, env),
+ env),
+ axis2_svc_get_name(svc, env));
break;
}
}
@@ -1316,6 +1325,8 @@
}
}
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "End:axis2_phase_resolver_engage_module_to_svc");
return status;
}
Modified: webservices/axis2/trunk/c/src/core/transport/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/Makefile.am?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/Makefile.am Thu Aug 2 02:22:29 2007
@@ -1,2 +1,2 @@
-SUBDIRS=http tcp
+SUBDIRS=http tcp ${XMPP_DIR}
EXTRA_DIST=Makefile.am
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_worker.c?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_worker.c Thu Aug 2 02:22:29 2007
@@ -167,7 +167,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "stream write failed");
return AXIS2_FAILURE;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "stream wrote:%s", buffer);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "stream wrote:%s", buffer);
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "end:axis2_tcp_worker_process_request");
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/tools/tcpmon/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/configure.ac?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/configure.ac (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/configure.ac Thu Aug 2 02:22:29 2007
@@ -106,8 +106,6 @@
AC_CONFIG_FILES([Makefile \
src/Makefile \
- test/Makefile \
- test/unit/Makefile \
])
AC_OUTPUT
Modified: webservices/axis2/trunk/c/xdocs/api/doxygenconf
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xdocs/api/doxygenconf?view=diff&rev=562052&r1=562051&r2=562052
==============================================================================
--- webservices/axis2/trunk/c/xdocs/api/doxygenconf (original)
+++ webservices/axis2/trunk/c/xdocs/api/doxygenconf Thu Aug 2 02:22:29 2007
@@ -450,7 +450,7 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../../deploy/include/axis2-1.0/
+INPUT = ../../../deploy/include/axis2-1.1/
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org