1 removed + 3 modified, total 4 files
java/trunk/monitoring-app
--- java/trunk/monitoring-app/pom.xml 2014-04-02 18:50:15 UTC (rev 432)
+++ java/trunk/monitoring-app/pom.xml 2014-04-02 19:56:55 UTC (rev 433)
@@ -91,16 +91,18 @@
<groupId>org.hps</groupId>
<artifactId>hps-monitoring-drivers</artifactId>
</dependency>
- <!-- Since monitoring app is not packaged with distribution,
- include all the steering files in the bin jar. -->
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-steering-files</artifactId>
</dependency>
<dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-users</artifactId>
+ </dependency>
+ <dependency>
<groupId>jfreechart-aida-experimental</groupId>
<artifactId>jfreechart-aida-experimental</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>jdom</groupId>
@@ -110,26 +112,7 @@
<groupId>commons-math</groupId>
<artifactId>commons-math</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-jminuit-jdk1.4</artifactId>
- </exclusion>
</exclusions>
- </dependency>
- <dependency>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-jaida-remote</artifactId>
- <version>3.4.8</version>
- <exclusions>
- <exclusion>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
java/trunk/monitoring-app/src/main/java/org/hps/monitoring
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/AIDAServer.java 2014-04-02 18:50:15 UTC (rev 432)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/AIDAServer.java 2014-04-02 19:56:55 UTC (rev 433)
@@ -1,51 +0,0 @@
-package org.hps.monitoring;
-
-import hep.aida.dev.IDevTree;
-import hep.aida.ref.remote.RemoteServer;
-import hep.aida.ref.remote.rmi.server.RmiServerImpl;
-
-import org.lcsim.util.aida.AIDA;
-
-/**
- * Wrapper class for remote AIDA server.
- * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: AIDAServer.java,v 1.2 2013/10/25 22:59:16 jeremy Exp $
- */
-class AIDAServer {
-
- RmiServerImpl server;
- String name;
-
- /**
- * Class constructor.
- * @param name The name of the AIDA server.
- */
- AIDAServer(String name) {
- this.name = name;
- }
-
- /**
- * Start the remote AIDA server.
- * @return True if server started successfully; false if an error occurred during initialization.
- */
- boolean start() {
- //RmiStoreFactory store = new RmiStoreFactory(); // Is this needed?
- final boolean serverDuplex = false;
- RemoteServer treeServer = new RemoteServer((IDevTree) AIDA.defaultInstance().tree(), serverDuplex);
- try {
- server = new RmiServerImpl(treeServer, "/" + name);
- return true;
- }
- catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- }
-
- /**
- * Close the server down by disconnecting it.
- */
- void close() {
- server.disconnect();
- }
-}
\ No newline at end of file
java/trunk/monitoring-app/src/main/java/org/hps/monitoring
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/JobPanel.java 2014-04-02 18:50:15 UTC (rev 432)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/JobPanel.java 2014-04-02 19:56:55 UTC (rev 433)
@@ -30,8 +30,6 @@
private JComboBox steeringResourcesComboBox;
private JCheckBox logCheckBox;
private JTextField logFileField;
- private JCheckBox remoteAidaCheckBox;
- private JTextField remoteAidaNameField;
private JCheckBox pauseModeCheckBox;
private JComboBox logLevelComboBox;
private JTextField aidaSaveField;
@@ -85,8 +83,6 @@
logFileField = addField("Log File", "", "Full path to log file.", 30, false);
aidaSaveCheckBox = addCheckBox("Save AIDA at End of Job", false, false);
aidaSaveField = addField("AIDA Auto Save File Name", "", 30, false);
- remoteAidaCheckBox = addCheckBox("Enable remote AIDA", false, true);
- remoteAidaNameField = addField("Remote AIDA name", "", 15, true);
// Set default job settings.
setJobSettings(new JobSettings());
@@ -100,8 +96,6 @@
detectorNameField.setEnabled(enable);
eventBuilderField.setEnabled(enable);
pauseModeCheckBox.setEnabled(enable);
- remoteAidaCheckBox.setEnabled(enable);
- remoteAidaNameField.setEnabled(enable);
steeringTypeComboBox.setEnabled(enable);
steeringFileField.setEnabled(enable);
steeringResourcesComboBox.setEnabled(enable);
@@ -356,16 +350,8 @@
String getLogFileName() {
return logFileField.getText();
}
-
+
/**
- * Get whether the AIDA server is enabled.
- * @return True if the AIDA server is enabled; false if not.
- */
- boolean isAidaServerEnabled() {
- return remoteAidaCheckBox.isSelected();
- }
-
- /**
* Get whether AIDA autosave is enabled.
* @return True if AIDA autosave is enabled; false if not.
*/
@@ -380,16 +366,8 @@
String getAidaAutoSaveFileName() {
return aidaSaveField.getText();
}
-
+
/**
- * Get the name of the remote AIDA server.
- * @return The remote AIDA server name.
- */
- String getRemoteAidaName() {
- return remoteAidaNameField.getText();
- }
-
- /**
* Set whether to disconnect if errors occur.
* @param b The disconnect on error setting.
*/
@@ -496,32 +474,8 @@
}
});
}
-
+
/**
- * Enable remote AIDA.
- * @param b The remote AIDA setting; true to enable; false to disable.
- */
- private void enableRemoteAida(final boolean b) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- remoteAidaCheckBox.setSelected(b);
- }
- });
- }
-
- /**
- * Set the name of the remote AIDA server.
- * @param s The name of the remote AIDA server.
- */
- private void setRemoteAidaName(final String s) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- remoteAidaNameField.setText(s);
- }
- });
- }
-
- /**
* Get the resource path for the steering file.
* @return The resource path for the steering file.
*/
@@ -556,8 +510,6 @@
settings.logFileName = getLogFileName();
settings.autoSaveAida = isAidaAutoSaveEnabled();
settings.autoSaveAidaFileName = getAidaAutoSaveFileName();
- settings.remoteAidaName = getRemoteAidaName();
- settings.enableRemoteAida = remoteAidaCheckBox.isSelected();
return settings;
}
@@ -579,8 +531,6 @@
setLogFile(settings.logFileName);
enableAidaAutoSave(settings.autoSaveAida);
setAidaAutoSaveFileName(settings.autoSaveAidaFileName);
- enableRemoteAida(settings.enableRemoteAida);
- setRemoteAidaName(settings.remoteAidaName);
}
/**
java/trunk/monitoring-app/src/main/java/org/hps/monitoring
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/MonitoringApplication.java 2014-04-02 18:50:15 UTC (rev 432)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/MonitoringApplication.java 2014-04-02 19:56:55 UTC (rev 433)
@@ -172,9 +172,6 @@
// Format for screenshots. Hard-coded to PNG.
private static final String screenshotFormat = "png";
- // The AIDA remote server.
- private AIDAServer server;
-
// Listener for processing EtEvents.
private EtEventListener etListener = new MonitoringApplicationEtListener();
@@ -894,14 +891,7 @@
// Push final event counts to GUI.
eventPanel.endJob();
-
- // Disconnect from remote AIDA session if active.
- if (server != null) {
- log(Level.INFO, "Closing remote AIDA server.");
- server.close();
- server = null;
- log(Level.INFO, "Remote AIDA server was closed.");
- }
+
} catch (Exception e) {
e.printStackTrace();
log(Level.WARNING, "Error cleaning up job <" + e.getMessage() + ">.");
@@ -1340,9 +1330,6 @@
// Setup LCSim.
setupLCSim();
- // Start a remote AIDA session if selected in GUI.
- setupRemoteAida();
-
// Connect to the ET system.
connect();
@@ -1375,23 +1362,6 @@
}
/**
- * Setup a remote AIDA session if user selected this option.
- */
- private void setupRemoteAida() {
- if (jobPanel.isAidaServerEnabled()) {
- log("Starting remote AIDA server.");
- this.server = new AIDAServer(jobPanel.getRemoteAidaName());
- boolean ok = this.server.start();
- if (ok) {
- log("Remote AIDA server started with name <" + jobPanel.getRemoteAidaName() + ">.");
- } else {
- this.server = null;
- log(Level.SEVERE, "Failed to start remote AIDA server.");
- }
- }
- }
-
- /**
* Create the thread that will execute the EtEvent processing chain.
* @return The thread on which event processing will occur.
*/
SVNspam 0.1