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 2005/12/05 07:33:58 UTC
svn commit: r353999 - in /webservices/axis2/trunk/c: include/
modules/core/context/src/ modules/core/description/src/
modules/core/phaseresolver/src/ test/unit/util/
Author: damitha
Date: Sun Dec 4 22:33:35 2005
New Revision: 353999
URL: http://svn.apache.org/viewcvs?rev=353999&view=rev
Log:
is_paused is refered from phase.c but is not implemented in msg_ctx.
Fixed this. also fixed some link dependancies for unit tests after
they were moved to root
Modified:
webservices/axis2/trunk/c/include/axis2_msg_ctx.h
webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c
webservices/axis2/trunk/c/modules/core/description/src/Makefile.am
webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.am
webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.in
webservices/axis2/trunk/c/test/unit/util/Makefile.am
webservices/axis2/trunk/c/test/unit/util/Makefile.in
Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Sun Dec 4 22:33:35 2005
@@ -556,6 +556,13 @@
axis2_status_t (AXIS2_CALL *set_svc_grp_ctx_id)(struct axis2_msg_ctx *msg_ctx,
axis2_env_t **env,
axis2_char_t *svc_grp_ctx_id);
+
+ /**
+ * @return
+ */
+ axis2_bool_t (AXIS2_CALL *
+ is_paused) (axis2_msg_ctx_t *msg_ctx,
+ axis2_env_t **env)
};
/**
@@ -681,6 +688,7 @@
#define AXIS2_MSG_CTX_SET_SVC_GRP(msg_ctx, env, svc_grp) ((msg_ctx)->ops->set_svc_grp(msg_ctx, env, svc_grp))
#define AXIS2_MSG_CTX_GET_SVC_GRP_CTX_ID(msg_ctx, env) ((msg_ctx)->ops->get_svc_grp_ctx_id(msg_ctx, env))
#define AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id) ((msg_ctx)->ops->set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id))
+#define AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env) ((msg_ctx)->ops->is_paused(msg_ctx, env))
/************************** End of function macros ****************************/
Modified: webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/msg_ctx.c Sun Dec 4 22:33:35 2005
@@ -402,6 +402,10 @@
axis2_env_t **env,
axis2_char_t *svc_grp_ctx_id);
+axis2_bool_t AXIS2_CALL
+axis2_msg_ctx_is_paused(axis2_msg_ctx_t *msg_ctx,
+ axis2_env_t **env);
+
/************************* End of function headers ****************************/
axis2_msg_ctx_t * AXIS2_CALL
@@ -611,6 +615,7 @@
msg_ctx_impl->msg_ctx.ops->set_svc_grp = axis2_msg_ctx_set_svc_grp;
msg_ctx_impl->msg_ctx.ops->get_svc_grp_ctx_id = axis2_msg_ctx_get_svc_grp_ctx_id;
msg_ctx_impl->msg_ctx.ops->set_svc_grp_ctx_id = axis2_msg_ctx_set_svc_grp_ctx_id;
+ msg_ctx_impl->msg_ctx.ops->is_paused = axis2_msg_ctx_is_paused;
return &(msg_ctx_impl->msg_ctx);
}
@@ -1866,6 +1871,14 @@
}
}
return AXIS2_SUCCESS;
+}
+
+axis2_bool_t AXIS2_CALL
+axis2_msg_ctx_is_paused(axis2_msg_ctx_t *msg_ctx,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FALSE);
+ return AXIS2_INTF_TO_IMPL(msg_ctx)->paused;
}
/** TODO: there are many block to be uncommented once external depandancies are resoled,
Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.am?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.am Sun Dec 4 22:33:35 2005
@@ -15,7 +15,7 @@
libaxis2_description_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
- -I$(top_builddir)/modules/xml/guththila/src \
+ -I$(top_builddir)/modules/xml/parser \
-I$(top_builddir)/modules/util/src \
-I$(top_builddir)/modules/wsdl/src \
-I$(top_builddir)/modules/core/transport \
Modified: webservices/axis2/trunk/c/modules/core/description/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/Makefile.in?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/Makefile.in Sun Dec 4 22:33:35 2005
@@ -208,7 +208,7 @@
libaxis2_description_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
- -I$(top_builddir)/modules/xml/guththila/src \
+ -I$(top_builddir)/modules/xml/parser \
-I$(top_builddir)/modules/util/src \
-I$(top_builddir)/modules/wsdl/src \
-I$(top_builddir)/modules/core/transport \
Modified: webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c Sun Dec 4 22:33:35 2005
@@ -338,7 +338,7 @@
}
struct axis2_phase * AXIS2_CALL
-axis2_transport_desc_get_inphase(struct axis2_transport_in_desc *transport_in,
+axis2_transport_in_desc_get_inphase(struct axis2_transport_in_desc *transport_in,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_in, env, NULL);
Modified: webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c Sun Dec 4 22:33:35 2005
@@ -338,7 +338,7 @@
}
struct axis2_phase * AXIS2_CALL
-axis2_transport_desc_get_outphase(struct axis2_transport_out_desc *transport_out,
+axis2_transport_out_desc_get_outphase(struct axis2_transport_out_desc *transport_out,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(transport_out, env, NULL);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.am?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.am Sun Dec 4 22:33:35 2005
@@ -1,6 +1,7 @@
lib_LTLIBRARIES = libaxis2_phaseresolver.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_phaseresolver_la_SOURCES = phase_holder.c
+libaxis2_phaseresolver_la_SOURCES = phase_holder.c \
+ phase_resolver.c
libaxis2_phaseresolver_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.in?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/src/Makefile.in Sun Dec 4 22:33:35 2005
@@ -62,7 +62,8 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libaxis2_phaseresolver_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libaxis2_phaseresolver_la_OBJECTS = phase_holder.lo
+am_libaxis2_phaseresolver_la_OBJECTS = phase_holder.lo \
+ phase_resolver.lo
libaxis2_phaseresolver_la_OBJECTS = \
$(am_libaxis2_phaseresolver_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -190,7 +191,9 @@
target_vendor = @target_vendor@
lib_LTLIBRARIES = libaxis2_phaseresolver.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_phaseresolver_la_SOURCES = phase_holder.c
+libaxis2_phaseresolver_la_SOURCES = phase_holder.c \
+ phase_resolver.c
+
libaxis2_phaseresolver_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
-I$(top_builddir)/modules/xml/guththila/src \
@@ -269,6 +272,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phase_holder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phase_resolver.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Modified: webservices/axis2/trunk/c/test/unit/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/Makefile.am?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.am Sun Dec 4 22:33:35 2005
@@ -18,7 +18,10 @@
prgbin_PROGRAMS = util_test
util_test_SOURCES = main.c
-util_test_LDADD = $(LDFLAGS) libtest_util.la \
+util_test_LDADD = $(LDFLAGS) \
+ -L$(CUTEST_HOME)/lib \
+ -lcutest \
+ $(top_builddir)/test/unit/util/libtest_util.la \
-L$(top_builddir)/install/lib \
-laxis2_util \
-laxis2_context \
Modified: webservices/axis2/trunk/c/test/unit/util/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/Makefile.in?rev=353999&r1=353998&r2=353999&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.in (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.in Sun Dec 4 22:33:35 2005
@@ -75,7 +75,8 @@
am_util_test_OBJECTS = main.$(OBJEXT)
util_test_OBJECTS = $(am_util_test_OBJECTS)
am__DEPENDENCIES_1 =
-util_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libtest_util.la
+util_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/test/unit/util/libtest_util.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
am__depfiles_maybe = depfiles
@@ -219,7 +220,10 @@
-I$(top_builddir)/modules/util/src
util_test_SOURCES = main.c
-util_test_LDADD = $(LDFLAGS) libtest_util.la \
+util_test_LDADD = $(LDFLAGS) \
+ -L$(CUTEST_HOME)/lib \
+ -lcutest \
+ $(top_builddir)/test/unit/util/libtest_util.la \
-L$(top_builddir)/install/lib \
-laxis2_util \
-laxis2_context \