You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by da...@apache.org on 2011/05/31 11:08:19 UTC
svn commit: r1129580 - in /axis/axis2/c/core/trunk: configure.ac
samples/client/Makefile.am samples/configure.ac
src/core/transport/http/sender/Makefile.am
Author: damitha
Date: Tue May 31 09:08:18 2011
New Revision: 1129580
URL: http://svn.apache.org/viewvc?rev=1129580&view=rev
Log:
Initial checkin of ntlm auth code
Modified:
axis/axis2/c/core/trunk/configure.ac
axis/axis2/c/core/trunk/samples/client/Makefile.am
axis/axis2/c/core/trunk/samples/configure.ac
axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am
Modified: axis/axis2/c/core/trunk/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/configure.ac?rev=1129580&r1=1129579&r2=1129580&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/configure.ac (original)
+++ axis/axis2/c/core/trunk/configure.ac Tue May 31 09:08:18 2011
@@ -211,6 +211,29 @@ AC_ARG_ENABLE(libxml2, [ --enable-libxm
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(whether to build heimdal ntlm wrapper library)
+AC_ARG_ENABLE(heimdal, [ --enable-heimdal
+ build heimdal ntlm library wrapper (default=no)],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ NTLM_WRAPPER_DIR="default"
+ NTLM_SAMPLE_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ NTLM_WRAPPER_DIR="heimdal"
+ NTLM_SAMPLE_DIR="ntlm"
+ #PKG_CHECK_MODULES(HEIMDAL, heimdal-1.4)
+ CFLAGS="$CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
+ CPPFLAGS="$CPPFLAGS $NTLM_CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
+ LDFLAGS="$LDFLAGS $NTLM_LDFLAGS"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+
AC_MSG_CHECKING(whether to build tcp transport)
AC_ARG_ENABLE(tcp, [ --enable-tcp
@@ -467,7 +490,11 @@ AC_SUBST(DICLIENT_DIR)
AC_SUBST(TESTDIR)
AC_SUBST(SAMPLES)
AC_SUBST(APACHE2BUILD)
+AC_SUBST(NTLM_CFLAGS)
+AC_SUBST(NTLM_LDFLAGS)
AC_SUBST(WRAPPER_DIR)
+AC_SUBST(NTLM_WRAPPER_DIR)
+AC_SUBST(NTLM_SAMPLE_DIR)
AC_SUBST(TCP_DIR)
AC_SUBST(CGI_DIR)
AC_SUBST(AMQP_DIR)
@@ -478,7 +505,10 @@ AC_SUBST(ZLIBBUILD)
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
+export NTLM_LDFLAGS
export WRAPPER_DIR
+export NTLM_WRAPPER_DIR
+export NTLM_SAMPLE_DIR
export prefix
AC_CONFIG_FILES([Makefile \
@@ -496,6 +526,11 @@ AC_CONFIG_FILES([Makefile \
src/core/transport/http/sender/Makefile \
src/core/transport/http/sender/ssl/Makefile \
src/core/transport/http/sender/libcurl/Makefile \
+ src/core/transport/http/sender/ntlm/Makefile \
+ src/core/transport/http/sender/ntlm/heimdal/Makefile \
+ src/core/transport/http/sender/ntlm/default/Makefile \
+ src/core/transport/http/sender/ntlm/test/Makefile \
+ src/core/transport/http/sender/ntlm/test/mock_server/Makefile \
src/core/transport/http/receiver/Makefile \
src/core/transport/http/server/simple_axis2_server/Makefile \
src/core/transport/http/server/Makefile \
Modified: axis/axis2/c/core/trunk/samples/client/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/Makefile.am?rev=1129580&r1=1129579&r2=1129580&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/Makefile.am Tue May 31 09:08:18 2011
@@ -12,5 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = echo math google notify mtom yahoo amqp version mtom_callback session
+SUBDIRS = echo math google notify mtom yahoo amqp version mtom_callback session $(NTLM_SAMPLE_DIR)
EXTRA_DIST= Makefile.am
Modified: axis/axis2/c/core/trunk/samples/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/configure.ac?rev=1129580&r1=1129579&r2=1129580&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/configure.ac (original)
+++ axis/axis2/c/core/trunk/samples/configure.ac Tue May 31 09:08:18 2011
@@ -95,6 +95,28 @@ AC_ARG_ENABLE(diclient, [ --enable-dicl
DICLIENT_DIR=""
)
+AC_MSG_CHECKING(whether to build heimdal ntlm wrapper library)
+AC_ARG_ENABLE(heimdal, [ --enable-heimdal
+ build heimdal ntlm library wrapper (default=no)],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ NTLM_WRAPPER_DIR="default"
+ NTLM_SAMPLE_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ NTLM_WRAPPER_DIR="heimdal"
+ NTLM_SAMPLE_DIR="ntlm"
+ #PKG_CHECK_MODULES(HEIMDAL, heimdal-1.4)
+ CFLAGS="$CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
+ CPPFLAGS="$CPPFLAGS $NTLM_CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
+ LDFLAGS="$LDFLAGS $NTLM_LDFLAGS"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(To Use Axis2 C . This is a compulsory module to build Axis2 C samples)
AC_ARG_WITH(axis2,
[ --with-axis2[=PATH] Find the AXIS2 header files in 'PATH'.
@@ -133,6 +155,7 @@ AC_SUBST(APRINC)
AC_SUBST(AXIS2INC)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
+AC_SUBST(NTLM_SAMPLE_DIR)
AC_SUBST(DICLIENT_DIR)
AC_CONFIG_FILES([Makefile \
@@ -162,6 +185,7 @@ AC_CONFIG_FILES([Makefile \
client/amqp/mtom/Makefile \
client/amqp/mtom/resources/Makefile \
client/session/Makefile \
+ client/ntlm/Makefile \
user_guide/Makefile \
user_guide/clients/Makefile \
mtom_caching_callback/Makefile \
Modified: axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am?rev=1129580&r1=1129579&r2=1129580&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am Tue May 31 09:08:18 2011
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS=ssl libcurl
+SUBDIRS=ssl libcurl ntlm
lib_LTLIBRARIES = libaxis2_http_sender.la
@@ -48,6 +48,7 @@ libaxis2_http_sender_la_LIBADD = $(top_b
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\
$(top_builddir)/axiom/src/om/libaxis2_axiom.la\
$(top_builddir)/util/src/libaxutil.la\
+ $(top_builddir)/src/core/transport/http/sender/ntlm/${NTLM_WRAPPER_DIR}/libaxis2_ntlm.la \
$(LIBCURL_LIBS)\
$(SSL_LIBS)
@@ -65,4 +66,5 @@ INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/core/deployment \
-I$(top_builddir)/util/include \
-I$(top_builddir)/axiom/include \
+ -I$(top_builddir)/ntlm/include \
$(SSL_INC)