diff --git a/distribution/pom.xml b/distribution/pom.xml index e182f4a6b5..f45a9806c2 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -113,18 +113,6 @@ -v - - org.hps.crawler.MetadataWriter - dc-create-metadata - - - org.hps.crawler.DatacatAddFile - dc-add-file - - - org.hps.crawler.DatacatCrawler - dc-crawler - @@ -135,7 +123,7 @@ org.hps - hps-monitoring-app + hps-online-monitoring org.hps diff --git a/ecal-event-display/pom.xml b/ecal-event-display/pom.xml deleted file mode 100644 index 779772ebf4..0000000000 --- a/ecal-event-display/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - hps-ecal-event-display - ecal-event-display - ECAL event display - - org.hps - hps-java - ../pom.xml - 5.1-SNAPSHOT - - - - org.hps - hps-ecal-recon - - - diff --git a/monitoring-drivers/pom.xml b/monitoring-drivers/pom.xml deleted file mode 100644 index a372b00b2c..0000000000 --- a/monitoring-drivers/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - 4.0.0 - hps-monitoring-drivers - monitoring-drivers - org.lcsim Drivers for using in the monitoring application - - org.hps - hps-java - ../pom.xml - 5.1-SNAPSHOT - - - - org.hps - hps-monitoring-util - - - org.hps - hps-recon - - - org.hps - hps-ecal-event-display - - - diff --git a/monitoring-util/pom.xml b/monitoring-util/pom.xml deleted file mode 100644 index 9a33c7378f..0000000000 --- a/monitoring-util/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - hps-monitoring-util - monitoring-util - utility packages for online data monitoring - - org.hps - hps-java - ../pom.xml - 5.1-SNAPSHOT - - - - org.hps - hps-analysis - - - jfreechart-aida-experimental - jfreechart-aida-experimental - - - com.itextpdf - itextpdf - 5.5.5 - - - diff --git a/monitoring-app/pom.xml b/online-monitoring/pom.xml similarity index 75% rename from monitoring-app/pom.xml rename to online-monitoring/pom.xml index 251594f495..e2f895e2c2 100644 --- a/monitoring-app/pom.xml +++ b/online-monitoring/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - hps-monitoring-app - monitoring-app - online monitoring application + hps-online-monitoring + online-monitoring + online monitoring tools org.hps hps-java @@ -33,19 +33,24 @@ org.hps - hps-monitoring-drivers + hps-steering-files - org.hps - hps-monitoring-util + org.reflections + reflections org.hps - hps-steering-files + hps-analysis - org.reflections - reflections + jfreechart-aida-experimental + jfreechart-aida-experimental + + + com.itextpdf + itextpdf + 5.5.5 diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/AbstractFieldsPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/AbstractFieldsPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/AbstractFieldsPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/AbstractFieldsPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/AddActionListener.java b/online-monitoring/src/main/java/org/hps/monitoring/application/AddActionListener.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/AddActionListener.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/AddActionListener.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/Commands.java b/online-monitoring/src/main/java/org/hps/monitoring/application/Commands.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/Commands.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/Commands.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/ConditionsCollectionTableModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/ConditionsCollectionTableModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/ConditionsCollectionTableModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/ConditionsCollectionTableModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/ConditionsPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/ConditionsPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/ConditionsPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/ConditionsPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/ConnectionSettingsPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/ConnectionSettingsPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/ConnectionSettingsPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/ConnectionSettingsPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/ConnectionStatusPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/ConnectionStatusPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/ConnectionStatusPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/ConnectionStatusPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java b/online-monitoring/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/DataSourceComboBox.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/DatePanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/DatePanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/DatePanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/DatePanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/EventDashboard.java b/online-monitoring/src/main/java/org/hps/monitoring/application/EventDashboard.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/EventDashboard.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/EventDashboard.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java b/online-monitoring/src/main/java/org/hps/monitoring/application/EventProcessing.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/EventProcessing.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/FieldPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/FieldPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/FieldPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/FieldPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/LogLevelFilterComboBox.java b/online-monitoring/src/main/java/org/hps/monitoring/application/LogLevelFilterComboBox.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/LogLevelFilterComboBox.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/LogLevelFilterComboBox.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/LogPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/LogPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/LogPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/LogPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/LogTable.java b/online-monitoring/src/main/java/org/hps/monitoring/application/LogTable.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/LogTable.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/LogTable.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java b/online-monitoring/src/main/java/org/hps/monitoring/application/Main.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/Main.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/Main.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/MenuBar.java b/online-monitoring/src/main/java/org/hps/monitoring/application/MenuBar.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/MenuBar.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/MenuBar.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java b/online-monitoring/src/main/java/org/hps/monitoring/application/MonitoringApplication.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/MonitoringApplication.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java b/online-monitoring/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/PlotInfoPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/PlotPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/PlotPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/PlotPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/PlotPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/SettingsDialog.java b/online-monitoring/src/main/java/org/hps/monitoring/application/SettingsDialog.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/SettingsDialog.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/SettingsDialog.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/SettingsPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/SettingsPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/SettingsPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/SettingsPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/SystemStatusEventsTable.java b/online-monitoring/src/main/java/org/hps/monitoring/application/SystemStatusEventsTable.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/SystemStatusEventsTable.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/SystemStatusEventsTable.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/SystemStatusPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/SystemStatusPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/SystemStatusPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/SystemStatusPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/SystemStatusTable.java b/online-monitoring/src/main/java/org/hps/monitoring/application/SystemStatusTable.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/SystemStatusTable.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/SystemStatusTable.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/ToolbarPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/ToolbarPanel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/ToolbarPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/ToolbarPanel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/AbstractModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/AbstractModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/AbstractModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/AbstractModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/Configuration.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/Configuration.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/Configuration.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/Configuration.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/HasConfigurationModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/HasConfigurationModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/HasConfigurationModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/HasConfigurationModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/RunModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/RunModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/RunModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/RunModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/SteeringType.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/SteeringType.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/SteeringType.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/SteeringType.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/SystemStatusTableModel.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/SystemStatusTableModel.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/SystemStatusTableModel.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/SystemStatusTableModel.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/model/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/application/model/package-info.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/model/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/model/package-info.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/application/package-info.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/package-info.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/DialogUtil.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/DialogUtil.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/DialogUtil.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/DialogUtil.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/ErrorHandler.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/ErrorHandler.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/ErrorHandler.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/ErrorHandler.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/EtSystemUtil.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/EtSystemUtil.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/EtSystemUtil.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/EtSystemUtil.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/EvioFileFilter.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/EvioFileFilter.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/EvioFileFilter.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/EvioFileFilter.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/ResourceUtil.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/ResourceUtil.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/ResourceUtil.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/ResourceUtil.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/TableExporter.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/TableExporter.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/TableExporter.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/TableExporter.java diff --git a/monitoring-app/src/main/java/org/hps/monitoring/application/util/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/application/util/package-info.java similarity index 100% rename from monitoring-app/src/main/java/org/hps/monitoring/application/util/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/application/util/package-info.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/DummyErrorDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/example/DummyErrorDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/DummyErrorDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/example/DummyErrorDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/EcalMonitoringTestDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/example/EcalMonitoringTestDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/EcalMonitoringTestDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/example/EcalMonitoringTestDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/example/package-info.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/example/package-info.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoUtils.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoUtils.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoUtils.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoUtils.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoscopePlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoscopePlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoscopePlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/hodoscope/HodoscopePlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/scalers/DeadtimePlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/scalers/package-info.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/scalers/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/scalers/package-info.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/ClusterOccupancyPlotsDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/ClusterOccupancyPlotsDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/ClusterOccupancyPlotsDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/ClusterOccupancyPlotsDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/GblTrackingReconstructionPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/GblTrackingReconstructionPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/GblTrackingReconstructionPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/GblTrackingReconstructionPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTCellIDPrintDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTCellIDPrintDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTCellIDPrintDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTCellIDPrintDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SamplesPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SamplesPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SamplesPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SamplesPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlotsWithTrackHits.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlotsWithTrackHits.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlotsWithTrackHits.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlotsWithTrackHits.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/package-info.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/svt/package-info.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/FinalStateParticlePlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/FinalStateParticlePlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/FinalStateParticlePlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/FinalStateParticlePlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/L01UnbiasedResidualsFromL26.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/L01UnbiasedResidualsFromL26.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/L01UnbiasedResidualsFromL26.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/L01UnbiasedResidualsFromL26.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/PlotAndFitUtilities.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/PlotAndFitUtilities.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/PlotAndFitUtilities.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/PlotAndFitUtilities.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/SVTOpeningAlignment.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackResiduals.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/V0ReconPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/package-info.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/drivers/trackrecon/package-info.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Association.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Association.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Association.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Association.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Cluster.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Cluster.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Cluster.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Cluster.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/EcalHit.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/EcalHit.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/EcalHit.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/EcalHit.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Event.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Event.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Event.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/Event.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/package-info.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/event/package-info.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/EventDisplayDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/EventDisplayDriver.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/EventDisplayDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/EventDisplayDriver.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/Main.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/Main.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/Main.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/Main.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/package-info.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/exec/package-info.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/AdvancedReader.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/AdvancedReader.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/AdvancedReader.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/AdvancedReader.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/EventManager.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/EventManager.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/EventManager.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/EventManager.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/LCIOManager.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/LCIOManager.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/LCIOManager.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/LCIOManager.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/TextManager.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/TextManager.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/TextManager.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/TextManager.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/package-info.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/io/package-info.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/EventDisplayOutputDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/EventDisplayOutputDriver.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/EventDisplayOutputDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/EventDisplayOutputDriver.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/LCIOBridgeDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/LCIOBridgeDriver.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/LCIOBridgeDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/LCIOBridgeDriver.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/package-info.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/lcsim/package-info.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ActiveViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ActiveViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ActiveViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ActiveViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CalorimeterPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CalorimeterPanel.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CalorimeterPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CalorimeterPanel.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ClusterViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ClusterViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ClusterViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ClusterViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CrystalFilterPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CrystalFilterPanel.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CrystalFilterPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/CrystalFilterPanel.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/DataFileViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/DataFileViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/DataFileViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/DataFileViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/FileViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/FileViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/FileViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/FileViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/OccupancyViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/OccupancyViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/OccupancyViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/OccupancyViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PDataEventViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PDataEventViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PDataEventViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PDataEventViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ResizableFieldPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ResizableFieldPanel.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ResizableFieldPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/ResizableFieldPanel.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/StatusPanel.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/StatusPanel.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/StatusPanel.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/StatusPanel.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/Viewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/Viewer.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/Viewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/Viewer.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/package-info.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/package-info.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/BooleanMap.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/BooleanMap.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/BooleanMap.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/BooleanMap.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorMap.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorMap.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorMap.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorMap.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorScale.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorScale.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorScale.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/ColorScale.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalDataSet.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalDataSet.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalDataSet.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalDataSet.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalEvent.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalEvent.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalEvent.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalEvent.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalListener.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalListener.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalListener.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/CrystalListener.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/EcalWiringManager.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/EcalWiringManager.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/EcalWiringManager.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/EcalWiringManager.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/GradientScale.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/GradientScale.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/GradientScale.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/GradientScale.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MapValueIterator.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MapValueIterator.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MapValueIterator.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MapValueIterator.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsEvent.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsEvent.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsEvent.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsEvent.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsListener.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsListener.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsListener.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/SettingsListener.java diff --git a/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/package-info.java similarity index 100% rename from ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/package-info.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/BasicMonitoringPlotsDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/BasicMonitoringPlotsDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/BasicMonitoringPlotsDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/BasicMonitoringPlotsDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalFeeMonitor.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalFeeMonitor.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalFeeMonitor.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalFeeMonitor.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalPedestalViewer.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalPedestalViewer.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalPedestalViewer.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalPedestalViewer.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowEventPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowEventPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowEventPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowEventPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlots.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlots.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlots.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlots.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/RawCalorimeterHitMonitoringDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/RawCalorimeterHitMonitoringDriver.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/RawCalorimeterHitMonitoringDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/RawCalorimeterHitMonitoringDriver.java diff --git a/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/package-info.java similarity index 100% rename from monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/ecal/plots/package-info.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/ChartPopup.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/ChartPopup.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/ChartPopup.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/ChartPopup.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/ExportPdf.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/ExportPdf.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/ExportPdf.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/ExportPdf.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/MonitoringPlotFactory.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/MonitoringPlotFactory.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/MonitoringPlotFactory.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/MonitoringPlotFactory.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/PlotterRegistry.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/PlotterRegistry.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/PlotterRegistry.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/PlotterRegistry.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/StripChartBuilder.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/StripChartBuilder.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/StripChartBuilder.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/StripChartBuilder.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/StripChartUpdater.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/StripChartUpdater.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/StripChartUpdater.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/StripChartUpdater.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/StripChartUtil.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/StripChartUtil.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/StripChartUtil.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/StripChartUtil.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/ValueProvider.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/ValueProvider.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/ValueProvider.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/ValueProvider.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/plotting/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/plotting/package-info.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/plotting/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/plotting/package-info.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/StatusCode.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/StatusCode.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/StatusCode.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/StatusCode.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/Subsystem.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/Subsystem.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/Subsystem.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/Subsystem.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatistics.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsListener.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatisticsListener.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatisticsListener.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatisticsListener.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatus.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatus.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatus.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatus.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatusImpl.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatusImpl.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatusImpl.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatusImpl.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatusListener.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatusListener.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatusListener.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatusListener.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatusRegistry.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatusRegistry.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/SystemStatusRegistry.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/SystemStatusRegistry.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalStripChartTestDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/ecal/EcalStripChartTestDriver.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalStripChartTestDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/ecal/EcalStripChartTestDriver.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/ecal/package-info.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/ecal/package-info.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/et/EtSystemStripCharts.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/et/EtSystemStripCharts.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/et/EtSystemStripCharts.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/et/EtSystemStripCharts.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/et/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/et/package-info.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/et/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/et/package-info.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/package-info.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/package-info.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/svt/BasicHitMonitoringDriver.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/svt/BasicHitMonitoringDriver.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/svt/BasicHitMonitoringDriver.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/svt/BasicHitMonitoringDriver.java diff --git a/monitoring-util/src/main/java/org/hps/monitoring/subsys/svt/package-info.java b/online-monitoring/src/main/java/org/hps/monitoring/subsys/svt/package-info.java similarity index 100% rename from monitoring-util/src/main/java/org/hps/monitoring/subsys/svt/package-info.java rename to online-monitoring/src/main/java/org/hps/monitoring/subsys/svt/package-info.java diff --git a/monitoring-app/src/main/resources/monitoringButtonGraphics/connected-128.png b/online-monitoring/src/main/resources/monitoringButtonGraphics/connected-128.png similarity index 100% rename from monitoring-app/src/main/resources/monitoringButtonGraphics/connected-128.png rename to online-monitoring/src/main/resources/monitoringButtonGraphics/connected-128.png diff --git a/monitoring-app/src/main/resources/monitoringButtonGraphics/disconnected-128.png b/online-monitoring/src/main/resources/monitoringButtonGraphics/disconnected-128.png similarity index 100% rename from monitoring-app/src/main/resources/monitoringButtonGraphics/disconnected-128.png rename to online-monitoring/src/main/resources/monitoringButtonGraphics/disconnected-128.png diff --git a/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop b/online-monitoring/src/main/resources/org/hps/monitoring/config/default_config.prop similarity index 100% rename from monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop rename to online-monitoring/src/main/resources/org/hps/monitoring/config/default_config.prop diff --git a/online-recon/pom.xml b/online-recon/pom.xml index 0afdcc2807..03b678575b 100644 --- a/online-recon/pom.xml +++ b/online-recon/pom.xml @@ -72,7 +72,7 @@ org.hps.online.recon.Server - hps-recon-server + online-recon-server 1g @@ -82,7 +82,7 @@ org.hps.online.recon.Client - hps-recon-client + online-recon-client 500m diff --git a/pom.xml b/pom.xml index 88152e9c2a..b32b5b2a36 100644 --- a/pom.xml +++ b/pom.xml @@ -104,15 +104,12 @@ detector-data detector-model distribution - ecal-event-display ecal-readout-sim ecal-recon evio job logging - monitoring-util - monitoring-drivers - monitoring-app + online-monitoring online-recon plugin recon @@ -189,17 +186,12 @@ org.hps - hps-monitoring-drivers - ${project.version} - - - org.hps - hps-monitoring-app + hps-online-recon ${project.version} org.hps - hps-online-recon + hps-online-monitoring ${project.version} @@ -212,21 +204,11 @@ hps-distribution ${project.version} - - org.hps - hps-ecal-event-display - ${project.version} - org.hps hps-record-util ${project.version} - - org.hps - hps-monitoring-util - ${project.version} - org.hps hps-job