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 sa...@apache.org on 2008/06/08 15:30:40 UTC
svn commit: r664508 - in /webservices/axis2/trunk/c: configure.ac
include/axis2_const.h
Author: samisa
Date: Sun Jun 8 06:30:39 2008
New Revision: 664508
URL: http://svn.apache.org/viewvc?rev=664508&view=rev
Log:
Adding AMQP stuff
Modified:
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_const.h
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=664508&r1=664507&r2=664508&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Sun Jun 8 06:30:39 2008
@@ -60,6 +60,7 @@
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g"
# CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
@@ -118,6 +119,7 @@
AC_MSG_RESULT(yes)
zliblibs="minizip/libaxis2_minizip.la"
CFLAGS="$CFLAGS -DAXIS2_ARCHIVE_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_ARCHIVE_ENABLED"
if test -d $withval; then
zlibinc="-I$withval"
elif test -d '/usr/include'; then
@@ -144,6 +146,7 @@
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_GUTHTHILA_ENABLED"
WRAPPER_DIR="guththila"
;;
@@ -151,6 +154,7 @@
AC_MSG_RESULT(yes)
WRAPPER_DIR="guththila"
CFLAGS="$CFLAGS -DAXIS2_GUTHTHILA_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_GUTHTHILA_ENABLED"
AC_CONFIG_SUBDIRS(guththila)
GUTHTHILA_LIBS="/guththila/src/"
GUTHTHILA_DIR="guththila"
@@ -170,6 +174,7 @@
WRAPPER_DIR="libxml2"
PKG_CHECK_MODULES(PARSER, libxml-2.0)
CFLAGS="$CFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
+ CPPFLAGS="$CPPFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
LDFLAGS="$LDFLAGS $PARSER_LIBS"
;;
esac ],
@@ -193,6 +198,33 @@
AC_MSG_RESULT(no)
)
+
+AC_MSG_CHECKING(whether to build AMQP transport)
+AC_ARG_WITH(qpid,
+[ --with-qpid[=PATH] 'PATH' specifies the location where the Qpid is installed into.
+ If this option is specified, AMQP transport would be built.
+ If you omit the '=PATH' part completely, the configure script will take
+ '/usr/local' as the Qpid home.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ AMQP_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ if test -d $withval; then
+ qpidhome="$withval"
+ elif test -d '/usr/local/include/qpid'; then
+ qpidhome="/usr/local"
+ else
+ AC_MSG_ERROR(*** Could not Find Qpid in /usr/local ...)
+ fi
+ AMQP_DIR="amqp"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(whether to use apache2 as server transport)
AC_ARG_WITH(apache2,
[ --with-apache2[=PATH] Find the Apache2 HTTP Web server header files in 'PATH'.
@@ -277,14 +309,17 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_TRACE"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_TRACE"
;;
esac ],
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
)
AC_MSG_CHECKING(whether to enable multi threading)
@@ -294,14 +329,17 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_SVR_MULTI_THREADED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_SVR_MULTI_THREADED"
;;
esac ],[
AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS -DAXIS2_SVR_MULTI_THREADED"]
+ CFLAGS="$CFLAGS -DAXIS2_SVR_MULTI_THREADED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_SVR_MULTI_THREADED"]
)
AC_MSG_CHECKING(whether to use openssl)
@@ -311,16 +349,19 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
ssl_enabled=false
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_SSL_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_SSL_ENABLED"
ssl_enabled=true
;;
esac ],
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
)
AC_MSG_CHECKING(whether to use libcurl)
@@ -330,16 +371,19 @@
no)
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
libcurl_enabled=false
;;
*)
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -DAXIS2_LIBCURL_ENABLED"
+ CPPFLAGS="$CPPFLAGS -DAXIS2_LIBCURL_ENABLED"
libcurl_enabled=true
;;
esac ],
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS"
+ CPPFLAGS="$CPPFLAGS"
)
@@ -347,6 +391,7 @@
IKSEMELINC=$iksemelinc
APRINC=$aprinc
VERSION_NO="4:0:4"
+QPID_HOME=$qpidhome
AC_SUBST(VERSION_NO)
AC_SUBST(PARSER_LIBS)
@@ -359,6 +404,8 @@
AC_SUBST(PARSER_DIR)
AC_SUBST(WRAPPER_DIR)
AC_SUBST(TCP_DIR)
+AC_SUBST(AMQP_DIR)
+AC_SUBST(QPID_HOME)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(ZLIBBUILD)
@@ -393,6 +440,15 @@
src/core/transport/tcp/receiver/Makefile \
src/core/transport/tcp/server/Makefile \
src/core/transport/tcp/server/simple_tcp_server/Makefile \
+ src/core/transport/amqp/Makefile \
+ src/core/transport/amqp/util/Makefile \
+ src/core/transport/amqp/receiver/Makefile \
+ src/core/transport/amqp/receiver/qpid_receiver/Makefile \
+ src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile \
+ src/core/transport/amqp/sender/Makefile \
+ src/core/transport/amqp/sender/qpid_sender/Makefile \
+ src/core/transport/amqp/server/Makefile \
+ src/core/transport/amqp/server/axis2_amqp_server/Makefile \
src/core/deployment/Makefile \
src/core/clientapi/Makefile \
src/core/receivers/Makefile \
Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?rev=664508&r1=664507&r2=664508&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Sun Jun 8 06:30:39 2008
@@ -117,6 +117,7 @@
#define AXIS2_TRANSPORT_TCP "tcp"
#define AXIS2_TRANSPORT_XMPP "xmpp"
#define AXIS2_TRANSPORT_HTTPS "https"
+#define AXIS2_TRANSPORT_AMQP "amqp"
typedef enum
{
AXIS2_TRANSPORT_ENUM_HTTP = 0,
@@ -124,6 +125,7 @@
AXIS2_TRANSPORT_ENUM_TCP,
AXIS2_TRANSPORT_ENUM_XMPP,
AXIS2_TRANSPORT_ENUM_HTTPS,
+ AXIS2_TRANSPORT_ENUM_AMQP,
AXIS2_TRANSPORT_ENUM_MAX
} AXIS2_TRANSPORT_ENUMS;