From 40bd5b7612941419d7923dc6323cdc84c573d4fe Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Fri, 7 Aug 2015 20:09:21 +0000
Subject: [PATCH] added resources
---
tools/ExperimentSynchronizer/install_expSync.sh | 2 +-
.../resources/config.properties | 11 +++++++++++
tools/ExperimentSynchronizer/run_expSync.sh | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 tools/ExperimentSynchronizer/resources/config.properties
diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh
index 060f2659..3f94f155 100644
--- a/tools/ExperimentSynchronizer/install_expSync.sh
+++ b/tools/ExperimentSynchronizer/install_expSync.sh
@@ -13,7 +13,7 @@ EXPSYNC_DIR=ExperimentSynchronizer
cd $EXPSYNC_DIR
mkdir bin
-execute javac -classpath lib/*:config/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java
+execute 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/ .
diff --git a/tools/ExperimentSynchronizer/resources/config.properties b/tools/ExperimentSynchronizer/resources/config.properties
new file mode 100644
index 00000000..7e29e826
--- /dev/null
+++ b/tools/ExperimentSynchronizer/resources/config.properties
@@ -0,0 +1,11 @@
+###
+### Oracle database settings
+###
+oracle.database.connection = jdbc:oracle:thin:@ra.aps.anl.gov:1527:aps1
+#oracle.database.username =
+#oracle.database.password =
+oracle.database.table = DCC.FL$03_BL_APV_VIEW_V2
+
+#dm.storageServ.connection = http://xstor-devel.xray.aps.anl.gov:22236/dm
+dm.storageServ.connection = http://localhost:22236/dm
+dm.daqServ.connection = http://localhost:33336/dm
diff --git a/tools/ExperimentSynchronizer/run_expSync.sh b/tools/ExperimentSynchronizer/run_expSync.sh
index 7b575dfc..31b912fe 100644
--- a/tools/ExperimentSynchronizer/run_expSync.sh
+++ b/tools/ExperimentSynchronizer/run_expSync.sh
@@ -3,5 +3,5 @@ execute() {
eval "$@"
}
-execute java -jar target/ExperimentSynchronizer.jar config/config.properties
+execute java -jar target/ExperimentSynchronizer.jar resources/config.properties
--
GitLab