Author: [log in to unmask]
Date: Thu Nov 13 21:54:52 2014
New Revision: 1517
Log:
Change method call name on manager.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtConditionsConverterTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDetectorSetupTest.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java Thu Nov 13 21:54:52 2014
@@ -96,7 +96,7 @@
}
if (commandLine.hasOption("x")) {
File xmlConfigFile = new File(commandLine.getOptionValue("x"));
- conditionsManager.configure(xmlConfigFile);
+ conditionsManager.setXmlConfig(xmlConfigFile);
if (verbose)
System.out.println("using XML config file " + xmlConfigFile.getPath());
}
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalDetectorSetupTest.java Thu Nov 13 21:54:52 2014
@@ -40,7 +40,7 @@
public void testLoad() throws Exception {
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
- conditionsManager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
+ conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
conditionsManager.setDetector("HPS-TestRun-v5", 1351);
// Get the detector.
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtConditionsConverterTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtConditionsConverterTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtConditionsConverterTest.java Thu Nov 13 21:54:52 2014
@@ -8,7 +8,7 @@
public void test() throws Exception {
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
- conditionsManager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
+ conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
conditionsManager.setDetector("HPS-TestRun-v5", 1351);
TestRunSvtConditions svtConditions = conditionsManager.getCachedConditions(TestRunSvtConditions.class, "svt_conditions").getCachedData();
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java Thu Nov 13 21:54:52 2014
@@ -34,7 +34,7 @@
public void test() throws Exception {
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
- conditionsManager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
+ conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
conditionsManager.setDetector("HPS-TestRun-v5", 1351);
metaData = conditionsManager.findTableMetaData(TestRunSvtDaqMappingCollection.class).get(0);
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDetectorSetupTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDetectorSetupTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/TestRunSvtDetectorSetupTest.java Thu Nov 13 21:54:52 2014
@@ -39,7 +39,7 @@
public void test() throws Exception {
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
- conditionsManager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
+ conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
conditionsManager.setDetector("HPS-TestRun-v5", 1351);
// Get the detector.
|