diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh index e8254f49eb991e4302db659b89db761321431d9d..e9c480de7879c51360c7e03d11bdc769f9dfc1ad 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 34f355558ef8111c5f7ddd9dac4ee570e7ff2d78..61d183db77d03c8dca9e7c589e6ba661c142038e 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