From 42a4e6a8fc6d911f4132d2e0cd1bc75ef9759265 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Tue, 1 Sep 2015 20:39:24 +0000
Subject: [PATCH] changed install script
---
tools/ExperimentSynchronizer/install_expSync.sh | 3 +++
tools/ExperimentSynchronizer/resources/config.properties | 4 ++--
.../gov/anl/dm/esafsync/serviceconn/ServiceConnection.java | 4 ----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh
index 719cbae9..171dcbde 100644
--- a/tools/ExperimentSynchronizer/install_expSync.sh
+++ b/tools/ExperimentSynchronizer/install_expSync.sh
@@ -23,3 +23,6 @@ execute lib/jdk1.7.0_51/bin/javac -classpath lib/*:resources/* -d bin/ src/gov/a
mkdir target
execute jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ .
+chmod 775 run_expSync.sh
+cd ..
+
diff --git a/tools/ExperimentSynchronizer/resources/config.properties b/tools/ExperimentSynchronizer/resources/config.properties
index 6a09d4ae..82baa13f 100644
--- a/tools/ExperimentSynchronizer/resources/config.properties
+++ b/tools/ExperimentSynchronizer/resources/config.properties
@@ -1,4 +1,4 @@
dm.storageServ.connection = https://xstor-devel.xray.aps.anl.gov:22236/dm
-dm.daqServ.connection = http://localhost:33336/dm
-dm.truststore = /etc/pki/ca-trust/extracted/java/cacerts
+dm.daqServ.connection = https://perch.aps.anl.gov:33336/dm
+#dm.truststore = /etc/pki/ca-trust/extracted/java/cacerts
diff --git a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/ServiceConnection.java b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/ServiceConnection.java
index c9f10ada..18698811 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/ServiceConnection.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/ServiceConnection.java
@@ -494,7 +494,6 @@ public class ServiceConnection {
//
// while ((inputLine = in.readLine()) != null) {
// response.append(inputLine);
-// System.out.println(inputLine);
// }
// } catch (IOException e) {
// JOptionPane.showMessageDialog(null, e.getMessage());
@@ -526,7 +525,6 @@ public class ServiceConnection {
}
resp = checkHttpResponse(connection);
if (resp != ServiceConnectionStatus.SUCCESS) {
- System.out.println("here b");
return resp;
}
session.setUsername(username);
@@ -534,13 +532,11 @@ public class ServiceConnection {
updateSessionCookie(connection);
return ServiceConnectionStatus.SUCCESS;
} catch (ConnectException ex) {
- System.out.println("here 1");
String errorMsg = "Cannot connect to " + getServiceUrl();
JOptionPane.showMessageDialog(null,errorMsg, "Error",JOptionPane.ERROR_MESSAGE);
return ServiceConnectionStatus.ERROR;
} catch (Exception ex) {
ex.printStackTrace();
- System.out.println("here 2");
JOptionPane.showMessageDialog(null, ex.getMessage());
return ServiceConnectionStatus.ERROR;
} finally {
--
GitLab