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/06 12:30:28 UTC
svn commit: r354407 - in /webservices/axis2/trunk/c: configure.ac
modules/core/engine/src/engine_config.c test/unit/util/Makefile.am
test/unit/xml/om/Makefile.am test/xml/om/Makefile.am
Author: damitha
Date: Tue Dec 6 03:30:03 2005
New Revision: 354407
URL: http://svn.apache.org/viewcvs?rev=354407&view=rev
Log:
Removed hard coded parser wrapper from build files in tests
Modified:
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c
webservices/axis2/trunk/c/test/unit/util/Makefile.am
webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
webservices/axis2/trunk/c/test/xml/om/Makefile.am
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=354407&r1=354406&r2=354407&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Tue Dec 6 03:30:03 2005
@@ -60,7 +60,9 @@
)
PULL_PARSER=$want_parser
+PULL_PARSER_WRAPPER="axis2_$want_parser"
AC_SUBST(PULL_PARSER)
+AC_SUBST(PULL_PARSER_WRAPPER)
AC_CONFIG_FILES([Makefile \
modules/Makefile \
Modified: webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c?rev=354407&r1=354406&r2=354407&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c Tue Dec 6 03:30:03 2005
@@ -524,6 +524,8 @@
axis2_env_t **env)
{
axis2_engine_config_impl_t *config_impl = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
+
AXIS2_FUNC_PARAM_CHECK(engine_config, env, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(engine_config);
@@ -541,6 +543,24 @@
if(config_impl->svc_grps)
{
+ axis2_hash_index_t *hi = NULL;
+ void *val = NULL;
+ for (hi = axis2_hash_first (config_impl->svc_grps, env); hi;
+ hi = axis2_hash_next ( env, hi))
+ {
+ struct axis2_svc_grp *svc_grp = NULL;
+ axis2_hash_this (hi, NULL, NULL, &val);
+ svc_grp = (struct axis2_svc_grp *) val;
+ if (val)
+ status = AXIS2_SVC_GRP_FREE (svc_grp, env);
+ else
+ {
+ status = AXIS2_FAILURE;
+ }
+ val = NULL;
+ svc_grp = NULL;
+
+ }
axis2_hash_free(config_impl->svc_grps, env);
config_impl->svc_grps = NULL;
}
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=354407&r1=354406&r2=354407&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/util/Makefile.am Tue Dec 6 03:30:03 2005
@@ -23,13 +23,5 @@
-lcutest \
$(top_builddir)/test/unit/util/libtest_util.la \
-L$(top_builddir)/install/lib \
- -laxis2_util \
- -laxis2_context \
- -laxis2_description \
- -laxis2_engine \
- -laxis2_wsdl \
- -laxis2_phaseresolver \
- -laxis2_om \
- -laxis2_guththila \
- -lguththila
+ -laxis2_util
Modified: webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am?rev=354407&r1=354406&r2=354407&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am Tue Dec 6 03:30:03 2005
@@ -18,11 +18,4 @@
-lcutest \
-L$(top_builddir)/install/lib \
-laxis2_util \
- -laxis2_context \
- -laxis2_description \
- -laxis2_engine \
- -laxis2_wsdl \
- -laxis2_phaseresolver \
- -laxis2_om \
- -laxis2_guththila \
- -lguththila
+ -l$(PULL_PARSER_WRAPPER)
Modified: webservices/axis2/trunk/c/test/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/om/Makefile.am?rev=354407&r1=354406&r2=354407&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/om/Makefile.am Tue Dec 6 03:30:03 2005
@@ -5,7 +5,7 @@
test_om_SOURCES = test_om.c
test_om_LDADD = $(LDFLAGS) -L$(top_builddir)/install/lib -laxis2_om \
- -L$(top_builddir)/install/lib -laxis2_libxml2 -lxml2 \
+ -L$(top_builddir)/install/lib -l$(PULL_PARSER_WRAPPER) \
-L$(top_builddir)/install/lib -laxis2_util
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \