java/trunk/conditions/src/main/java/org/hps/conditions

--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java	2014-09-10 02:15:13 UTC (rev 981)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java	2014-09-10 02:33:17 UTC (rev 982)
@@ -7,7 +7,6 @@

 import org.hps.conditions.ecal.EcalDetectorSetup;
 import org.hps.conditions.svt.SvtConditions;
 import org.hps.conditions.svt.SvtDetectorSetup;

-import org.lcsim.conditions.ConditionsReader;

 import org.lcsim.geometry.Detector;
 import org.lcsim.util.Driver;
 

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/AbstractConfiguration.java	2014-09-10 02:15:13 UTC (rev 981)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/AbstractConfiguration.java	2014-09-10 02:33:17 UTC (rev 982)
@@ -1,10 +1,8 @@

 package org.hps.conditions.config;
 
 import org.hps.conditions.DatabaseConditionsManager;

-import org.lcsim.conditions.ConditionsReader;

 import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
 

-

 public abstract class AbstractConfiguration {
 
     protected DatabaseConditionsManager manager;

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/DevReadOnlyConfiguration.java	2014-09-10 02:15:13 UTC (rev 981)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/DevReadOnlyConfiguration.java	2014-09-10 02:33:17 UTC (rev 982)
@@ -11,7 +11,6 @@

      * Constructor.
      */
     public DevReadOnlyConfiguration() {       

-        super("/org/hps/conditions/config/conditions_dev.xml", 
-                "/org/hps/conditions/config/conditions_dev.properties");

+        super("/org/hps/conditions/config/conditions_dev.xml", "/org/hps/conditions/config/conditions_dev.properties");

     }       
 }

\ No newline at end of file

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/ResourceConfiguration.java	2014-09-10 02:15:13 UTC (rev 981)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/ResourceConfiguration.java	2014-09-10 02:33:17 UTC (rev 982)
@@ -1,7 +1,6 @@

 package org.hps.conditions.config;
 
 import org.hps.conditions.DatabaseConditionsManager;

-import org.lcsim.conditions.ConditionsReader;

 
 /**
  * Convenience class for setting up access to the conditions.

@@ -12,27 +11,16 @@

     protected String prop; 
 
     /**

-     * Constructor with XML config, connection properties and ConditionsReader.

+     * Constructor with XML config and connection properties.

      */
     public ResourceConfiguration(
             String config, 

-            String prop,
-            ConditionsReader reader) {

+            String prop) {

         this.config = config;
         this.prop = prop;
     }

-    

+              

     /**

-     * Constructor with XML config and connection properties.
-     */
-    public ResourceConfiguration(
-            String config, 
-            String connection) {
-        this.config = config;
-        this.prop = connection;
-    }    
-          
-    /**

      * Setup the configuration on the conditions manager.
      */
     public AbstractConfiguration setup() {

java/trunk/conditions/src/main/java/org/hps/conditions/config

--- java/trunk/conditions/src/main/java/org/hps/conditions/config/TestRunReadOnlyConfiguration.java	2014-09-10 02:15:13 UTC (rev 981)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/TestRunReadOnlyConfiguration.java	2014-09-10 02:33:17 UTC (rev 982)
@@ -2,13 +2,9 @@

 
 /**
  * <p>

- * This is a static utility class for setting up the conditions system for test cases in
- * this package and sub-packages.

+ * This is a utility class for setting up the conditions system with Test Run 2012 data
+ * for test cases in this package and sub-packages.

  * <p>

- * It uses the SLAC Test Run 2012 conditions database, with a relative reference to a file
- * containing connection parameters in the hps-conditions module. The XML configuration is
- * read from a classpath resource in the same module.
- * <p>

  * The detector is set to <i>HPS-conditions-test</i>, which is a test detector without
  * real data associated to it. There are a few files used in the test cases that use this
  * detector.

@@ -26,6 +22,10 @@

     private static final String config = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
     private static final String prop = "/org/hps/conditions/config/conditions_database_testrun_2012_connection.properties";
    

+    /**
+     * Class constructor.
+     * @param setup True to setup the conditions manager and the detector.  
+     */

     public TestRunReadOnlyConfiguration(boolean setup) {
         super(config, prop);
         if (setup) {