--- java/trunk/monitoring-app/pom.xml	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/pom.xml	2014-08-19 22:55:05 UTC (rev 902)
@@ -108,14 +108,9 @@

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

-            <artifactId>hps-evio</artifactId>

+            <artifactId>hps-record-util</artifactId>

         </dependency>
         <dependency>

-            <groupId>org.jlab.coda</groupId>
-            <artifactId>et</artifactId>
-            <version>14.1</version>
-        </dependency>
-        <dependency>

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

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/enums/DataSourceType.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/enums/DataSourceType.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -1,25 +0,0 @@

-package org.hps.monitoring.enums;
-
-/**
- * The type of data source that will supply events to the app.
- */
-public enum DataSourceType {
-
-    ET_SERVER("ET Server"), 
-    EVIO_FILE("EVIO File"), 
-    LCIO_FILE("LCIO File");
-
-    String description;
-
-    private DataSourceType(String description) {
-        this.description = description;
-    }
-
-    public String description() {
-        return description;
-    }
-    
-    public boolean isFile() {
-        return this.ordinal() > ET_SERVER.ordinal();
-    }
-}

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/DataSourcePanel.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/DataSourcePanel.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -13,10 +13,9 @@

 import javax.swing.JComboBox;
 import javax.swing.JFileChooser;
 import javax.swing.JTextField;

-import javax.swing.SwingUtilities;

-import org.hps.monitoring.enums.DataSourceType;

 import org.hps.monitoring.gui.model.ConfigurationModel;

+import org.hps.record.DataSourceType;

 
 /**
  * A sub-panel of the settings window for selecting a data source, 

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -1,6 +1,23 @@

 package org.hps.monitoring.gui;
 

-import static org.hps.monitoring.gui.Commands.*;

+import static org.hps.monitoring.gui.Commands.AIDA_AUTO_SAVE;
+import static org.hps.monitoring.gui.Commands.CHOOSE_LOG_FILE;
+import static org.hps.monitoring.gui.Commands.CLEAR_LOG_TABLE;
+import static org.hps.monitoring.gui.Commands.CONNECT;
+import static org.hps.monitoring.gui.Commands.DISCONNECT;
+import static org.hps.monitoring.gui.Commands.EXIT;
+import static org.hps.monitoring.gui.Commands.LOAD_DEFAULT_CONFIG_FILE;
+import static org.hps.monitoring.gui.Commands.LOG_LEVEL_CHANGED;
+import static org.hps.monitoring.gui.Commands.LOG_TO_TERMINAL;
+import static org.hps.monitoring.gui.Commands.NEXT;
+import static org.hps.monitoring.gui.Commands.PAUSE;
+import static org.hps.monitoring.gui.Commands.RESUME;
+import static org.hps.monitoring.gui.Commands.SAVE_CONFIG_FILE;
+import static org.hps.monitoring.gui.Commands.SAVE_LOG_TABLE;
+import static org.hps.monitoring.gui.Commands.SAVE_PLOTS;
+import static org.hps.monitoring.gui.Commands.SCREENSHOT;
+import static org.hps.monitoring.gui.Commands.SELECT_CONFIG_FILE;
+import static org.hps.monitoring.gui.Commands.SHOW_SETTINGS;

 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;

@@ -48,23 +65,23 @@

 
 import org.hps.evio.LCSimEventBuilder;
 import org.hps.monitoring.enums.ConnectionStatus;

-import org.hps.monitoring.enums.DataSourceType;

 import org.hps.monitoring.enums.SteeringType;
 import org.hps.monitoring.gui.model.Configuration;
 import org.hps.monitoring.gui.model.ConfigurationModel;
 import org.hps.monitoring.gui.model.RunModel;
 import org.hps.monitoring.plotting.MonitoringAnalysisFactory;
 import org.hps.monitoring.plotting.MonitoringPlotFactory;

-import org.hps.monitoring.record.EventProcessingChain;
-import org.hps.monitoring.record.EventProcessingConfiguration;
-import org.hps.monitoring.record.EventProcessingThread;
-import org.hps.monitoring.record.etevent.EtConnection;

 import org.hps.monitoring.subsys.StatusCode;
 import org.hps.monitoring.subsys.SystemStatus;
 import org.hps.monitoring.subsys.SystemStatusListener;
 import org.hps.monitoring.subsys.SystemStatusRegistry;
 import org.hps.monitoring.subsys.et.EtSystemMonitor;
 import org.hps.monitoring.subsys.et.EtSystemStripCharts;

+import org.hps.record.DataSourceType;
+import org.hps.record.EventProcessingChain;
+import org.hps.record.EventProcessingConfiguration;
+import org.hps.record.EventProcessingThread;
+import org.hps.record.etevent.EtConnection;

 import org.jlab.coda.et.EtAttachment;
 import org.jlab.coda.et.EtConstants;
 import org.jlab.coda.et.EtStation;

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/ConfigurationModel.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/ConfigurationModel.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -3,8 +3,8 @@

 import java.io.File;
 import java.util.logging.Level;
 

-import org.hps.monitoring.enums.DataSourceType;

 import org.hps.monitoring.enums.SteeringType;

+import org.hps.record.DataSourceType;

 import org.jlab.coda.et.enums.Mode;
 
 /**

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/et/EtSystemMonitor.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -3,11 +3,11 @@

 import java.util.Timer;
 import java.util.TimerTask;
 

-import org.hps.monitoring.record.etevent.EtEventProcessor;

 import org.hps.monitoring.subsys.StatusCode;
 import org.hps.monitoring.subsys.Subsystem;
 import org.hps.monitoring.subsys.SystemStatus;
 import org.hps.monitoring.subsys.SystemStatusImpl;

+import org.hps.record.etevent.EtEventProcessor;

 import org.jlab.coda.et.EtEvent;
 
 /**

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/et/EtSystemStripCharts.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/et/EtSystemStripCharts.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -1,8 +1,8 @@

 package org.hps.monitoring.subsys.et;
 
 import org.hps.monitoring.plotting.MonitoringPlotFactory;

-import org.hps.monitoring.record.etevent.EtEventProcessor;

 import org.hps.monitoring.subsys.SystemStatisticsImpl;

+import org.hps.record.etevent.EtEventProcessor;

 import org.jlab.coda.et.EtEvent;
 import org.lcsim.util.aida.AIDA;
 

--- java/trunk/monitoring-app/src/test/java/org/hps/monitoring/record/EventProcessingChainTest.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/test/java/org/hps/monitoring/record/EventProcessingChainTest.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -1,79 +0,0 @@

-package org.hps.monitoring.record;
-
-import org.hps.evio.LCSimTestRunEventBuilder;
-import org.hps.monitoring.enums.DataSourceType;
-import org.hps.monitoring.record.evio.EvioEventProcessor;
-import org.jlab.coda.jevio.EvioEvent;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.util.Driver;
-
-public class EventProcessingChainTest {
-    
-    //static String evioFilePath = "/work/data/hps/hps_001351.evio.0";
-    static String evioFilePath = "/nfs/slac/g/hps3/data/testrun/runs/evio/hps_001351.evio.0";
-    //static String lcioFilePath = "/work/data/hps/hps_001351.evio.0_recon.slcio";
-    static String lcioFilePath = "/nfs/slac/g/hps3/data/testrun/runs/recon_new/hps_001351.evio.0_recon.slcio";
-    static String detectorName = "HPS-TestRun-v8-5";
-    
-    // ET ring with streaming EVIO file must be running for this to work.
-    /*
-    public void testEtSource() {
-        EventProcessingChain processing = new EventProcessingChain();
-        processing.setRecordSource(new EtEventSource());
-        processing.setEventBuilder(new LCSimTestRunEventBuilder());
-        processing.setDetectorName(detectorName);
-        processing.add(new DummyEvioProcessor());
-        processing.add(new DummyDriver());
-        processing.setStopOnEndRun();
-        processing.configure();
-        processing.loop();
-    }
-    */
-    
-    public void testEvioFile() {
-        
-        EventProcessingConfiguration config = new EventProcessingConfiguration();
-        config.setDataSourceType(DataSourceType.EVIO_FILE);
-        config.setFilePath(evioFilePath);
-        config.setLCSimEventBuild(new LCSimTestRunEventBuilder());
-        config.setDetectorName(detectorName);
-        config.add(new DummyEvioProcessor());
-        config.add(new DummyDriver());     
-        EventProcessingChain processing = new EventProcessingChain(config);
-        processing.loop();
-    }
-    
-    /*
-    public void testLcioFile() {
-        EventProcessingChain processing = new EventProcessingChain();
-        try {
-            processing.setRecordSource(new LCIOEventSource(new File(lcioFilePath)));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        processing.setEventBuilder(new LCSimTestRunEventBuilder());
-        processing.setDetectorName(detectorName);
-        processing.add(new DummyDriver());
-        processing.configure();
-        processing.loop();
-    }
-    */
-    
-    static class DummyDriver extends Driver {
-        public void process(EventHeader event) {
-            System.out.println(this.getClass().getSimpleName() + " got LCIO event #" + event.getEventNumber());
-            for (LCMetaData metaData : event.getMetaData()) {
-                String collectionName = metaData.getName();
-                Class type = metaData.getType();
-                System.out.println (collectionName + " " + event.get(type, collectionName).size());
-            }
-        }
-    }
-    
-    static class DummyEvioProcessor extends EvioEventProcessor {
-        public void processEvent(EvioEvent event) {
-            System.out.println(this.getClass().getSimpleName() + " got EVIO event #" + event.getEventNumber());
-        }
-    }
-}

--- java/trunk/monitoring-app/src/test/java/org/hps/monitoring/record/EventProcessingErrorTest.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/test/java/org/hps/monitoring/record/EventProcessingErrorTest.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -1,105 +0,0 @@

-package org.hps.monitoring.record;
-
-import junit.framework.TestCase;
-
-import org.freehep.record.loop.RecordLoop.Command;
-import org.hps.evio.LCSimTestRunEventBuilder;
-import org.hps.monitoring.enums.DataSourceType;
-import org.hps.monitoring.record.evio.EvioEventProcessor;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-
-
-public class EventProcessingErrorTest extends TestCase {
-       
-    static String evioFilePath = "/nfs/slac/g/hps3/data/testcase/hps_000975.evio.0";
-    
-    public void testEventProcessingError() {
-                
-        EventProcessingConfiguration config = new EventProcessingConfiguration();
-        config.setFilePath(evioFilePath);
-        config.setDataSourceType(DataSourceType.EVIO_FILE);
-        config.setLCSimEventBuild(new LCSimTestRunEventBuilder());
-        config.setDetectorName("HPS-TestRun-v8-5");
-        config.add(new DummyErrorDriver());
-        config.add(new DummyEvioDriver());
-        
-        EventProcessingChain processing = new EventProcessingChainOverride(config);
-        processing.loop();
-    }
-    
-    public void testEventProcessingNoError() {
-        
-        EventProcessingConfiguration config = new EventProcessingConfiguration();
-        config.setFilePath(evioFilePath);
-        config.setDataSourceType(DataSourceType.EVIO_FILE);
-        config.setLCSimEventBuild(new LCSimTestRunEventBuilder());
-        config.setDetectorName("HPS-TestRun-v8-5");
-        config.add(new DummyDriver());
-        config.add(new DummyEvioDriver());
-        
-        EventProcessingChain processing = new EventProcessingChainOverride(config);
-        processing.loop();
-    }
-
-    static class DummyDriver extends Driver {
-        public void process(EventHeader event) {
-            System.out.println("DummyDriver.process");
-        }
-        
-        public void endOfData() {
-            System.out.println("DummyErrorDriver.endOfData");
-        }
-    }
-    
-    static class DummyErrorDriver extends Driver {
-        
-        public void process(EventHeader event) {
-            throw new RuntimeException("Dummy error.");
-        }
-        
-        public void endOfData() {
-            System.out.println("DummyErrorDriver.endOfData");
-        }
-    }
-    
-    static class DummyEvioDriver extends EvioEventProcessor {
-        public void endJob() {
-            System.out.println("DummyEvioDriver.endJob");
-        }        
-    }
-    
-    static class EventProcessingChainOverride extends EventProcessingChain {
-
-        EventProcessingChainOverride(EventProcessingConfiguration config) {
-            super(config);
-        }
-        
-        /**
-         * Loop over events until processing ends for some reason.
-         */
-        public void loop() {
-            while (!done) {
-                if (!paused) {
-                    try {
-                        compositeLoop.execute(Command.GO, true);
-                    } catch (Exception exception) {
-                        System.out.println("error occurred - " + exception.getMessage());
-                        setLastError(exception);
-                    } 
-                    if (lastError != null) {                        
-                        if (!done) {
-                            System.out.println(this.getClass().getSimpleName() + " - executing STOP ...");
-                            System.out.println("CompositeRecordLoop.getState - " + compositeLoop.getState().toString());
-                            compositeLoop.execute(Command.STOP);
-                            System.out.println(this.getClass().getSimpleName() + " - done executing STOP");
-                            done = true;
-                        }
-                    } 
-                }
-            }
-        }
-        
-        
-    }
-}

--- java/trunk/monitoring-app/src/test/java/org/hps/monitoring/record/EvioEventProcessingTest.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/monitoring-app/src/test/java/org/hps/monitoring/record/EvioEventProcessingTest.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -1,75 +0,0 @@

-package org.hps.monitoring.record;
-
-import org.hps.evio.LCSimTestRunEventBuilder;
-import org.hps.monitoring.enums.DataSourceType;
-import org.hps.monitoring.record.evio.EvioEventProcessor;
-import org.jlab.coda.jevio.EvioEvent;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.Detector;
-import org.lcsim.util.Driver;
-
-public class EvioEventProcessingTest {
-    
-    static String evioFilePath = "/nfs/slac/g/hps3/data/testrun/runs/evio/hps_001351.evio.0";   
-    static String detectorName = "HPS-TestRun-v8-5";
-         
-    public void testEvioFile() {        
-        EventProcessingConfiguration config = new EventProcessingConfiguration();
-        config.setDataSourceType(DataSourceType.EVIO_FILE);
-        config.setFilePath(evioFilePath);
-        config.setLCSimEventBuild(new LCSimTestRunEventBuilder());
-        config.setDetectorName(detectorName);
-        config.add(new DummyEvioProcessor());
-        config.add(new DummyDriver());
-        EventProcessingChain processing = new EventProcessingChain(config);
-        processing.loop();
-    }
-        
-    static class DummyDriver extends Driver {
-        
-        public void detectorChanged(Detector detector) {
-            System.out.println(this.getClass().getSimpleName() + ".detectorChanged - " + detector.getDetectorName());
-        }
-        
-        public void startOfData() {
-            System.out.println(this.getClass().getSimpleName() + ".startOfData");
-        }
-        
-        public void process(EventHeader event) {
-            System.out.println(this.getClass().getSimpleName() + " got LCIO event #" + event.getEventNumber());
-            for (LCMetaData metaData : event.getMetaData()) {
-                String collectionName = metaData.getName();
-                Class type = metaData.getType();
-                System.out.println (collectionName + " " + event.get(type, collectionName).size());
-            }
-        }
-        
-        public void endOfData() {
-            System.out.println(this.getClass().getSimpleName() + ".endOfData");
-        }
-    }
-    
-    static class DummyEvioProcessor extends EvioEventProcessor {
-        
-        public void startRun(EvioEvent event) {
-            System.out.println(this.getClass().getSimpleName() + ".startRun");
-        }
-        
-        public void endRun(EvioEvent event) {
-            System.out.println(this.getClass().getSimpleName() + ".endRun");
-        }
-        
-        public void startJob() {
-            System.out.println(this.getClass().getSimpleName() + ".startJob");
-        }
-        
-        public void endJob() {
-            System.out.println(this.getClass().getSimpleName() + ".endJob");
-        }
-        
-        public void processEvent(EvioEvent event) {
-            System.out.println(this.getClass().getSimpleName() + " got EVIO event #" + event.getEventNumber());
-        }
-    }
-}

--- java/trunk/parent/pom.xml	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/parent/pom.xml	2014-08-19 22:55:05 UTC (rev 902)
@@ -149,6 +149,11 @@

                 <artifactId>hps-ecal-event-display</artifactId>
                 <version>3.0.3-SNAPSHOT</version>
             </dependency>

+            <dependency>
+                <groupId>org.hps</groupId>
+                <artifactId>hps-record-util</artifactId>
+                <version>3.0.3-SNAPSHOT</version>
+            </dependency>

         </dependencies>
     </dependencyManagement>
     <reporting>

--- java/trunk/pom.xml	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/pom.xml	2014-08-19 22:55:05 UTC (rev 902)
@@ -141,6 +141,7 @@

                 <module>tracking</module>
                 <module>ecal-event-display</module>
                 <module>monitoring-drivers</module>

+                <module>record-util</module>

                 <module>monitoring-app</module>
                 <module>analysis</module>
                 <module>users</module>

--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtConnection.java	2014-08-19 22:54:05 UTC (rev 901)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtConnection.java	2014-08-19 22:55:05 UTC (rev 902)
@@ -36,7 +36,7 @@

      * @param att The ET attachment.
      * @param stat The ET station.
      */

-    private EtConnection(EtSystem sys, EtAttachment att, EtStation stat, 

+    public EtConnection(EtSystem sys, EtAttachment att, EtStation stat, 

             Mode waitMode, int waitTime, int chunkSize) {
         this.sys = sys;
         this.att = att;