From 84d26a411b326f91960c4b04ed91c416a4859980 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Thu, 24 Sep 2015 19:13:12 +0000
Subject: [PATCH] updated experiment gui installation script
---
tools/ExperimentSynchronizer/install_expSync.sh | 8 ++++++--
.../resources/config.properties.template | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh
index e8254f49..e9c480de 100644
--- a/tools/ExperimentSynchronizer/install_expSync.sh
+++ b/tools/ExperimentSynchronizer/install_expSync.sh
@@ -19,12 +19,16 @@ tar zxf jdk-${JAVA_VERSION}*.tar.gz
cd ../resources
read -p "Enter Data Acquisition Service Host: " DAQ_SERVICE_HOST
-read -p "Enter Experiment Data Root Directory: " DAQ_DATA_DIR
+read -p "Enter Experiment Data Root Directory (on DAQ): " DAQ_DATA_DIR
+read -p "Enter Data Processing Host: " DAQ_REC_SERVICE_HOST
+read -p "Enter Experiment Data Root Directory (on data processing node): " DAQ_REC_DATA_DIR
echo "Generating config file"
cmd="cat config.properties.template \
| sed 's?DAQ_CONNECTION?https://$DAQ_SERVICE_HOST:33336/dm?g' \
| sed 's?DATA_DIR?$DAQ_DATA_DIR?g' \
+ | sed 's?DAQ_REC_CONNECTION?https://$DAQ_REC_SERVICE_HOST:33336/dm?g' \
+ | sed 's?DATA_REC_DIR?$DAQ_REC_DATA_DIR?g' \
> config.properties"
eval $cmd || exit 1
@@ -32,7 +36,7 @@ cd ..
mkdir bin
execute lib/jdk1.7.0_51/bin/javac -classpath lib/*:resources/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java
mkdir target
-execute jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ .
+execute lib/jdk1.7.0_51/bin/jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ .
chmod 775 run_expSync.sh
cd ..
diff --git a/tools/ExperimentSynchronizer/resources/config.properties.template b/tools/ExperimentSynchronizer/resources/config.properties.template
index 34f35555..61d183db 100644
--- a/tools/ExperimentSynchronizer/resources/config.properties.template
+++ b/tools/ExperimentSynchronizer/resources/config.properties.template
@@ -1,4 +1,6 @@
dm.daqServ.connection = DAQ_CONNECTION
dm.daq.datadir = DATA_DIR
+dm.daqReciver.connection = DAQ_REC_CONNECTION
+dm.daqReceiver.datadir = DATA_REC_DIR
dm.storageServ.connection = https://xstor-devel.xray.aps.anl.gov:22236/dm
--
GitLab