Skip to content
Snippets Groups Projects
Commit 42a4e6a8 authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

changed install script

parent 726077f9
No related branches found
No related tags found
No related merge requests found
...@@ -23,3 +23,6 @@ execute lib/jdk1.7.0_51/bin/javac -classpath lib/*:resources/* -d bin/ src/gov/a ...@@ -23,3 +23,6 @@ execute lib/jdk1.7.0_51/bin/javac -classpath lib/*:resources/* -d bin/ src/gov/a
mkdir target mkdir target
execute jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ . execute jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ .
chmod 775 run_expSync.sh
cd ..
dm.storageServ.connection = https://xstor-devel.xray.aps.anl.gov:22236/dm dm.storageServ.connection = https://xstor-devel.xray.aps.anl.gov:22236/dm
dm.daqServ.connection = http://localhost:33336/dm dm.daqServ.connection = https://perch.aps.anl.gov:33336/dm
dm.truststore = /etc/pki/ca-trust/extracted/java/cacerts #dm.truststore = /etc/pki/ca-trust/extracted/java/cacerts
...@@ -494,7 +494,6 @@ public class ServiceConnection { ...@@ -494,7 +494,6 @@ public class ServiceConnection {
// //
// while ((inputLine = in.readLine()) != null) { // while ((inputLine = in.readLine()) != null) {
// response.append(inputLine); // response.append(inputLine);
// System.out.println(inputLine);
// } // }
// } catch (IOException e) { // } catch (IOException e) {
// JOptionPane.showMessageDialog(null, e.getMessage()); // JOptionPane.showMessageDialog(null, e.getMessage());
...@@ -526,7 +525,6 @@ public class ServiceConnection { ...@@ -526,7 +525,6 @@ public class ServiceConnection {
} }
resp = checkHttpResponse(connection); resp = checkHttpResponse(connection);
if (resp != ServiceConnectionStatus.SUCCESS) { if (resp != ServiceConnectionStatus.SUCCESS) {
System.out.println("here b");
return resp; return resp;
} }
session.setUsername(username); session.setUsername(username);
...@@ -534,13 +532,11 @@ public class ServiceConnection { ...@@ -534,13 +532,11 @@ public class ServiceConnection {
updateSessionCookie(connection); updateSessionCookie(connection);
return ServiceConnectionStatus.SUCCESS; return ServiceConnectionStatus.SUCCESS;
} catch (ConnectException ex) { } catch (ConnectException ex) {
System.out.println("here 1");
String errorMsg = "Cannot connect to " + getServiceUrl(); String errorMsg = "Cannot connect to " + getServiceUrl();
JOptionPane.showMessageDialog(null,errorMsg, "Error",JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(null,errorMsg, "Error",JOptionPane.ERROR_MESSAGE);
return ServiceConnectionStatus.ERROR; return ServiceConnectionStatus.ERROR;
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
System.out.println("here 2");
JOptionPane.showMessageDialog(null, ex.getMessage()); JOptionPane.showMessageDialog(null, ex.getMessage());
return ServiceConnectionStatus.ERROR; return ServiceConnectionStatus.ERROR;
} finally { } finally {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment