1. Changed the build to include SAML
2. Update the bindist script
3. Documentation change in INSTALL: Need to copy the saml_echo sample
diff --git a/INSTALL b/INSTALL
index 4dade01..2c47cca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -28,7 +28,7 @@
======================================================
1. Copy modules/rampart to $AXIS2C_HOME/modules
2. Copy lib/* to $AXIS2C_HOME/lib
-3. Copy bin/samples/server/sec_echo to $AXIS2C_HOME/services/
+3. Copy bin/samples/server/* to $AXIS2C_HOME/services/
4. Engage rampart as described in section "Engaging Rampart/C with axis2/C"
5. Copy bin/samples/* to $AXIS2C_HOME/bin/samples/rampart. This will copy callback modules etc.
6. Go to bin/samples/client/sec_echo/ and deploy the client repo
diff --git a/bindist.sh b/bindist.sh
index fe3e5c9..099036c 100755
--- a/bindist.sh
+++ b/bindist.sh
@@ -73,6 +73,8 @@
cp -r $AXIS2C_HOME/bin/samples/rampart/secpolicy/* $BIN_DIR/bin/samples/secpolicy/
cp -r $AXIS2C_HOME/bin/samples/rampart/* $BIN_DIR/bin/samples
cp -r $AXIS2C_HOME/services/sec_echo $BIN_DIR/bin/samples/server/
+cp -r $AXIS2C_HOME/services/saml_sts $BIN_DIR/bin/samples/server/
+cp -r $AXIS2C_HOME/services/secconv_echo $BIN_DIR/bin/samples/server/
cp samples/server/sec_echo/services.xml $BIN_DIR/bin/samples/server/sec_echo/services.xml
cp samples/server/sec_echo/server_axis2.xml $BIN_DIR/bin/samples/server/sec_echo/server_axis2.xml
diff --git a/samples/client/saml_echo/Makefile.am b/samples/client/saml_echo/Makefile.am
index a74f117..2e98501 100644
--- a/samples/client/saml_echo/Makefile.am
+++ b/samples/client/saml_echo/Makefile.am
@@ -1,7 +1,7 @@
prgbindir=$(prefix)/bin/samples/rampart/client/saml_echo
prgbin_PROGRAMS = saml_echo
datadir=$(prefix)/bin/samples/rampart/client/saml_echo
-#data_DATA= README update_n_run.sh deploy_client_repo.sh
+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
diff --git a/samples/secpolicy/test_scen.sh b/samples/secpolicy/test_scen.sh
index 671fca4..2d73df4 100755
--- a/samples/secpolicy/test_scen.sh
+++ b/samples/secpolicy/test_scen.sh
@@ -6,6 +6,7 @@
echo "Usage : $0 scenarioX server-port"
exit
fi
+
S_i=$1
_PORT=$2
echo "-------------------------------------------------------------------------"
@@ -18,7 +19,14 @@
echo ">Start server @ $_PORT"
./axis2_http_server -p$_PORT &
echo ">Go to client directory"
- cd $_SMPL_DIR/../client/sec_echo
+ if [ $S_i = 'scenario14' ]
+ then
+ echo "SAML"
+ cd $_SMPL_DIR/../client/saml_echo
+ else
+ echo "****"
+ cd $_SMPL_DIR/../client/sec_echo
+ fi
echo ">Run the sample"
sh update_n_run.sh
echo ">Jump back to samples dir :$_SMPL_DIR"
