Author: shankar
Date: Mon Mar 16 10:27:30 2009
New Revision: 754857
URL: http://svn.apache.org/viewvc?rev=754857&view=rev
Log:
changing sample binary locations
Modified:
webservices/rampart/trunk/c/samples/Makefile.am
webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
webservices/rampart/trunk/c/samples/build.sh
webservices/rampart/trunk/c/samples/callback/Makefile.am
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
webservices/rampart/trunk/c/samples/client/Makefile.am
webservices/rampart/trunk/c/samples/client/deploy_client_repo.sh
webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am
webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am
webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am
webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am
webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
webservices/rampart/trunk/c/samples/data/Makefile.am
webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am
webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am
webservices/rampart/trunk/c/samples/keys/xhome/Makefile.am
webservices/rampart/trunk/c/samples/keys/yhome/Makefile.am
webservices/rampart/trunk/c/samples/replay_detector/Makefile.am
webservices/rampart/trunk/c/samples/sct_provider/Makefile.am
webservices/rampart/trunk/c/samples/secpolicy/deploy.sh
webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am
webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
Modified: webservices/rampart/trunk/c/samples/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/Makefile.am Mon Mar 16 10:27:30 2009
@@ -1,12 +1,11 @@
TESTS =
-datadir=$(prefix)/bin/samples/rampart/secpolicy
+datadir=$(prefix)/samples/secpolicy
SUBDIRS = callback client server keys authn_provider credential_provider data
replay_detector sct_provider
data_DATA=
install-data-hook:
cp -rf secpolicy/* $(datadir)
- cp -rf README $(datadir)/../
- cp -rf ABOUT_SAMPLES $(datadir)/../
+ find $(datadir) -type d -name ".svn" | xargs rm -rf
EXTRA_DIST=secpolicy omxmlsec data ABOUT_SAMPLES build.sh
Modified: webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/authn_provider/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/authn_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/authn_provider/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,7 +1,7 @@
-prglibdir=$(prefix)/bin/samples/rampart/authn_provider
+prglibdir=$(prefix)/samples/lib
prglib_LTLIBRARIES = libauthn.la
libauthn_la_SOURCES = authn_provider.c
-libauthn_la_LIBADD = ../../src/core/libmod_rampart.la
+libauthn_la_LIBADD = ../../src/util/librampart.la
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/build.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/build.sh?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/build.sh (original)
+++ webservices/rampart/trunk/c/samples/build.sh Mon Mar 16 10:27:30 2009
@@ -1,13 +1,13 @@
#!/bin/bash
./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
-cd client/sec_echo
+cd client
sh deploy_client_repo.sh
-cd ../../secpolicy
+cd ../secpolicy
sh deploy.sh scenario5
cd ../
echo "Copying server's axis2.xml to " $AXIS2C_HOME
-cp server/sec_echo/server_axis2.xml $AXIS2C_HOME/axis2.xml
+cp ./data/server_axis2.xml $AXIS2C_HOME/axis2.xml
echo "samples successfuly build. To run echo client cd to client/sec_echo and
run update_n_run.sh"
Modified: webservices/rampart/trunk/c/samples/callback/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/callback/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,5 +1,5 @@
SUBDIRS=htpasswd_callback
-prglibdir=$(prefix)/bin/samples/rampart/callback
+prglibdir=$(prefix)/samples/lib
prglib_LTLIBRARIES = libpwcb.la
libpwcb_la_SOURCES = pwcb.c
libpwcb_la_LIBADD =
Modified:
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
Mon Mar 16 10:27:30 2009
@@ -1,5 +1,4 @@
-prglibdir=$(prefix)/bin/samples/rampart/callback/htpasswd_callback
-prglibdir=$(prefix)/lib
+prglibdir=$(prefix)/samples/lib
prglib_LTLIBRARIES = libhtpwcb.la
libhtpwcb_la_SOURCES = htpwcb.c
Modified: webservices/rampart/trunk/c/samples/client/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/Makefile.am Mon Mar 16 10:27:30
2009
@@ -1,3 +1,4 @@
TESTS =
+resdir=$(prefix)/samples/bin
SUBDIRS = sec_echo sts_client saml_echo issued_token saml_protect
-
+res_DATA= deploy_client_repo.sh
Modified: webservices/rampart/trunk/c/samples/client/deploy_client_repo.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/deploy_client_repo.sh?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/deploy_client_repo.sh (original)
+++ webservices/rampart/trunk/c/samples/client/deploy_client_repo.sh Mon Mar 16
10:27:30 2009
@@ -1,7 +1,6 @@
#!/bin/bash
CLIENT_REPO="$AXIS2C_HOME/client_repo"
-SERVICE_HOME="$AXIS2C_HOME/services/sec_echo"
echo "Start creating a client repository at $CLIENT_REPO"
if [ -d $CLIENT_REPO ];
@@ -15,7 +14,7 @@
#copy [client]axis2.xml to CLIENT_REPO
echo "Copying axis2.xml to $CLIENT_REPO"
-cp data/client.axis2.xml $CLIENT_REPO/axis2.xml
+cp ../data/client_axis2.xml $CLIENT_REPO/axis2.xml
#copy libs to client_repo
echo "Copying libraries to $CLIENT_REPO"
Modified: webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/client/issued_token/Makefile.am Mon Mar
16 10:27:30 2009
@@ -1,15 +1,11 @@
-prgbindir=$(prefix)/bin/samples/rampart/client/issued_token
-prgbin_PROGRAMS = issued_token
-datadir=$(prefix)/bin/samples/rampart/client/issued_token
-#data_DATA= update_n_run.sh
-#samplesdir=$(prefix)/samples/client/echo
-#samples_DATA=echo.c README.txt Makefile.am Makefile.in
-issued_token_SOURCES = echo.c
+prgbindir=$(prefix)/samples/bin
+prgbin_PROGRAMS = issued_token_echo
+datadir=$(prefix)/samples/bin
+issued_token_echo_SOURCES = echo.c
-issued_token_LDADD = $(LDFLAGS) \
+issued_token_echo_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart \
+ -lrampart \
-laxutil \
-laxis2_axiom \
-lneethi \
Modified: webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/saml_echo/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,15 +1,12 @@
-prgbindir=$(prefix)/bin/samples/rampart/client/saml_echo
+prgbindir=$(prefix)/samples/bin
prgbin_PROGRAMS = saml_echo
-datadir=$(prefix)/bin/samples/rampart/client/saml_echo
+datadir=$(prefix)/samples/bin
data_DATA= update_n_run.sh
-#samplesdir=$(prefix)/samples/client/echo
-#samples_DATA=echo.c README.txt Makefile.am Makefile.in
saml_echo_SOURCES = echo.c
saml_echo_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart \
+ -lrampart \
-laxutil \
-laxis2_axiom \
-lneethi \
Modified: webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/client/saml_protect/Makefile.am Mon Mar
16 10:27:30 2009
@@ -1,12 +1,11 @@
-prgbindir=$(prefix)/bin/samples/rampart/client/saml_protect
-prgbin_PROGRAMS = saml_protect
-datadir=$(prefix)/bin/samples/rampart/client/saml_protect
+prgbindir=$(prefix)/samples/bin
+prgbin_PROGRAMS = saml_protect_echo
+datadir=$(prefix)/samples/bin
data_DATA= update_n_run.sh
-saml_protect_SOURCES = echo.c
+saml_protect_echo_SOURCES = echo.c
-saml_protect_LDADD = $(LDFLAGS) \
+saml_protect_echo_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
-laxutil \
-laxis2_axiom \
-lneethi \
@@ -15,7 +14,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lmod_rampart \
+ -lrampart \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,13 +1,10 @@
-SUBDIRS = data
-prgbindir=$(prefix)/bin/samples/rampart/client/sec_echo
-prgbin_PROGRAMS = echo
-datadir=$(prefix)/bin/samples/rampart/client/sec_echo
-data_DATA= README update_n_run.sh deploy_client_repo.sh
-#samplesdir=$(prefix)/samples/client/echo
-#samples_DATA=echo.c README.txt Makefile.am Makefile.in
-echo_SOURCES = echo.c
+prgbindir=$(prefix)/samples/bin
+prgbin_PROGRAMS = sec_echo
+datadir=$(prefix)/samples/bin
+data_DATA= update_n_run.sh
+sec_echo_SOURCES = echo.c
-echo_LDADD = $(LDFLAGS) \
+sec_echo_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
-laxis2_axiom \
@@ -24,4 +21,4 @@
-I$(AXIS2C_HOME)/include \
-I ../../../include
-EXTRA_DIST = README deploy_client_repo.sh update_n_run.sh update_n_run.bat
deploy_client_repo.bat
+EXTRA_DIST = update_n_run.sh update_n_run.bat
Modified: webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/sts_client/Makefile.am Mon Mar
16 10:27:30 2009
@@ -1,13 +1,12 @@
-prgbindir=$(prefix)/bin/samples/rampart/client/sts_client
+prgbindir=$(prefix)/samples/bin
prgbin_PROGRAMS = sts_client
-datadir=$(prefix)/bin/samples/rampart/client/sts_client
-data_DATA= client.xml service.xml
+datadir=$(prefix)/samples/bin
+#data_DATA= client.xml service.xml
sts_client_SOURCES = client.c
sts_client_LDADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart \
+ -lrampart \
-laxutil \
-laxis2_axiom \
-lneethi \
@@ -23,4 +22,4 @@
-I$(AXIS2C_HOME)/include \
-I ../../../include
-EXTRA_DIST = client.xml service.xml
+#EXTRA_DIST = client.xml service.xml
Modified: webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/credential_provider/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/credential_provider/Makefile.am Mon Mar
16 10:27:30 2009
@@ -1,7 +1,7 @@
-prglibdir=$(prefix)/bin/samples/rampart/credential_provider
+prglibdir=$(prefix)/samples/lib
prglib_LTLIBRARIES = libcredential.la
libcredential_la_SOURCES = cred_provider.c
-libcredential_la_LIBADD = ../../src/core/libmod_rampart.la
+libcredential_la_LIBADD = ../../src/util/librampart.la
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/data/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/data/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/data/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/data/Makefile.am Mon Mar 16 10:27:30
2009
@@ -1,3 +1,3 @@
-resdir=$(prefix)/bin/samples/rampart/data
-res_DATA= passwords.txt
+resdir=$(prefix)/samples/data
+res_DATA= passwords.txt server_axis2.xml client_axis2.xml
Modified: webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/keys/ahome/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,3 +1,3 @@
-resdir=$(prefix)/bin/samples/rampart/keys/ahome
+resdir=$(prefix)/samples/data/keys/ahome
res_DATA= a_key.pem a_req.pem b_cert.cert a_cert.cert alice_key.pem
alice_cert.cert bob_cert.cert alice_kstore.p12 bob_key.pem
EXTRA_DIST= a_key.pem a_req.pem b_cert.cert a_cert.cert alice_key.pem
alice_cert.cert bob_cert.cert alice_kstore.p12
Modified: webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/keys/bhome/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,3 +1,3 @@
-resdir=$(prefix)/bin/samples/rampart/keys/bhome
+resdir=$(prefix)/samples/data/keys/bhome
res_DATA= a_cert.cert b_key.pem b_req.pem b_cert.cert alice_cert.cert
bob_cert.cert bob_key.pem bob_kstore.p12
EXTRA_DIST= a_cert.cert b_key.pem b_req.pem b_cert.cert alice_cert.cert
bob_cert.cert bob_key.pem bob_kstore.p12
Modified: webservices/rampart/trunk/c/samples/keys/xhome/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/keys/xhome/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/keys/xhome/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/keys/xhome/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,3 +1,3 @@
-resdir=$(prefix)/bin/samples/rampart/keys/xhome
+resdir=$(prefix)/samples/data/keys/xhome
res_DATA= x_store.pfx y_cert.cert
EXTRA_DIST= x_store.pfx y_cert.cert
Modified: webservices/rampart/trunk/c/samples/keys/yhome/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/keys/yhome/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/keys/yhome/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/keys/yhome/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,3 +1,3 @@
-resdir=$(prefix)/bin/samples/rampart/keys/yhome
+resdir=$(prefix)/samples/data/keys/yhome
res_DATA= x_cert.cert y_store.pfx
EXTRA_DIST= x_cert.cert y_store.pfx
Modified: webservices/rampart/trunk/c/samples/replay_detector/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/replay_detector/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/replay_detector/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/replay_detector/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,10 +1,10 @@
-prglibdir=$(prefix)/bin/samples/rampart/replay_detector
+prglibdir=$(prefix)/samples/lib
prglib_LTLIBRARIES = librdflatfile.la
librdflatfile_la_SOURCES = rampart_replay_detector_flat_file.c
librdflatfile_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
-
../../src/core/libmod_rampart.la
+
../../src/util/librampart.la
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/sct_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/sct_provider/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/sct_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/sct_provider/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,16 +1,16 @@
-prglibdir=$(prefix)/bin/samples/rampart/sct_provider
+prglibdir=$(prefix)/samples/lib
prglib_LTLIBRARIES = libsctprovider.la libsctprovider_hashdb.la
libsctprovider_la_SOURCES = sct_provider_stored_key.c
libsctprovider_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
-
../../src/core/libmod_rampart.la
+
../../src/util/librampart.la
libsctprovider_hashdb_la_SOURCES = sct_provider_hash_map.c
libsctprovider_hashdb_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
-laxutil \
-
../../src/core/libmod_rampart.la
+
../../src/util/librampart.la
INCLUDES = -I ../../include\
@AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/secpolicy/deploy.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/deploy.sh?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/deploy.sh (original)
+++ webservices/rampart/trunk/c/samples/secpolicy/deploy.sh Mon Mar 16 10:27:30
2009
@@ -10,7 +10,7 @@
SERVICE_HOME="$INST_DIR/services/sec_echo"
echo "Copying server's axis2.xml to " $AXIS2C_HOME
-cp ../server/sec_echo/server_axis2.xml $AXIS2C_HOME/axis2.xml
+cp ../data/server_axis2.xml $AXIS2C_HOME/axis2.xml
#COPYING THE RELEVENT POLICY FILES TO CLIENT AND SERVER
Modified: webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/saml_sts/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,5 +1,5 @@
prglibdir=$(prefix)/services/saml_sts
-samplesdir=$(prefix)/samples/server/saml_sts
+samplesdir=$(prefix)/samples/src/server/saml_sts
prglib_LTLIBRARIES = libsaml_sts.la
samples_DATA=issuer.c saml_skeleton.c saml_issuer.h services.xml Makefile.am
prglib_DATA= services.xml
@@ -9,8 +9,7 @@
libsaml_sts_la_SOURCES = issuer.c saml_skeleton.c
libsaml_sts_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart
+ -lrampart
INCLUDES = @AXIS2INC@ \
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am Mon Mar 16
10:27:30 2009
@@ -1,16 +1,15 @@
prglibdir=$(prefix)/services/sec_echo
-samplesdir=$(prefix)/samples/server/sec_echo
+samplesdir=$(prefix)/samples/src/server/sec_echo
prglib_LTLIBRARIES = libsec_echo.la
samples_DATA=echo.c echo_skeleton.c echo.h services.xml Makefile.am Makefile.in
prglib_DATA= services.xml
-EXTRA_DIST = services.xml echo.h server_axis2.xml
+EXTRA_DIST = services.xml echo.h
noinst_HEADERS = echo.h
SUBDIRS =
libsec_echo_la_SOURCES = echo.c echo_skeleton.c
libsec_echo_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart
+ -lrampart
INCLUDES = @AXIS2INC@ \
Modified: webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am?rev=754857&r1=754856&r2=754857&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/server/secconv_echo/Makefile.am Mon Mar
16 10:27:30 2009
@@ -1,16 +1,15 @@
prglibdir=$(prefix)/services/secconv_echo
-samplesdir=$(prefix)/samples/server/secconv_echo
+samplesdir=$(prefix)/samples/src/server/secconv_echo
prglib_LTLIBRARIES = libsecconv_echo.la
samples_DATA=echo.c echo_skeleton.c echo.h services.xml Makefile.am Makefile.in
prglib_DATA= services.xml
-EXTRA_DIST = services.xml echo.h server_axis2.xml
+EXTRA_DIST = services.xml echo.h
noinst_HEADERS = echo.h
SUBDIRS =
libsecconv_echo_la_SOURCES = echo.c echo_skeleton.c
libsecconv_echo_la_LIBADD = $(LDFLAGS) \
-L$(AXIS2C_HOME)/lib \
- -L$(AXIS2C_HOME)/modules/rampart \
- -lmod_rampart
+ -lrampart
