--- java/trunk/monitoring-app/pom.xml	2014-03-26 03:52:24 UTC (rev 369)
+++ java/trunk/monitoring-app/pom.xml	2014-03-26 04:02:14 UTC (rev 370)
@@ -85,9 +85,13 @@

     <dependencies>
         <dependency>
             <groupId>org.hps</groupId>

-            <artifactId>hps-monitoring-drivers</artifactId>

+            <artifactId>hps-evio</artifactId>

         </dependency>
         <dependency>

+            <groupId>org.hps</groupId>
+            <artifactId>hps-monitoring-drivers</artifactId>
+        </dependency>        
+        <dependency>

             <groupId>jfreechart-aida-experimental</groupId>
             <artifactId>jfreechart-aida-experimental</artifactId>
             <version>1.1</version>

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/DefaultEtEventProcessor.java	2014-03-26 03:52:24 UTC (rev 369)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/DefaultEtEventProcessor.java	2014-03-26 04:02:14 UTC (rev 370)
@@ -9,6 +9,8 @@

 import java.util.logging.Level;
 import java.util.logging.Logger;
 

+import org.hps.evio.EventConstants;
+import org.hps.evio.LCSimEventBuilder;

 import org.jlab.coda.et.EtEvent;
 import org.jlab.coda.et.enums.Modify;
 import org.jlab.coda.et.exception.EtTimeoutException;

@@ -16,8 +18,6 @@

 import org.jlab.coda.jevio.EvioException;
 import org.jlab.coda.jevio.EvioReader;
 import org.lcsim.event.EventHeader;

-import org.lcsim.hps.evio.EventConstants;
-import org.lcsim.hps.evio.LCSimEventBuilder;

 import org.lcsim.job.JobControlManager;
 
 /**

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/MonitoringApplication.java	2014-03-26 03:52:24 UTC (rev 369)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/MonitoringApplication.java	2014-03-26 04:02:14 UTC (rev 370)
@@ -28,7 +28,6 @@

 import static org.hps.monitoring.MonitoringCommands.steeringFileCmd;
 import static org.hps.monitoring.MonitoringCommands.steeringResourceCmd;
 import static org.hps.monitoring.MonitoringCommands.updateTimeCmd;

-import hep.aida.jfree.AnalysisFactory;

 
 import java.awt.AWTException;
 import java.awt.BorderLayout;

@@ -82,8 +81,8 @@

 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;

-import org.lcsim.hps.evio.LCSimEventBuilder;
-import org.lcsim.hps.monitoring.deprecated.Resettable;

+import org.hps.evio.LCSimEventBuilder;
+import org.hps.util.Resettable;

 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;