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/06/20 09:13:39 UTC
svn commit: r548962 - in /webservices/axis2/trunk/c: Makefile.am
configure.ac include/axis2_svc_skeleton.h neethi/configure.ac
neethi/src/Makefile.am src/core/deployment/conf_init.c
src/core/engine/Makefile.am src/core/transport/Makefile.am
Author: damitha
Date: Wed Jun 20 00:13:37 2007
New Revision: 548962
URL: http://svn.apache.org/viewvc?view=rev&rev=548962
Log:
added a init function to axis2_svc_skeleton so that it can take conf as parameter
Modified:
webservices/axis2/trunk/c/Makefile.am
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_svc_skeleton.h
webservices/axis2/trunk/c/neethi/configure.ac
webservices/axis2/trunk/c/neethi/src/Makefile.am
webservices/axis2/trunk/c/src/core/deployment/conf_init.c
webservices/axis2/trunk/c/src/core/engine/Makefile.am
webservices/axis2/trunk/c/src/core/transport/Makefile.am
Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Wed Jun 20 00:13:37 2007
@@ -1,6 +1,6 @@
datadir=$(prefix)
logsdir=$(prefix)/logs
-docsdir=$(prefix)/docs
+docsdir=$(prefix)/docs/axis2c
includedir=$(prefix)/include/axis2-1.1
pkgconfigdir = $(libdir)/pkgconfig
@@ -9,11 +9,11 @@
SUBDIRS = util $(GUTHTHILA_DIR) axiom neethi src $(TESTDIR) include ides
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=
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh xdocs guththila tools AUTHORS NOTICE samples
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
@@ -37,4 +37,5 @@
tar -cf - axis2c-bin-${PACKAGE_VERSION}-linux | gzip -c > axis2c-bin-${PACKAGE_VERSION}-linux.tar.gz
rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
-
+install-data-hook:
+ cp -rf xdocs/* $(docsdir)
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Jun 20 00:13:37 2007
@@ -2,13 +2,11 @@
AC_PREREQ(2.59)
-AC_INIT(axis2c-src, 1.1.0)
+AC_INIT(axis2c-src, 1.0.0)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-dnl AM_INIT_AUTOMAKE([tar-ustar])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-ustar])
AC_PREFIX_DEFAULT(/usr/local/axis2c)
-m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
dnl Checks for programs.
AC_PROG_CC
@@ -100,7 +98,6 @@
dnl It may be better to do a Darwin check
AC_CHECK_HEADERS([sys/appleapiopts.h])
dnl Checks for typedefs, structures, and compiler characteristics.
-dnl AC_C_CONST
dnl Checks for library functions.
dnl AC_FUNC_MALLOC
@@ -301,6 +298,27 @@
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
APRINC=$aprinc
VERSION_NO="1:0:1"
@@ -315,10 +333,13 @@
AC_SUBST(APACHE2BUILD)
AC_SUBST(PARSER_DIR)
AC_SUBST(WRAPPER_DIR)
+AC_SUBST(XMPP_DIR)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
+AM_CONDITIONAL(AXIS2_XMPP_ENABLED, test x$xmpp_enabled = xtrue)
+
#export PARSER_DIR
export WRAPPER_DIR
export prefix
@@ -342,6 +363,11 @@
src/core/transport/http/server/simple_axis2_server/Makefile \
src/core/transport/http/server/Makefile \
src/core/transport/http/server/apache2/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 \
@@ -357,7 +383,7 @@
test/core/context/Makefile \
test/core/engine/Makefile \
test/core/addr/Makefile \
- test/core/transport/Makefile \
+ test/core/transport/Makefile\
test/core/transport/http/Makefile \
ides/Makefile \
include/Makefile \
Modified: webservices/axis2/trunk/c/include/axis2_svc_skeleton.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_skeleton.h?view=diff&rev=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_skeleton.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_skeleton.h Wed Jun 20 00:13:37 2007
@@ -70,6 +70,7 @@
axis2_svc_skeleton_t *svc_skeleton,
const axutil_env_t *env);
+
/**
* Invokes the service. This function should be used to call up the
* functions implementing service operations.
@@ -113,6 +114,18 @@
axis2_svc_skeleton_t *svc_skeli,
const axutil_env_t *env);
+ /**
+ * Initializes the service implementation.
+ * @param svc_skeleton pointer to svc_skeleton struct
+ * @param env pointer to environment struct
+ * @param conf pointer to axis2c configuration struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ int (AXIS2_CALL *
+ init_with_conf)(
+ axis2_svc_skeleton_t *svc_skeleton,
+ const axutil_env_t *env,
+ struct axis2_conf *conf);
} ;
/**
@@ -133,6 +146,11 @@
@sa axis2_svc_skeleton_ops#init */
#define AXIS2_SVC_SKELETON_INIT(svc_skeleton, env) \
((svc_skeleton)->ops->init (svc_skeleton, env))
+
+/** Initialize the svc skeleton with axis2c configuration struct.
+ @sa axis2_svc_skeleton_ops#init_with_conf */
+#define AXIS2_SVC_SKELETON_INIT_WITH_CONF(svc_skeleton, env, conf) \
+ ((svc_skeleton)->ops->init_with_conf (svc_skeleton, env, conf))
/** Frees the svc skeleton.
@sa axis2_svc_skeleton_ops#free */
Modified: webservices/axis2/trunk/c/neethi/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/configure.ac?view=diff&rev=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/neethi/configure.ac (original)
+++ webservices/axis2/trunk/c/neethi/configure.ac Wed Jun 20 00:13:37 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=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/neethi/src/Makefile.am Wed Jun 20 00:13:37 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/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/conf_init.c?view=diff&rev=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/conf_init.c Wed Jun 20 00:13:37 2007
@@ -120,7 +120,6 @@
axis2_phase_resolver_build_chains(phase_resolver, env);
axis2_init_modules(env, conf_ctx);
- axis2_load_services(env, conf_ctx);
axis2_init_transports(env, conf_ctx);
axis2_phase_resolver_free(phase_resolver, env);
@@ -212,7 +211,8 @@
axutil_class_loader_init(env);
impl_class = axutil_class_loader_create_dll(env, impl_info_param);
axis2_svc_set_impl_class(svc_desc, env, impl_class);
- AXIS2_SVC_SKELETON_INIT((axis2_svc_skeleton_t *)impl_class, env);
+ AXIS2_SVC_SKELETON_INIT_WITH_CONF(
+ (axis2_svc_skeleton_t *)impl_class, env, conf);
axutil_allocator_switch_to_local_pool(env->allocator);
}
}
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=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/engine/Makefile.am Wed Jun 20 00:13:37 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/transport/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/Makefile.am?view=diff&rev=548962&r1=548961&r2=548962
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/Makefile.am Wed Jun 20 00:13:37 2007
@@ -1 +1,2 @@
-SUBDIRS = http
+SUBDIRS=http ${XMPP_DIR}
+EXTRA_DIST=Makefile.am
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org