diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh index 719cbae927daa7126e7f7c2f319dda973ca2329f..171dcbded2bfa33d5f5ca38d876e57522eb552e5 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 6a09d4ae10c01d284aa212a47a9172cddd9477d5..82baa13fb9fb7dfd3b3acf9fb70ec8dcac7a1ccc 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 c9f10ada1e339ea3f5f477120feab265bbc7f425..18698811bb1183b1d8fc667dacba8b8b81ee108a 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 {