axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r548964 - in /webservices/axis2/trunk/c: Makefile.am configure.ac include/axis2_svc_skeleton.h neethi/configure.ac neethi/src/Makefile.am src/core/engine/Makefile.am src/core/transport/Makefile.am
Date Wed, 20 Jun 2007 07:22:17 GMT
Author: damitha
Date: Wed Jun 20 00:22:06 2007
New Revision: 548964

URL: http://svn.apache.org/viewvc?view=rev&rev=548964
Log:

Sorry I have mistakenly replaced wrong build files. Correcting them.

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/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=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Wed Jun 20 00:22:06 2007
@@ -1,6 +1,6 @@
 datadir=$(prefix)
 logsdir=$(prefix)/logs
-docsdir=$(prefix)/docs/axis2c
+docsdir=$(prefix)/docs
 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 
+	INSTALL CREDITS COPYING NEWS NOTICE config.guess missing install-sh depcomp config.sub ltmain.sh
 
 logs_DATA=
-docs_DATA=
-EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh xdocs guththila tools
AUTHORS NOTICE samples
+docs_DATA=docs/*
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh xdocs guththila tools
AUTHORS NOTICE
 
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
@@ -37,5 +37,4 @@
 	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=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Jun 20 00:22:06 2007
@@ -2,11 +2,13 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT(axis2c-src, 1.0.0)
+AC_INIT(axis2c-src, 1.1.0)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([tar-ustar])
+dnl AM_INIT_AUTOMAKE([tar-ustar])
+AM_INIT_AUTOMAKE
 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
@@ -98,6 +100,7 @@
 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
@@ -298,27 +301,6 @@
   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"
@@ -333,13 +315,10 @@
 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 
@@ -363,11 +342,6 @@
     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 \
@@ -383,7 +357,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=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_skeleton.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_skeleton.h Wed Jun 20 00:22:06 2007
@@ -72,6 +72,19 @@
 
 
         /**
+         * 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);
+
+        /**
          * Invokes the service. This function should be used to call up the
          * functions implementing service operations.
          * @param svc_skeli pointer to svc_skeli struct

Modified: webservices/axis2/trunk/c/neethi/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/configure.ac?view=diff&rev=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/neethi/configure.ac (original)
+++ webservices/axis2/trunk/c/neethi/configure.ac Wed Jun 20 00:22:06 2007
@@ -64,7 +64,6 @@
 
 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=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/neethi/src/Makefile.am Wed Jun 20 00:22:06 2007
@@ -1,4 +1,4 @@
-SUBDIRS = secpolicy util
+SUBDIRS = secpolicy 
 lib_LTLIBRARIES=libneethi.la
 
 libneethi_la_SOURCES= all.c   \

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=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/engine/Makefile.am Wed Jun 20 00:22:06 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,16 +23,10 @@
 					$(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 \
@@ -46,4 +40,3 @@
             -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=548964&r1=548963&r2=548964
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/Makefile.am Wed Jun 20 00:22:06 2007
@@ -1,2 +1 @@
-SUBDIRS=http ${XMPP_DIR}
-EXTRA_DIST=Makefile.am
+SUBDIRS = http



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message