X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeploy-adml-http.sh;h=97c5d72a83019c639d373b97bbd3e122247769e1;hb=60870aeb874273396e495c5c188ba12a614b5b1b;hp=3b8e6e341cf043fecc2b7d49c313a49a0f91d382;hpb=ea1b80f8fd0c1b806460f98f4e4cf433698857d9;p=anna.git

diff --git a/example/diameter/launcher/deploy-adml-http.sh b/example/diameter/launcher/deploy-adml-http.sh
index 3b8e6e3..97c5d72 100755
--- a/example/diameter/launcher/deploy-adml-http.sh
+++ b/example/diameter/launcher/deploy-adml-http.sh
@@ -6,6 +6,8 @@
 SCR_DIR=`readlink -f $0 | xargs dirname`
 PROJECT_ROOT=$(readlink -f $SCR_DIR/../../..)
 
+VARIANT=${1:-Release}
+
 #############
 # FUNCTIONS #
 #############
@@ -29,9 +31,9 @@ echo "------------------------------------------------------"
 echo "         ADML with HTTP support installation          "
 echo "------------------------------------------------------"
 echo
-[ -d $PROJECT_ROOT/build/Release ] && VARIANT=Release
-[ -d $PROJECT_ROOT/build/Debug ] && VARIANT=Debug
-[ -z "$VARIANT" ] && _exit "Cannot locate neither 'Release' nor 'Debug' variant !"
+[ ! -d $PROJECT_ROOT/build/${VARIANT} ] && _exit "Cannot locate neither '${VARIANT}' variant. Build the project !"
+echo "Variant: ${VARIANT}"
+echo
 build_type_letter=$(echo $VARIANT | cut -c1 | tr '[:upper:]' '[:lower:]')
 
 version__dflt=v"`date +'%y'`.`date +'%m'`.`date +'%d'`$build_type_letter"
@@ -71,7 +73,7 @@ mkdir -p ${ADML}/counters
 mkdir -p ${ADML}/test-reports
 
 # Scripts:
-cp ${PROJECT_ROOT}/example/diameter/launcher/resources/scripts/operation_curl.sh ${ADML}/operation.sh
+cp ${PROJECT_ROOT}/example/diameter/launcher/resources/scripts/operation.sh ${ADML}
 
 # Templates:
 mkdir $DTDs
@@ -107,7 +109,7 @@ ln -sf default/libanna_launcher_procedure_default_shared.so
 cd - >/dev/null
 
 # ADML Agent shall use http server:
-httpOpt="--httpServer \`grep -v ^# .httpServer\`"
+httpOpt="--httpServerShared --httpServer \`grep -v ^# .httpServer\`"
 echo "${httpOpt}" >> ${ADML}/args.ft
 echo "${httpOpt}" >> ${ADML}/args.st
 echo "localhost:8000" > ${ADML}/.httpServer
@@ -115,6 +117,13 @@ echo "localhost:8000" > ${ADML}/.httpServer
 # Help
 cp ${PROJECT_ROOT}/example/diameter/launcher/resources/HELP.md ${ADML}
 
+# Simple services which only loads the diameter base dictionary:
+cat << EOF > ${ADML}/services.xml
+<services>
+  <stack id="0" dictionary="stacks/diameter_base.0.xml" fixMode="Never"/>
+</services>
+EOF
+
 # Remove AOTS actions:
 rm ${ADML}/ACTIONS.md