Author: shankar
Date: Mon Mar 16 07:46:09 2009
New Revision: 754835
URL: http://svn.apache.org/viewvc?rev=754835&view=rev
Log:
splitting mod_rampart.so and rampart.so; Changing version number;
Modified:
webservices/rampart/trunk/c/Makefile.am
webservices/rampart/trunk/c/build.sh
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/src/Makefile.am
webservices/rampart/trunk/c/src/core/Makefile.am
webservices/rampart/trunk/c/src/rahas/Makefile.am
webservices/rampart/trunk/c/src/util/Makefile.am
Modified: webservices/rampart/trunk/c/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/Makefile.am?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/Makefile.am (original)
+++ webservices/rampart/trunk/c/Makefile.am Mon Mar 16 07:46:09 2009
@@ -1,6 +1,6 @@
SUBDIRS = src
docsdir=$(prefix)/docs
-includedir=$(prefix)/include/rampart-1.2.0
+includedir=$(prefix)/include/rampart-1.3.0
include_HEADERS=$(top_builddir)/include/*.h
docs_DATA=xdocs/*
EXTRA_DIST = LICENSE NOTICE build.sh autogen.sh samples build test xdocs
Modified: webservices/rampart/trunk/c/build.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/build.sh?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/build.sh (original)
+++ webservices/rampart/trunk/c/build.sh Mon Mar 16 07:46:09 2009
@@ -1,6 +1,6 @@
#!/bin/bash
set -e
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no
--with-axis2=${AXIS2C_HOME}/include/axis2-1.5.0
+./configure --prefix=${AXIS2C_HOME} --enable-static=no
--with-axis2=${AXIS2C_HOME}/include/axis2-1.6.0
make
make install
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Mon Mar 16 07:46:09 2009
@@ -2,7 +2,7 @@
AC_PREREQ(2.59)
-AC_INIT(rampartc-src, 1.2.0)
+AC_INIT(rampartc-src, 1.3.0)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
dnl AM_INIT_AUTOMAKE([tar-ustar])
@@ -80,8 +80,8 @@
if test -d $withval; then
axis2inc="-I$withval"
dnl else find the axis2inc include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include/axis2-1.5.0'; then
- axis2inc="-I$(AXIS2C_HOME)/include/axis2-1.5.0"
+ elif test -d '$(AXIS2C_HOME)/include/axis2-1.6.0'; then
+ axis2inc="-I$(AXIS2C_HOME)/include/axis2-1.6.0"
else
AC_MSG_ERROR(could not find axis2inc. stop)
fi
@@ -121,6 +121,7 @@
OPENSSLINC=$opensslinc
OPENSSLLIB=$openssllib
UTILINC=$axis2_utilinc
+VERSION_NO="3:0:3"
AC_SUBST(AXIS2INC)
AC_SUBST(AXIS2LIB)
AC_SUBST(AXIOMINC)
@@ -129,6 +130,8 @@
AC_SUBST(NEETHIINC)
AC_SUBST(UTILINC)
AC_SUBST(XMLSCHEMAINC)
+AC_SUBST(VERSION_NO)
+
AC_CONFIG_FILES([Makefile \
src/Makefile \
Modified: webservices/rampart/trunk/c/src/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/Makefile.am?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/Makefile.am Mon Mar 16 07:46:09 2009
@@ -1 +1 @@
-SUBDIRS = omxmlsec handlers trust secconv util core rahas data
+SUBDIRS = omxmlsec trust secconv util handlers core rahas data
Modified: webservices/rampart/trunk/c/src/core/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/core/Makefile.am?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/core/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/core/Makefile.am Mon Mar 16 07:46:09 2009
@@ -7,12 +7,10 @@
prglib_DATA= ../data/module.xml
libmod_rampart_la_SOURCES = mod_rampart.c
+libmod_rampart_la_LDFLAGS = -version-info $(VERSION_NO)
libmod_rampart_la_LIBADD = ../handlers/librampart_handlers.la \
- ../util/librampart_util.la \
- ../omxmlsec/libomxmlsec.la \
- ../secconv/libsecconv.la \
- ../trust/libtrust.la \
+ ../util/librampart.la \
@OPENSSLLIB@ \
@AXIS2LIB@ \
-lcrypto \
@@ -27,6 +25,3 @@
@NEETHIINC@ \
@AXIOMINC@
-install-data-hook:
- cp $(prefix)/modules/rampart/libmod_rampart* $(prefix)/lib
-
Modified: webservices/rampart/trunk/c/src/rahas/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/rahas/Makefile.am?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/rahas/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/rahas/Makefile.am Mon Mar 16 07:46:09 2009
@@ -7,10 +7,9 @@
prglib_DATA= ../data/rahas_module.xml
libmod_rahas_la_SOURCES = mod_rahas.c rahas_in_handler.c
rahas_request_processor.c
+libmod_rahas_la_LDFLAGS = -version-info $(VERSION_NO)
-libmod_rahas_la_LIBADD = ../util/librampart_util.la \
- ../omxmlsec/libomxmlsec.la \
- ../secconv/libsecconv.la \
+libmod_rahas_la_LIBADD = ../util/librampart.la \
@OPENSSLLIB@ \
@AXIS2LIB@ \
-lcrypto
@@ -25,6 +24,5 @@
@AXIOMINC@
install-data-hook:
- cp $(prefix)/modules/rahas/libmod_rahas* $(prefix)/lib
mv $(prefix)/modules/rahas/rahas_module.xml
$(prefix)/modules/rahas/module.xml
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?rev=754835&r1=754834&r2=754835&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Mon Mar 16 07:46:09 2009
@@ -1,8 +1,10 @@
TESTS =
-noinst_LTLIBRARIES = librampart_util.la
+prglibdir=$(prefix)/lib
-librampart_util_la_SOURCES = rampart_crypto_util.c \
+prglib_LTLIBRARIES = librampart.la
+
+librampart_la_SOURCES = rampart_crypto_util.c \
rampart_util.c
rampart_handler_util.c rampart_username_token.c rampart_timestamp_token.c \
rampart_encryption.c
rampart_sec_header_processor.c rampart_sec_processed_result.c \
rampart_sec_header_builder.c rampart_context.c rampart_token_processor.c
rampart_signature.c \
@@ -10,6 +12,14 @@
rampart_policy_validator.c rampart_error.c rampart_config.c rampart_saml.c
rampart_saml_token.c \
rampart_issued.c
rampart_issued_token.c
+librampart_la_LDFLAGS = -version-info $(VERSION_NO)
+
+librampart_la_LIBADD = ../omxmlsec/libomxmlsec.la \
+ ../secconv/libsecconv.la \
+ ../trust/libtrust.la \
+ @OPENSSLLIB@ \
+ @AXIS2LIB@ \
+ -lcrypto
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
