diff --git a/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventUtilTest.java b/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventUtilTest.java
index 95140a9ad2a3..953295849d0e 100644
--- a/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventUtilTest.java
+++ b/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventUtilTest.java
@@ -53,8 +53,8 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventdSpringTest.java b/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventdSpringTest.java
index daa7d6896bce..697215f47b2b 100644
--- a/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventdSpringTest.java
+++ b/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/EventdSpringTest.java
@@ -58,8 +58,8 @@
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-eventDaemon.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-eventDaemon.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/processor/HibernateEventWriterTest.java b/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/processor/HibernateEventWriterTest.java
index 12c0a82e6367..e12e7ff78a95 100644
--- a/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/processor/HibernateEventWriterTest.java
+++ b/features/events/daemon/src/test/java/org/opennms/netmgt/eventd/processor/HibernateEventWriterTest.java
@@ -59,11 +59,11 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-eventDaemon.xml"
})
diff --git a/features/events/traps/src/test/java/org/opennms/netmgt/trapd/HibernateTrapdIpMgrTest.java b/features/events/traps/src/test/java/org/opennms/netmgt/trapd/HibernateTrapdIpMgrTest.java
index 1d2414683ab9..bcb425f7c2eb 100644
--- a/features/events/traps/src/test/java/org/opennms/netmgt/trapd/HibernateTrapdIpMgrTest.java
+++ b/features/events/traps/src/test/java/org/opennms/netmgt/trapd/HibernateTrapdIpMgrTest.java
@@ -52,8 +52,8 @@
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/org/opennms/netmgt/trapd/trapdIpMgr-test.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapHandlerTestCase.java b/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapHandlerTestCase.java
index 6c2715cd973e..8a5388a4cb20 100644
--- a/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapHandlerTestCase.java
+++ b/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapHandlerTestCase.java
@@ -72,6 +72,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
diff --git a/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapdTest.java b/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapdTest.java
index 03006eac45c3..a697e1ca2df9 100644
--- a/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapdTest.java
+++ b/features/events/traps/src/test/java/org/opennms/netmgt/trapd/TrapdTest.java
@@ -62,11 +62,11 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-trapDaemon.xml",
// Overrides the port that Trapd binds to and sets newSuspectOnTrap to 'true'
- "classpath:/org/opennms/netmgt/trapd/applicationContext-trapDaemonTest-snmpTrapPort.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/org/opennms/netmgt/trapd/applicationContext-trapDaemonTest-snmpTrapPort.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/features/juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java b/features/juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java
index c3a70f239ab6..39b877682c52 100644
--- a/features/juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java
+++ b/features/juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java
@@ -85,6 +85,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/junit-component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
diff --git a/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEndIntegrationTest.java b/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEndIntegrationTest.java
index 3b23a9dbd39c..fb1fdda9a20d 100644
--- a/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEndIntegrationTest.java
+++ b/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEndIntegrationTest.java
@@ -79,6 +79,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
@@ -86,7 +87,6 @@
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-pollerBackEnd.xml",
"classpath:/META-INF/opennms/applicationContext-exportedPollerBackEnd-http.xml",
- //"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/netmgt/poller/remote/applicationContext-configOverride.xml"
})
@JUnitConfigurationEnvironment(systemProperties={
diff --git a/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerFrontEndIntegrationTest.java b/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerFrontEndIntegrationTest.java
index 6bb80da18fac..b1139e605fa5 100644
--- a/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerFrontEndIntegrationTest.java
+++ b/features/poller/remote/src/test/java/org/opennms/netmgt/poller/remote/PollerFrontEndIntegrationTest.java
@@ -53,7 +53,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
@@ -61,7 +61,8 @@
"classpath:/META-INF/opennms/applicationContext-pollerFrontEnd.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/org/opennms/netmgt/poller/remote/applicationContext-configOverride.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment(systemProperties={
"opennms.pollerBackend.monitorCheckInterval=500",
diff --git a/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataManagerTest.java b/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataManagerTest.java
index 1e1f5172684e..a73c56028628 100644
--- a/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataManagerTest.java
+++ b/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataManagerTest.java
@@ -81,7 +81,7 @@
@ContextConfiguration(locations = {
"classpath:META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"file:src/main/webapp/WEB-INF/applicationContext-remote-poller.xml",
diff --git a/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataServiceTest.java b/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataServiceTest.java
index 50304d4f2cfe..88023aba171b 100644
--- a/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataServiceTest.java
+++ b/features/remote-poller-gwt/src/test/java/org/opennms/features/poller/remote/gwt/server/LocationDataServiceTest.java
@@ -81,6 +81,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
diff --git a/features/reporting/availability/pom.xml b/features/reporting/availability/pom.xml
index 62b1dfb9ab74..5457399c43a3 100644
--- a/features/reporting/availability/pom.xml
+++ b/features/reporting/availability/pom.xml
@@ -136,6 +136,11 @@
org.opennms.core.test-api.http
test
+
+ org.opennms
+ opennms-dao-mock
+ test
+
org.opennms
opennms-model
diff --git a/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityDatabasePopulatorTest.java b/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityDatabasePopulatorTest.java
index 69fa79505a0a..b24564419739 100644
--- a/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityDatabasePopulatorTest.java
+++ b/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityDatabasePopulatorTest.java
@@ -63,7 +63,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-availabilityDatabasePopulator.xml",
"classpath:META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityReportIntegrationTest.java b/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityReportIntegrationTest.java
index 9ba741756264..32f7961d38e4 100644
--- a/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityReportIntegrationTest.java
+++ b/features/reporting/availability/src/test/java/org/opennms/reporting/availability/AvailabilityReportIntegrationTest.java
@@ -55,7 +55,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-reportingCore.xml",
"classpath*:/META-INF/opennms/component-reporting.xml",
diff --git a/features/rest-measurements-api/pom.xml b/features/rest-measurements-api/pom.xml
index c5d9916ded88..ea06d67624b2 100644
--- a/features/rest-measurements-api/pom.xml
+++ b/features/rest-measurements-api/pom.xml
@@ -69,6 +69,11 @@
opennms-config
test
+
+ org.opennms
+ opennms-dao-mock
+ test
+
org.opennms.core.test-api
org.opennms.core.test-api.xml
@@ -79,6 +84,10 @@
org.opennms.core.test-api.db
test
+
+ org.opennms.core.test-api
+ org.opennms.core.test-api.services
+
org.opennms.core.test-api
org.opennms.core.test-api.rest
diff --git a/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementRestServiceIntegrationTest.java b/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementRestServiceIntegrationTest.java
index 4905fbacd7d5..4705759097dc 100644
--- a/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementRestServiceIntegrationTest.java
+++ b/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementRestServiceIntegrationTest.java
@@ -64,6 +64,7 @@
@WebAppConfiguration
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
diff --git a/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithJrbTest.java b/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithJrbTest.java
index e4c2c0f526d7..c0ea85274339 100644
--- a/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithJrbTest.java
+++ b/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithJrbTest.java
@@ -57,6 +57,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
diff --git a/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithRrdTest.java b/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithRrdTest.java
index eeefab4b6297..f399ef469741 100644
--- a/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithRrdTest.java
+++ b/features/rest-measurements-api/src/test/java/org/opennms/web/rest/MeasurementsRestServiceWithRrdTest.java
@@ -61,8 +61,9 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-measurements-test-rrd.xml"
diff --git a/features/springframework-security/src/test/java/org/opennms/web/springframework/security/AuthenticationIntegrationTest.java b/features/springframework-security/src/test/java/org/opennms/web/springframework/security/AuthenticationIntegrationTest.java
index 8587df302534..4fc3f3b2fc22 100644
--- a/features/springframework-security/src/test/java/org/opennms/web/springframework/security/AuthenticationIntegrationTest.java
+++ b/features/springframework-security/src/test/java/org/opennms/web/springframework/security/AuthenticationIntegrationTest.java
@@ -57,11 +57,11 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml"
})
@JUnitConfigurationEnvironment
diff --git a/features/springframework-security/src/test/java/org/opennms/web/springframework/security/SpringSecurityUserDaoImplTest.java b/features/springframework-security/src/test/java/org/opennms/web/springframework/security/SpringSecurityUserDaoImplTest.java
index 9a145a6fab93..232c6e7f431a 100644
--- a/features/springframework-security/src/test/java/org/opennms/web/springframework/security/SpringSecurityUserDaoImplTest.java
+++ b/features/springframework-security/src/test/java/org/opennms/web/springframework/security/SpringSecurityUserDaoImplTest.java
@@ -68,11 +68,11 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml"
})
@JUnitConfigurationEnvironment
diff --git a/features/system-report/src/test/java/org/opennms/systemreport/system/ReportPluginTestCase.java b/features/system-report/src/test/java/org/opennms/systemreport/system/ReportPluginTestCase.java
index 035985219b3a..1cab00e2912c 100644
--- a/features/system-report/src/test/java/org/opennms/systemreport/system/ReportPluginTestCase.java
+++ b/features/system-report/src/test/java/org/opennms/systemreport/system/ReportPluginTestCase.java
@@ -49,6 +49,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
diff --git a/integration-tests/remote-poller-18/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEnd18IntegrationTest.java b/integration-tests/remote-poller-18/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEnd18IntegrationTest.java
index c0a1b37ee559..db9fe630fe16 100644
--- a/integration-tests/remote-poller-18/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEnd18IntegrationTest.java
+++ b/integration-tests/remote-poller-18/src/test/java/org/opennms/netmgt/poller/remote/PollerBackEnd18IntegrationTest.java
@@ -60,13 +60,13 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
// This overrides poller config and location monitor config with files from
// the org.opennms:opennms-services:test-jar artifact
"classpath:/org/opennms/netmgt/poller/remote/applicationContext-configOverride.xml"
diff --git a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SimplerProvisioningAdapterTest.java b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SimplerProvisioningAdapterTest.java
index d335304fd266..9c97f4015821 100644
--- a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SimplerProvisioningAdapterTest.java
+++ b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SimplerProvisioningAdapterTest.java
@@ -56,8 +56,8 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
@@ -70,7 +70,7 @@ public class SimplerProvisioningAdapterTest implements InitializingBean {
CountDownLatch updateLatch = new CountDownLatch(1);
CountDownLatch configChangeLatch = new CountDownLatch(1);
- // From applicationContext-dao.xml
+ // From applicationContext-mockDao.xml
@Autowired
private TransactionTemplate m_txTemplate;
diff --git a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultLinkMatchResolverTest.java b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultLinkMatchResolverTest.java
index b88f258516e5..2594bb9e86d0 100644
--- a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultLinkMatchResolverTest.java
+++ b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultLinkMatchResolverTest.java
@@ -47,7 +47,8 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
diff --git a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkServiceTest.java b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkServiceTest.java
index 192516b2d737..f41bda06c30f 100644
--- a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkServiceTest.java
+++ b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/DefaultNodeLinkServiceTest.java
@@ -72,14 +72,14 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/provisiond-extensions.xml",
- "classpath:/testConfigContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/testConfigContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/LinkProvisioningAdapterTest.java b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/LinkProvisioningAdapterTest.java
index ad587f34bfdb..5fbcefa9da66 100644
--- a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/LinkProvisioningAdapterTest.java
+++ b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/adapters/link/LinkProvisioningAdapterTest.java
@@ -62,13 +62,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:testConfigContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:testConfigContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/config/linkadapter/LinkAdapterConfigurationTest.java b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/config/linkadapter/LinkAdapterConfigurationTest.java
index 0dfece10cf91..619f67473140 100644
--- a/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/config/linkadapter/LinkAdapterConfigurationTest.java
+++ b/integrations/opennms-link-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/config/linkadapter/LinkAdapterConfigurationTest.java
@@ -70,13 +70,13 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
- "classpath:/testConfigContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/testConfigContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterIntegrationTest.java b/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterIntegrationTest.java
index fd836cb27834..5e1d57abe57e 100644
--- a/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterIntegrationTest.java
+++ b/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterIntegrationTest.java
@@ -59,13 +59,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath*:/META-INF/opennms/provisiond-extensions.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/provisiond-extensions.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterTest.java b/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterTest.java
index 3ee8dd625c57..06caa26b2458 100644
--- a/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterTest.java
+++ b/integrations/opennms-rancid-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/RancidProvisioningAdapterTest.java
@@ -54,13 +54,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath*:/META-INF/opennms/provisiond-extensions.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/provisiond-extensions.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterIntegrationTest.java b/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterIntegrationTest.java
index 2b3300425b23..c83a8ed0c9fd 100644
--- a/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterIntegrationTest.java
+++ b/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterIntegrationTest.java
@@ -66,14 +66,14 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
- "classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/component-dao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterTest.java b/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterTest.java
index 0f52838d7078..3cc4439a371b 100644
--- a/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterTest.java
+++ b/integrations/opennms-snmp-asset-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpAssetProvisioningAdapterTest.java
@@ -55,15 +55,15 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/provisiond-extensions.xml",
- "classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/component-dao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/NMS7387Test.java b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/NMS7387Test.java
index c2c5067204a1..7d659c357222 100644
--- a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/NMS7387Test.java
+++ b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/NMS7387Test.java
@@ -65,13 +65,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/provisiond-extensions.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/provisiond-extensions.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpHardwareInventoryProvisioningAdapterTest.java b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpHardwareInventoryProvisioningAdapterTest.java
index 9eb1dda029c0..fe14067d3db1 100644
--- a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpHardwareInventoryProvisioningAdapterTest.java
+++ b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/src/test/java/org/opennms/netmgt/provision/SnmpHardwareInventoryProvisioningAdapterTest.java
@@ -70,13 +70,13 @@
@ContextConfiguration(locations= {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/provisiond-extensions.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/provisiond-extensions.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/AckdTest.java b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/AckdTest.java
index 90325b302c4a..77e5d082a7a8 100644
--- a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/AckdTest.java
+++ b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/AckdTest.java
@@ -78,6 +78,7 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
@@ -85,8 +86,7 @@
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath:/META-INF/opennms/applicationContext-ackd.xml",
- "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/DefaultAckServiceTest.java b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/DefaultAckServiceTest.java
index 37b29ae5096f..f7b4f8759b90 100644
--- a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/DefaultAckServiceTest.java
+++ b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/DefaultAckServiceTest.java
@@ -72,14 +72,14 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/HypericAckProcessorTest.java b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/HypericAckProcessorTest.java
index 601939be58ca..a270cf213600 100644
--- a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/HypericAckProcessorTest.java
+++ b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/HypericAckProcessorTest.java
@@ -70,14 +70,14 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-ackd.xml",
- "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/JavaMailAckReaderTest.java b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/JavaMailAckReaderTest.java
index a0827228cfc6..1c68c45e6de2 100644
--- a/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/JavaMailAckReaderTest.java
+++ b/opennms-ackd/src/test/java/org/opennms/netmgt/ackd/readers/JavaMailAckReaderTest.java
@@ -91,13 +91,13 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-ackd.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-ackd.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmPersisterTest.java b/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmPersisterTest.java
index 275cfff4bcc7..fd0351109005 100644
--- a/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmPersisterTest.java
+++ b/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmPersisterTest.java
@@ -50,11 +50,11 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
- "classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/mockEventIpcManager.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmdTest.java b/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmdTest.java
index d1a139f9dc48..861ddf92a6b8 100644
--- a/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmdTest.java
+++ b/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/alarmd/AlarmdTest.java
@@ -80,12 +80,12 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-alarmd.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-alarmd.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false,tempDbClass=MockDatabase.class)
diff --git a/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/vacuumd/VacuumdTest.java b/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/vacuumd/VacuumdTest.java
index 43e2c9ffa571..7c5701134012 100644
--- a/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/vacuumd/VacuumdTest.java
+++ b/opennms-alarms/daemon/src/test/java/org/opennms/netmgt/vacuumd/VacuumdTest.java
@@ -93,13 +93,13 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-alarmd.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=true,tempDbClass=MockDatabase.class)
diff --git a/opennms-assemblies/http-remoting/pom.xml b/opennms-assemblies/http-remoting/pom.xml
index 6036245188e6..994d9ca2739e 100644
--- a/opennms-assemblies/http-remoting/pom.xml
+++ b/opennms-assemblies/http-remoting/pom.xml
@@ -229,6 +229,11 @@
org.opennms.core.test-api.http
test
+
+ org.opennms.core.test-api
+ org.opennms.core.test-api.services
+ test
+
org.opennms.dependencies
spring-test-dependencies
diff --git a/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingContextTest.java b/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingContextTest.java
index 51cb4eb7cf48..8042d8497b84 100644
--- a/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingContextTest.java
+++ b/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingContextTest.java
@@ -79,7 +79,7 @@ public void testLoadContext() throws Throwable {
"contextConfigLocation",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml " +
"classpath:/META-INF/opennms/applicationContext-soa.xml " +
- "classpath:/META-INF/opennms/applicationContext-dao.xml " +
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml " +
"classpath*:/META-INF/opennms/component-service.xml " +
"classpath*:/META-INF/opennms/component-dao.xml " +
diff --git a/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingWebAppTest.java b/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingWebAppTest.java
index ddb83283742f..3ac06788bf99 100644
--- a/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingWebAppTest.java
+++ b/opennms-assemblies/http-remoting/src/test/java/org/opennms/web/HttpRemotingWebAppTest.java
@@ -55,6 +55,7 @@
@WebAppConfiguration
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
diff --git a/opennms-correlation/drools-correlation-engine/src/test/java/org/opennms/netmgt/correlation/drools/DroolsCorrelationEngineBuilderTest.java b/opennms-correlation/drools-correlation-engine/src/test/java/org/opennms/netmgt/correlation/drools/DroolsCorrelationEngineBuilderTest.java
index cbf645567e07..faaabf498278 100644
--- a/opennms-correlation/drools-correlation-engine/src/test/java/org/opennms/netmgt/correlation/drools/DroolsCorrelationEngineBuilderTest.java
+++ b/opennms-correlation/drools-correlation-engine/src/test/java/org/opennms/netmgt/correlation/drools/DroolsCorrelationEngineBuilderTest.java
@@ -49,14 +49,14 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:META-INF/opennms/applicationContext-soa.xml",
- "classpath:META-INF/opennms/applicationContext-dao.xml",
+ "classpath:META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:META-INF/opennms/applicationContext-daemon.xml",
"classpath:META-INF/opennms/mockEventIpcManager.xml",
"classpath:META-INF/opennms/applicationContext-correlator.xml",
- "classpath:test-context.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:test-context.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockFilterFavoriteDao.java b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockFilterFavoriteDao.java
new file mode 100644
index 000000000000..78cee8a18f91
--- /dev/null
+++ b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockFilterFavoriteDao.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2013-2014 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.netmgt.dao.mock;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.opennms.netmgt.dao.api.FilterFavoriteDao;
+import org.opennms.netmgt.model.OnmsFilterFavorite;
+import org.opennms.netmgt.model.OnmsFilterFavorite.Page;
+
+public class MockFilterFavoriteDao extends AbstractMockDao implements FilterFavoriteDao {
+
+ private AtomicInteger m_id = new AtomicInteger(0);
+
+ @Override
+ protected void generateId(final OnmsFilterFavorite outage) {
+ outage.setId(m_id.incrementAndGet());
+ }
+
+ @Override
+ protected Integer getId(final OnmsFilterFavorite outage) {
+ return outage.getId();
+ }
+
+ @Override
+ public OnmsFilterFavorite findBy(String userName, String filterName) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public List findBy(String userName, Page page) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public boolean existsFilter(String userName, String filterName, Page page) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+}
diff --git a/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockHwEntityAttributeTypeDao.java b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockHwEntityAttributeTypeDao.java
new file mode 100644
index 000000000000..fd2fb4403fed
--- /dev/null
+++ b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockHwEntityAttributeTypeDao.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2013-2014 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.netmgt.dao.mock;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.opennms.netmgt.dao.api.HwEntityAttributeTypeDao;
+import org.opennms.netmgt.model.HwEntityAttributeType;
+
+public class MockHwEntityAttributeTypeDao extends AbstractMockDao implements HwEntityAttributeTypeDao {
+
+ private AtomicInteger m_id = new AtomicInteger(0);
+
+ @Override
+ protected void generateId(final HwEntityAttributeType outage) {
+ outage.setId(m_id.incrementAndGet());
+ }
+
+ @Override
+ protected Integer getId(final HwEntityAttributeType outage) {
+ return outage.getId();
+ }
+
+ @Override
+ public HwEntityAttributeType get(Integer id) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public HwEntityAttributeType load(Integer id) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public HwEntityAttributeType findTypeByName(String name) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public HwEntityAttributeType findTypeByOid(String oid) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+}
diff --git a/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockHwEntityDao.java b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockHwEntityDao.java
new file mode 100644
index 000000000000..adfda6628002
--- /dev/null
+++ b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockHwEntityDao.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2013-2014 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.netmgt.dao.mock;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.opennms.netmgt.dao.api.HwEntityDao;
+import org.opennms.netmgt.model.OnmsHwEntity;
+
+public class MockHwEntityDao extends AbstractMockDao implements HwEntityDao {
+
+ private AtomicInteger m_id = new AtomicInteger(0);
+
+ @Override
+ protected void generateId(final OnmsHwEntity outage) {
+ outage.setId(m_id.incrementAndGet());
+ }
+
+ @Override
+ protected Integer getId(final OnmsHwEntity outage) {
+ return outage.getId();
+ }
+
+ @Override
+ public OnmsHwEntity findRootByNodeId(Integer nodeId) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public OnmsHwEntity findEntityByIndex(Integer nodeId, Integer entPhysicalIndex) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public OnmsHwEntity findEntityByName(Integer nodeId, String entPhysicalName) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public String getAttributeValue(Integer nodeId, Integer entPhysicalIndex, String attributeName) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public String getAttributeValue(Integer nodeId, String nameSource, String attributeName) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+}
diff --git a/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockLinkStateDao.java b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockLinkStateDao.java
new file mode 100644
index 000000000000..56a5ce567439
--- /dev/null
+++ b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockLinkStateDao.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2013-2014 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.netmgt.dao.mock;
+
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.opennms.netmgt.dao.api.LinkStateDao;
+import org.opennms.netmgt.model.OnmsLinkState;
+
+public class MockLinkStateDao extends AbstractMockDao implements LinkStateDao {
+
+ private AtomicInteger m_id = new AtomicInteger(0);
+
+ @Override
+ protected void generateId(final OnmsLinkState outage) {
+ outage.setId(m_id.incrementAndGet());
+ }
+
+ @Override
+ protected Integer getId(final OnmsLinkState outage) {
+ return outage.getId();
+ }
+
+ @Override
+ public Collection findAll(Integer offset, Integer limit) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public OnmsLinkState findById(Integer id) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public OnmsLinkState findByDataLinkInterfaceId(Integer interfaceId) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public Collection findByNodeId(Integer nodeId) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public Collection findByNodeParentId(Integer nodeParentId) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+}
diff --git a/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockPathOutageDao.java b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockPathOutageDao.java
new file mode 100644
index 000000000000..f895e2d5b16f
--- /dev/null
+++ b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockPathOutageDao.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2013-2014 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.netmgt.dao.mock;
+
+import java.net.InetAddress;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.opennms.netmgt.dao.api.PathOutageDao;
+import org.opennms.netmgt.model.OnmsPathOutage;
+
+public class MockPathOutageDao extends AbstractMockDao implements PathOutageDao {
+
+ private AtomicInteger m_id = new AtomicInteger(0);
+
+ @Override
+ protected void generateId(final OnmsPathOutage outage) {
+ outage.setNodeId(m_id.incrementAndGet());
+ }
+
+ @Override
+ protected Integer getId(final OnmsPathOutage outage) {
+ return outage.getNodeId();
+ }
+
+ @Override
+ public List getNodesForPathOutage(InetAddress ipAddress, String serviceName) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public List getNodesForPathOutage(OnmsPathOutage pathOutage) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public List getAllNodesDependentOnAnyServiceOnInterface(InetAddress ipAddress) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public List getAllNodesDependentOnAnyServiceOnNode(int nodeId) {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+
+ @Override
+ public List getAllCriticalPaths() {
+ throw new UnsupportedOperationException("Not yet implemented!");
+ }
+}
diff --git a/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockReportCatalogDao.java b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockReportCatalogDao.java
new file mode 100644
index 000000000000..a1f9605196a3
--- /dev/null
+++ b/opennms-dao-mock/src/main/java/org/opennms/netmgt/dao/mock/MockReportCatalogDao.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2013-2014 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.netmgt.dao.mock;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.opennms.netmgt.dao.api.ReportCatalogDao;
+import org.opennms.netmgt.model.ReportCatalogEntry;
+
+public class MockReportCatalogDao extends AbstractMockDao implements ReportCatalogDao {
+
+ private AtomicInteger m_id = new AtomicInteger(0);
+
+ @Override
+ protected void generateId(final ReportCatalogEntry outage) {
+ outage.setId(m_id.incrementAndGet());
+ }
+
+ @Override
+ protected Integer getId(final ReportCatalogEntry outage) {
+ return outage.getId();
+ }
+}
diff --git a/opennms-dao-mock/src/main/resources/META-INF/opennms/applicationContext-mockDao.xml b/opennms-dao-mock/src/main/resources/META-INF/opennms/applicationContext-mockDao.xml
index 861de0570be0..5b72d9438ce3 100644
--- a/opennms-dao-mock/src/main/resources/META-INF/opennms/applicationContext-mockDao.xml
+++ b/opennms-dao-mock/src/main/resources/META-INF/opennms/applicationContext-mockDao.xml
@@ -74,7 +74,16 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -84,6 +93,9 @@
+
+
+
@@ -105,6 +117,12 @@
+
+
+
+
+
+
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/config/DataCollectionConfigDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/config/DataCollectionConfigDaoTest.java
index af060862d638..57d9d96dc17f 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/config/DataCollectionConfigDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/config/DataCollectionConfigDaoTest.java
@@ -42,6 +42,8 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ // Can't use minimal-conf here
+ //"classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment(systemProperties = {"org.opennms.snmp.dataCollectionConfig.reloadCheckInterval=60000"})
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/config/NotificationManagerTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/config/NotificationManagerTest.java
index 1b09ef119709..e28b83231ad6 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/config/NotificationManagerTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/config/NotificationManagerTest.java
@@ -72,8 +72,8 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(reuseDatabase=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AcknowledgmentDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AcknowledgmentDaoTest.java
index 236e8f4d57bf..62c514aa1312 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AcknowledgmentDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AcknowledgmentDaoTest.java
@@ -69,8 +69,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AlarmDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AlarmDaoTest.java
index 080266f0b75f..cd8a895e4fef 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AlarmDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AlarmDaoTest.java
@@ -73,8 +73,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AssetRecordDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AssetRecordDaoTest.java
index 6d761db5c00a..15a3129a826e 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AssetRecordDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AssetRecordDaoTest.java
@@ -59,8 +59,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AuthorizationTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AuthorizationTest.java
index 9a99f3405a46..21fab18217b7 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/AuthorizationTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/AuthorizationTest.java
@@ -64,8 +64,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/CriteriaTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/CriteriaTest.java
index 61fcbaf47d6d..39e28de3729e 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/CriteriaTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/CriteriaTest.java
@@ -55,8 +55,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/DistPollerDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/DistPollerDaoTest.java
index 5e1db292f98b..9683d5860423 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/DistPollerDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/DistPollerDaoTest.java
@@ -54,8 +54,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/EventDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/EventDaoTest.java
index a9f4cb6b0625..bfd5ad45c9d0 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/EventDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/EventDaoTest.java
@@ -62,8 +62,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityAttributeTypeDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityAttributeTypeDaoTest.java
index bc92ae346806..5f2cbe56a623 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityAttributeTypeDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityAttributeTypeDaoTest.java
@@ -54,11 +54,11 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityDaoTest.java
index 3199f796de4c..ff9320afebc3 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/HwEntityDaoTest.java
@@ -58,11 +58,11 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/IpInterfaceDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/IpInterfaceDaoTest.java
index 087f945be8b9..664e1de819d1 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/IpInterfaceDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/IpInterfaceDaoTest.java
@@ -70,8 +70,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/LocationMonitorDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/LocationMonitorDaoTest.java
index 27d51da4d28f..6cc7bb1aae26 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/LocationMonitorDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/LocationMonitorDaoTest.java
@@ -47,8 +47,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/MemoDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/MemoDaoTest.java
index 31c458ff7ce7..25e1055bf240 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/MemoDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/MemoDaoTest.java
@@ -60,8 +60,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext = false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/MonitoredServiceDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/MonitoredServiceDaoTest.java
index 5c52d0ba3062..c0197f968934 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/MonitoredServiceDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/MonitoredServiceDaoTest.java
@@ -57,8 +57,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java
index d111a5ec10b7..b6a3e5ffb99a 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/NodeDaoTest.java
@@ -78,11 +78,11 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/NotificationDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/NotificationDaoTest.java
index fb66024eb35d..a6afbb76889a 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/NotificationDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/NotificationDaoTest.java
@@ -60,8 +60,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/OutageDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/OutageDaoTest.java
index dfe1be2aa0d8..992912e654c4 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/OutageDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/OutageDaoTest.java
@@ -82,8 +82,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/PathOutageDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/PathOutageDaoTest.java
index f3574aef5cdd..bea1a5846951 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/PathOutageDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/PathOutageDaoTest.java
@@ -71,11 +71,11 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/component-dao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/ServiceTypeDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/ServiceTypeDaoTest.java
index b27c1308d350..5409f578cee6 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/ServiceTypeDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/ServiceTypeDaoTest.java
@@ -48,7 +48,8 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/SnmpInterfaceDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/SnmpInterfaceDaoTest.java
index 393b56c628ae..177aa47af06f 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/SnmpInterfaceDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/SnmpInterfaceDaoTest.java
@@ -54,8 +54,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/StatisticsReportDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/StatisticsReportDaoTest.java
index 2a31f91efc5b..82466e11c4a0 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/StatisticsReportDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/StatisticsReportDaoTest.java
@@ -60,8 +60,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/UpsertTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/UpsertTest.java
index 7334680f5cd9..62584769a9b6 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/UpsertTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/UpsertTest.java
@@ -63,8 +63,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath:upsertTest-context.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/UserNotificationDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/UserNotificationDaoTest.java
index d228b1a66c14..371ef6757652 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/UserNotificationDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/UserNotificationDaoTest.java
@@ -64,8 +64,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/castor/DefaultJavamailConfigurationDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/castor/DefaultJavamailConfigurationDaoTest.java
index 91df0e959dfe..e1474dd390bd 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/castor/DefaultJavamailConfigurationDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/castor/DefaultJavamailConfigurationDaoTest.java
@@ -58,8 +58,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/AnnotationTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/AnnotationTest.java
index fa098058c647..7b07dd09bdda 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/AnnotationTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/AnnotationTest.java
@@ -70,8 +70,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/DataLinkInterfaceDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/DataLinkInterfaceDaoHibernateTest.java
index a61d516398c6..632ff2833ad4 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/DataLinkInterfaceDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/DataLinkInterfaceDaoHibernateTest.java
@@ -68,8 +68,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/HibernateCriteriaConverterTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/HibernateCriteriaConverterTest.java
index 3e3053aa2d16..c9df2ba6ec58 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/HibernateCriteriaConverterTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/HibernateCriteriaConverterTest.java
@@ -60,8 +60,8 @@
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernateTest.java
index 4798f9ad445d..a23942c7190f 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/IpInterfaceDaoHibernateTest.java
@@ -61,8 +61,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LinkStateDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LinkStateDaoHibernateTest.java
index c04feb30fce8..5f88e06d546d 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LinkStateDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LinkStateDaoHibernateTest.java
@@ -59,8 +59,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LocationMonitorDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LocationMonitorDaoHibernateTest.java
index 6f9806469e64..641c334bd6f1 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LocationMonitorDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/LocationMonitorDaoHibernateTest.java
@@ -73,8 +73,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsAtInterfaceDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsAtInterfaceDaoHibernateTest.java
index ba149910b496..8244e41cc512 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsAtInterfaceDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsAtInterfaceDaoHibernateTest.java
@@ -65,8 +65,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapDaoHibernateTest.java
index 32c5960dd21b..a9ad10b1e349 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapDaoHibernateTest.java
@@ -59,8 +59,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapElementDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapElementDaoHibernateTest.java
index 055304f3e691..b22584df8f05 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapElementDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsMapElementDaoHibernateTest.java
@@ -61,8 +61,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsStpNodeDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsStpNodeDaoHibernateTest.java
index 38f7b7453aaf..5288f0b83620 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsStpNodeDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/OnmsStpNodeDaoHibernateTest.java
@@ -64,8 +64,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/ReportCatalogDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/ReportCatalogDaoHibernateTest.java
index 4ad4f7e15304..a131844ea7ef 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/ReportCatalogDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/ReportCatalogDaoHibernateTest.java
@@ -54,8 +54,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/TopologyDaoHibernateTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/TopologyDaoHibernateTest.java
index 826a6899fd1a..f1196e7932e5 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/TopologyDaoHibernateTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/hibernate/TopologyDaoHibernateTest.java
@@ -50,8 +50,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/support/JdbcFilterDaoTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/support/JdbcFilterDaoTest.java
index 55eb7974283d..7632c7b2390e 100644
--- a/opennms-dao/src/test/java/org/opennms/netmgt/dao/support/JdbcFilterDaoTest.java
+++ b/opennms-dao/src/test/java/org/opennms/netmgt/dao/support/JdbcFilterDaoTest.java
@@ -82,8 +82,8 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JDBCDetectorTest.java b/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JDBCDetectorTest.java
index 9b924d622147..9ef802c385c3 100644
--- a/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JDBCDetectorTest.java
+++ b/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JDBCDetectorTest.java
@@ -57,9 +57,9 @@
"classpath:/META-INF/opennms/detectors.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
- "classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/component-dao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcQueryDetectorTest.java b/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcQueryDetectorTest.java
index ac5cf9bf0773..488ef7274ccb 100644
--- a/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcQueryDetectorTest.java
+++ b/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcQueryDetectorTest.java
@@ -58,6 +58,7 @@
"classpath:/META-INF/opennms/detectors.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml"
})
diff --git a/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcStoredProcedureDetectorTest.java b/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcStoredProcedureDetectorTest.java
index d3362d1b388b..698e1aaaf18f 100644
--- a/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcStoredProcedureDetectorTest.java
+++ b/opennms-provision/opennms-detector-jdbc/src/test/java/org/opennms/netmgt/provision/detector/JdbcStoredProcedureDetectorTest.java
@@ -59,6 +59,7 @@
"classpath:/META-INF/opennms/detectors.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/applicationContext-minimal-conf.xml"
diff --git a/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/PolicyTest.java b/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/PolicyTest.java
index e86b85e68e13..3f7b9cf46712 100644
--- a/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/PolicyTest.java
+++ b/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/PolicyTest.java
@@ -60,7 +60,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/collectd/HttpCollectorTest.java b/opennms-services/src/test/java/org/opennms/netmgt/collectd/HttpCollectorTest.java
index d30c1da673d3..41f33c29e3e0 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/collectd/HttpCollectorTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/collectd/HttpCollectorTest.java
@@ -80,6 +80,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorMinMaxValTest.java b/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorMinMaxValTest.java
index aa78bc3ee944..1d73fdd9af21 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorMinMaxValTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorMinMaxValTest.java
@@ -82,13 +82,13 @@
})
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml"
})
@JUnitConfigurationEnvironment(systemProperties="org.opennms.rrd.storeByGroup=false")
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorTest.java b/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorTest.java
index 44d117b565eb..e31a4940f488 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorTest.java
@@ -81,13 +81,13 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml"
})
@JUnitConfigurationEnvironment(systemProperties="org.opennms.rrd.storeByGroup=false")
@JUnitTemporaryDatabase(reuseDatabase=false) // Relies on records created in @Before so we need a fresh database for each test
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/discovery/DiscoveryIntegrationTest.java b/opennms-services/src/test/java/org/opennms/netmgt/discovery/DiscoveryIntegrationTest.java
index 468029d86799..edf097d7c8b3 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/discovery/DiscoveryIntegrationTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/discovery/DiscoveryIntegrationTest.java
@@ -52,9 +52,9 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-pinger.xml",
- "classpath:/META-INF/opennms/applicationContext-discovery.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-discovery.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdTestBuilder.java b/opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdTestBuilder.java
index c2030b54f668..bde0ba733be8 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdTestBuilder.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/linkd/LinkdTestBuilder.java
@@ -58,10 +58,10 @@
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-linkd.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-linkd.xml"
})
@JUnitConfigurationEnvironment(systemProperties="org.opennms.provisiond.enableDiscovery=false")
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/mock/OpenNMSIntegrationTestCaseTest.java b/opennms-services/src/test/java/org/opennms/netmgt/mock/OpenNMSIntegrationTestCaseTest.java
index a31fe14f918e..8df165ad3567 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/mock/OpenNMSIntegrationTestCaseTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/mock/OpenNMSIntegrationTestCaseTest.java
@@ -48,11 +48,11 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:META-INF/opennms/applicationContext-soa.xml",
- "classpath:META-INF/opennms/applicationContext-dao.xml",
+ "classpath:META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:META-INF/opennms/applicationContext-daemon.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/notifd/HttpNotificationStrategyTest.java b/opennms-services/src/test/java/org/opennms/netmgt/notifd/HttpNotificationStrategyTest.java
index c258e564a3c3..5ecadd257b10 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/notifd/HttpNotificationStrategyTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/notifd/HttpNotificationStrategyTest.java
@@ -52,11 +52,11 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/notifd/NotificationsTestCase.java b/opennms-services/src/test/java/org/opennms/netmgt/notifd/NotificationsTestCase.java
index 850ff70bc9dd..099b0b1b4944 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/notifd/NotificationsTestCase.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/notifd/NotificationsTestCase.java
@@ -75,10 +75,10 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
// Notifd
"classpath:/META-INF/opennms/applicationContext-notifdTest.xml"
})
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/poller/PathOutageManagerJdbcTest.java b/opennms-services/src/test/java/org/opennms/netmgt/poller/PathOutageManagerJdbcTest.java
index 9bd6af46c235..1f4d3b6083f6 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/poller/PathOutageManagerJdbcTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/poller/PathOutageManagerJdbcTest.java
@@ -71,6 +71,7 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/poller/PollContextTest.java b/opennms-services/src/test/java/org/opennms/netmgt/poller/PollContextTest.java
index bbc0c6acbc62..70a56f80a7d1 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/poller/PollContextTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/poller/PollContextTest.java
@@ -72,11 +72,11 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
// Override the default QueryManager with the DAO version
"classpath:/META-INF/opennms/applicationContext-pollerdTest.xml"
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerQueryManagerDaoTest.java b/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerQueryManagerDaoTest.java
index 09bba496b3ab..b399e42954e1 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerQueryManagerDaoTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerQueryManagerDaoTest.java
@@ -95,11 +95,11 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-provisioner.xml",
// Override the default QueryManager with the DAO version
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerTest.java b/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerTest.java
index 7b06ff031db9..9dca394e6ce4 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/poller/PollerTest.java
@@ -105,11 +105,11 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-provisioner.xml",
// Override the default QueryManager with the DAO version
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SmtpMonitorTest.java b/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SmtpMonitorTest.java
index 36c317b81065..db25c6e2d9f8 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SmtpMonitorTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SmtpMonitorTest.java
@@ -59,6 +59,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:/META-INF/opennms/emptyContext.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml"})
@JUnitConfigurationEnvironment
public class SmtpMonitorTest {
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SshMonitorTest.java b/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SshMonitorTest.java
index 8b47c3a99d70..fda09fdfed6e 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SshMonitorTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SshMonitorTest.java
@@ -48,6 +48,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:/META-INF/opennms/emptyContext.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml"})
@JUnitConfigurationEnvironment
public class SshMonitorTest {
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/rtc/RTCManagerTest.java b/opennms-services/src/test/java/org/opennms/netmgt/rtc/RTCManagerTest.java
index 0424e60aa65c..3b660972f03c 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/rtc/RTCManagerTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/rtc/RTCManagerTest.java
@@ -40,6 +40,7 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/snmpinterfacepoller/pollable/PollContextTest.java b/opennms-services/src/test/java/org/opennms/netmgt/snmpinterfacepoller/pollable/PollContextTest.java
index 1c51b64c9445..bb755870b9c9 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/snmpinterfacepoller/pollable/PollContextTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/snmpinterfacepoller/pollable/PollContextTest.java
@@ -53,13 +53,13 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-snmpinterfacepollerd.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-snmpinterfacepollerd.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/statsd/StatsdTest.java b/opennms-services/src/test/java/org/opennms/netmgt/statsd/StatsdTest.java
index c713e079ebbc..348a96f97745 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/statsd/StatsdTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/statsd/StatsdTest.java
@@ -46,8 +46,8 @@
"classpath:/META-INF/opennms/applicationContext-mockEventd.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-statisticsDaemon.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
//@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/Nms4335Test.java b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/Nms4335Test.java
index 3fd5a9f2dd45..0d2be333168f 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/Nms4335Test.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/Nms4335Test.java
@@ -75,8 +75,8 @@
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false,tempDbClass=MockDatabase.class)
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdEventdLoadTest.java b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdEventdLoadTest.java
index c7713e84af32..e40f55fed6fe 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdEventdLoadTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdEventdLoadTest.java
@@ -85,13 +85,13 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-eventDaemon.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/testEventProxy.xml"
})
@JUnitConfigurationEnvironment
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdLoadTest.java b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdLoadTest.java
index ae65cacd28b5..4393b76c5355 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdLoadTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdLoadTest.java
@@ -87,13 +87,13 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-eventDaemon.xml",
- "classpath:/syslogdTest.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/syslogdTest.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdTest.java b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdTest.java
index ef620f8231b1..973871f2bd83 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/syslogd/SyslogdTest.java
@@ -73,14 +73,14 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-databasePopulator.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false,tempDbClass=MockDatabase.class)
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/utils/NodeLabelTest.java b/opennms-services/src/test/java/org/opennms/netmgt/utils/NodeLabelTest.java
index 24e05771e955..19619ac2e97f 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/utils/NodeLabelTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/utils/NodeLabelTest.java
@@ -47,6 +47,7 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/utils/TransactionAwareEventForwarderTest.java b/opennms-services/src/test/java/org/opennms/netmgt/utils/TransactionAwareEventForwarderTest.java
index 787b044c97c5..fe5a6e784ff5 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/utils/TransactionAwareEventForwarderTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/utils/TransactionAwareEventForwarderTest.java
@@ -61,8 +61,8 @@
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/org/opennms/netmgt/utils/applicationContext-testTAEventForwarderTest.xml",
"classpath:META-INF/opennms/mockEventIpcManager.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/xmlrpcd/OpenNMSProvisionerTest.java b/opennms-services/src/test/java/org/opennms/netmgt/xmlrpcd/OpenNMSProvisionerTest.java
index 12f0d68e5fe8..05cde911d9c7 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/xmlrpcd/OpenNMSProvisionerTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/xmlrpcd/OpenNMSProvisionerTest.java
@@ -74,12 +74,12 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
"classpath:/META-INF/opennms/applicationContext-provisioner.xml"
})
diff --git a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/AccessPointMonitordTest.java b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/AccessPointMonitordTest.java
index ae16999e74b6..d044ef1032e3 100755
--- a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/AccessPointMonitordTest.java
+++ b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/AccessPointMonitordTest.java
@@ -68,7 +68,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
"classpath:/META-INF/opennms/mockEventIpcManager.xml",
diff --git a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/poller/InstanceStrategyIntegrationTest.java b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/poller/InstanceStrategyIntegrationTest.java
index 78c9dd3e1916..9a9e2882fbe2 100755
--- a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/poller/InstanceStrategyIntegrationTest.java
+++ b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/poller/InstanceStrategyIntegrationTest.java
@@ -76,7 +76,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations = {
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-daemon.xml",
diff --git a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/rest/AccessPointRestServiceTest.java b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/rest/AccessPointRestServiceTest.java
index d1e125c0e12b..cd88ea48d7be 100755
--- a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/rest/AccessPointRestServiceTest.java
+++ b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/rest/AccessPointRestServiceTest.java
@@ -45,11 +45,11 @@
@WebAppConfiguration
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
// Unit test database populator
"classpath:/META-INF/opennms/applicationContext-accessPointDatabasePopulator.xml"
diff --git a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/dao/AccessPointDaoTest.java b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/dao/AccessPointDaoTest.java
index 80729dbeaf33..5739cba91e44 100755
--- a/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/dao/AccessPointDaoTest.java
+++ b/opennms-tools/access-point-monitor/src/test/java/org/opennms/netmgt/dao/AccessPointDaoTest.java
@@ -60,11 +60,11 @@
@ContextConfiguration(locations = {
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
- "classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath*:/META-INF/opennms/component-dao.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-web-api/pom.xml b/opennms-web-api/pom.xml
index d7007d02dc4f..e7b89ea5505a 100644
--- a/opennms-web-api/pom.xml
+++ b/opennms-web-api/pom.xml
@@ -72,6 +72,10 @@
org.opennms.core.test-api
org.opennms.core.test-api.db
+
+ org.opennms.core.test-api
+ org.opennms.core.test-api.services
+
org.opennms.dependencies
spring-test-dependencies
@@ -82,6 +86,11 @@
opennms-dao
test
+
+ org.opennms
+ opennms-dao-mock
+ test
+
org.opennms
opennms-rrd-jrobin
diff --git a/opennms-web-api/src/test/java/org/opennms/web/category/CategoryModelTest.java b/opennms-web-api/src/test/java/org/opennms/web/category/CategoryModelTest.java
index 22901ca3c15f..7e586079f797 100644
--- a/opennms-web-api/src/test/java/org/opennms/web/category/CategoryModelTest.java
+++ b/opennms-web-api/src/test/java/org/opennms/web/category/CategoryModelTest.java
@@ -59,7 +59,8 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml"
})
@JUnitConfigurationEnvironment
diff --git a/opennms-web-api/src/test/java/org/opennms/web/charts/ChartUtilsTest.java b/opennms-web-api/src/test/java/org/opennms/web/charts/ChartUtilsTest.java
index 2dbeb2f70cd7..249a1cbf8833 100644
--- a/opennms-web-api/src/test/java/org/opennms/web/charts/ChartUtilsTest.java
+++ b/opennms-web-api/src/test/java/org/opennms/web/charts/ChartUtilsTest.java
@@ -62,6 +62,7 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
diff --git a/opennms-webapp/src/test/java/org/opennms/dashboard/server/DefaultSurveillanceServiceIntegrationTest.java b/opennms-webapp/src/test/java/org/opennms/dashboard/server/DefaultSurveillanceServiceIntegrationTest.java
index 995a5b7096ab..13a6e0c3c01b 100644
--- a/opennms-webapp/src/test/java/org/opennms/dashboard/server/DefaultSurveillanceServiceIntegrationTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/dashboard/server/DefaultSurveillanceServiceIntegrationTest.java
@@ -60,13 +60,13 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:org/opennms/web/svclayer/applicationContext-svclayer.xml",
"classpath*:/META-INF/opennms/applicationContext-reportingCore.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:org/opennms/dashboard/applicationContext-svclayer-dashboard-test.xml",
- "classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/gwt/web/ui/asset/AssetServiceImplTest.java b/opennms-webapp/src/test/java/org/opennms/gwt/web/ui/asset/AssetServiceImplTest.java
index 25a4c4eed868..323ce9ed93ae 100644
--- a/opennms-webapp/src/test/java/org/opennms/gwt/web/ui/asset/AssetServiceImplTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/gwt/web/ui/asset/AssetServiceImplTest.java
@@ -41,7 +41,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.opennms.core.test.OpenNMSJUnit4ClassRunner;
-import org.opennms.core.test.db.TemporaryDatabaseExecutionListener;
import org.opennms.core.test.db.annotations.JUnitTemporaryDatabase;
import org.opennms.core.utils.WebSecurityUtils;
import org.opennms.gwt.web.ui.asset.server.AssetServiceImpl;
@@ -53,7 +52,6 @@
import org.opennms.netmgt.model.OnmsAssetRecord;
import org.opennms.netmgt.model.OnmsNode;
import org.opennms.test.JUnitConfigurationEnvironment;
-import org.opennms.test.OpenNMSConfigurationExecutionListener;
import org.opennms.web.api.Authentication;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.InitializingBean;
@@ -66,21 +64,13 @@
import org.springframework.security.core.userdetails.User;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
@RunWith(OpenNMSJUnit4ClassRunner.class)
-@TestExecutionListeners({ OpenNMSConfigurationExecutionListener.class,
- TemporaryDatabaseExecutionListener.class,
- DependencyInjectionTestExecutionListener.class,
- DirtiesContextTestExecutionListener.class,
- TransactionalTestExecutionListener.class })
@ContextConfiguration(locations = {
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-dao.xml"})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/alarm/AlarmRepositoryTest.java b/opennms-webapp/src/test/java/org/opennms/web/alarm/AlarmRepositoryTest.java
index 5a65b2304eb9..72734ab82012 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/alarm/AlarmRepositoryTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/alarm/AlarmRepositoryTest.java
@@ -65,11 +65,11 @@
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
diff --git a/opennms-webapp/src/test/java/org/opennms/web/alarm/filter/AlarmRepositoryFilterTest.java b/opennms-webapp/src/test/java/org/opennms/web/alarm/filter/AlarmRepositoryFilterTest.java
index b891c6e47239..7bcc62493c04 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/alarm/filter/AlarmRepositoryFilterTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/alarm/filter/AlarmRepositoryFilterTest.java
@@ -65,8 +65,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/controller/node/NodeProvisioningControllerTest.java b/opennms-webapp/src/test/java/org/opennms/web/controller/node/NodeProvisioningControllerTest.java
index 302239ad7fd5..8af4bde06a0c 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/controller/node/NodeProvisioningControllerTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/controller/node/NodeProvisioningControllerTest.java
@@ -59,8 +59,9 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-dao.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath:/META-INF/opennms/applicationContext-reportingCore.xml",
@@ -69,7 +70,6 @@
"classpath:/META-INF/opennms/applicationContext-mockEventProxy.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/element/NetworkElementFactoryTest.java b/opennms-webapp/src/test/java/org/opennms/web/element/NetworkElementFactoryTest.java
index 6d362ee746ef..e8eb8951a080 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/element/NetworkElementFactoryTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/element/NetworkElementFactoryTest.java
@@ -63,8 +63,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/event/DaoWebEventRepositoryTest.java b/opennms-webapp/src/test/java/org/opennms/web/event/DaoWebEventRepositoryTest.java
index e9bc402e72f8..0844969c878b 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/event/DaoWebEventRepositoryTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/event/DaoWebEventRepositoryTest.java
@@ -63,8 +63,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/event/filter/WebEventRepositoryFilterTest.java b/opennms-webapp/src/test/java/org/opennms/web/event/filter/WebEventRepositoryFilterTest.java
index b5b6484c2d77..38748a5e9c9d 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/event/filter/WebEventRepositoryFilterTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/event/filter/WebEventRepositoryFilterTest.java
@@ -64,8 +64,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/notification/DaoWebNotificationRepositoryTest.java b/opennms-webapp/src/test/java/org/opennms/web/notification/DaoWebNotificationRepositoryTest.java
index 64c1c2d3722d..5241c322082e 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/notification/DaoWebNotificationRepositoryTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/notification/DaoWebNotificationRepositoryTest.java
@@ -58,8 +58,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/notification/WebNotificationRepositoryFilterTest.java b/opennms-webapp/src/test/java/org/opennms/web/notification/WebNotificationRepositoryFilterTest.java
index 335204c29508..627d3cf66181 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/notification/WebNotificationRepositoryFilterTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/notification/WebNotificationRepositoryFilterTest.java
@@ -66,8 +66,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/outage/DaoWebOutageRepositoryTest.java b/opennms-webapp/src/test/java/org/opennms/web/outage/DaoWebOutageRepositoryTest.java
index 29a35df538a3..d89276661f72 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/outage/DaoWebOutageRepositoryTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/outage/DaoWebOutageRepositoryTest.java
@@ -64,8 +64,8 @@
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/outage/filter/WebOutageRepositoryFilterTest.java b/opennms-webapp/src/test/java/org/opennms/web/outage/filter/WebOutageRepositoryFilterTest.java
index 08926050c8ad..752cec05d6e0 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/outage/filter/WebOutageRepositoryFilterTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/outage/filter/WebOutageRepositoryFilterTest.java
@@ -61,13 +61,13 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
- "classpath:/daoWebRepositoryTestContext.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/daoWebRepositoryTestContext.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/AcknowledgmentRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/AcknowledgmentRestServiceTest.java
index 7a6d633cadb3..8ba18d28f89f 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/AcknowledgmentRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/AcknowledgmentRestServiceTest.java
@@ -58,6 +58,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -69,7 +70,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
index f122f8addbbc..b29e75dee1bc 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmRestServiceTest.java
@@ -73,6 +73,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -84,7 +85,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java
index f1684f62a994..0bf9f72b2ec7 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/AlarmStatsRestServiceTest.java
@@ -66,6 +66,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -77,7 +78,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/AvailabilityRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/AvailabilityRestServiceTest.java
index 1410e14d9b1f..9b9aa5953b22 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/AvailabilityRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/AvailabilityRestServiceTest.java
@@ -55,6 +55,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -66,7 +67,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/CategoryRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/CategoryRestServiceTest.java
index 206cfbb64bb6..7a4061d6f061 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/CategoryRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/CategoryRestServiceTest.java
@@ -56,6 +56,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -67,7 +68,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/DataLinkInterfaceRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/DataLinkInterfaceRestServiceTest.java
index 9fff2deba3c0..04dd3ad0a821 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/DataLinkInterfaceRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/DataLinkInterfaceRestServiceTest.java
@@ -51,6 +51,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -62,7 +63,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/EventRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/EventRestServiceTest.java
index b20bbd1fdfd7..dc001ae189a5 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/EventRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/EventRestServiceTest.java
@@ -49,6 +49,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -60,7 +61,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/ForeignSourceRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/ForeignSourceRestServiceTest.java
index 653cc12dba11..28589b2dfc85 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/ForeignSourceRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/ForeignSourceRestServiceTest.java
@@ -46,6 +46,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -57,7 +58,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/GraphRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/GraphRestServiceTest.java
index 4e5bf87204aa..a2f809a97c0a 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/GraphRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/GraphRestServiceTest.java
@@ -56,6 +56,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -67,7 +68,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/GroupRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/GroupRestServiceTest.java
index 93ff2554598f..9282a3915a23 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/GroupRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/GroupRestServiceTest.java
@@ -61,6 +61,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -72,7 +73,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/GzipEncodingRestTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/GzipEncodingRestTest.java
index 74f108a47300..be8cd3dcabde 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/GzipEncodingRestTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/GzipEncodingRestTest.java
@@ -66,6 +66,7 @@
@ContextConfiguration(locations = {
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -77,7 +78,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/IPhoneRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/IPhoneRestServiceTest.java
index cdf2a3d7685a..b3faa47b5ee5 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/IPhoneRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/IPhoneRestServiceTest.java
@@ -61,6 +61,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -72,7 +73,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/IfServicesRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/IfServicesRestServiceTest.java
index 89092baf59fe..40caaa498c5a 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/IfServicesRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/IfServicesRestServiceTest.java
@@ -44,6 +44,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -55,7 +56,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/KscRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/KscRestServiceTest.java
index d65df468179b..a491fe2547b4 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/KscRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/KscRestServiceTest.java
@@ -56,6 +56,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -67,7 +68,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java
index 714c3fed5029..b26167d81fd0 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java
@@ -77,6 +77,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -88,7 +89,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/NotificationRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/NotificationRestServiceTest.java
index a0d9d97eaea2..313d2928ea05 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/NotificationRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/NotificationRestServiceTest.java
@@ -49,6 +49,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -60,7 +61,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/OutageRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/OutageRestServiceTest.java
index 6d993f211403..7ec87cfd76ca 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/OutageRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/OutageRestServiceTest.java
@@ -31,6 +31,7 @@
@ContextConfiguration(locations = {
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -42,7 +43,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/RemotePollerAvailabilityRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/RemotePollerAvailabilityRestServiceTest.java
index 31ac6e82d845..85b2f372c23a 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/RemotePollerAvailabilityRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/RemotePollerAvailabilityRestServiceTest.java
@@ -68,6 +68,7 @@
@WebAppConfiguration
@ContextConfiguration(locations={
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -79,7 +80,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml",
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/RequisitionRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/RequisitionRestServiceTest.java
index 964d97e2bf56..b91ae4eb2dd6 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/RequisitionRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/RequisitionRestServiceTest.java
@@ -55,6 +55,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -66,7 +67,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/ResourceRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/ResourceRestServiceTest.java
index b56cb3c2d620..703e4da19891 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/ResourceRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/ResourceRestServiceTest.java
@@ -56,6 +56,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -67,7 +68,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/ScheduledOutagesRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/ScheduledOutagesRestServiceTest.java
index d3b613a664fd..9a41cfe1707d 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/ScheduledOutagesRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/ScheduledOutagesRestServiceTest.java
@@ -65,6 +65,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -76,7 +77,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/SnmpConfigRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/SnmpConfigRestServiceTest.java
index 707cbfbb5c4e..16a879c3a046 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/SnmpConfigRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/SnmpConfigRestServiceTest.java
@@ -62,6 +62,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -73,7 +74,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/UserRestServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/UserRestServiceTest.java
index b3120738f353..4648f1e12ce0 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/UserRestServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/UserRestServiceTest.java
@@ -58,6 +58,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -69,7 +70,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml"
})
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/config/AgentConfigurationResourceITTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/config/AgentConfigurationResourceITTest.java
index e5a018d42931..347d2becaa7b 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/config/AgentConfigurationResourceITTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/config/AgentConfigurationResourceITTest.java
@@ -50,6 +50,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -61,7 +62,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml",
"classpath:/applicationContext-agents-rest-test.xml"
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/config/CollectionConfigurationResourceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/config/CollectionConfigurationResourceTest.java
index d9fcbcbd66b5..f9b96ecb99c2 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/config/CollectionConfigurationResourceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/config/CollectionConfigurationResourceTest.java
@@ -52,6 +52,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -63,7 +64,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml",
"classpath:/applicationContext-collectd-rest-test.xml"
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/config/DataCollectionConfigResourceITTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/config/DataCollectionConfigResourceITTest.java
index 226e53d342e7..ad314b1cc1a5 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/config/DataCollectionConfigResourceITTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/config/DataCollectionConfigResourceITTest.java
@@ -53,6 +53,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -64,7 +65,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml",
"classpath:/applicationContext-collectd-rest-test.xml"
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/config/PollerConfigurationResourceTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/config/PollerConfigurationResourceTest.java
index 880735237309..0ae08d4f8cc3 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/config/PollerConfigurationResourceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/config/PollerConfigurationResourceTest.java
@@ -50,6 +50,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -61,7 +62,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml",
"classpath:/applicationContext-collectd-rest-test.xml"
diff --git a/opennms-webapp/src/test/java/org/opennms/web/rest/config/SnmpConfigurationResourceITTest.java b/opennms-webapp/src/test/java/org/opennms/web/rest/config/SnmpConfigurationResourceITTest.java
index ad3b49df79cc..69254af87801 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/rest/config/SnmpConfigurationResourceITTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/rest/config/SnmpConfigurationResourceITTest.java
@@ -47,6 +47,7 @@
@ContextConfiguration(locations={
"classpath:/org/opennms/web/rest/applicationContext-test.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
@@ -58,7 +59,6 @@
"classpath:/applicationContext-jersey-test.xml",
"classpath:/META-INF/opennms/applicationContext-reporting.xml",
"classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"file:src/main/webapp/WEB-INF/applicationContext-spring-security.xml",
"file:src/main/webapp/WEB-INF/applicationContext-jersey.xml",
"classpath:/applicationContext-snmp-rest-test.xml"
diff --git a/opennms-webapp/src/test/java/org/opennms/web/services/FilterFavoriteServiceTest.java b/opennms-webapp/src/test/java/org/opennms/web/services/FilterFavoriteServiceTest.java
index 2a0f34d4f260..94744f961836 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/services/FilterFavoriteServiceTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/services/FilterFavoriteServiceTest.java
@@ -53,9 +53,9 @@
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-setupIpLike-enabled.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/org/opennms/web/svclayer/applicationContext-svclayer-test.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase(dirtiesContext=false)
diff --git a/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java b/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
index b2ab0e4f6b5b..7776d6e23b8b 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
@@ -58,13 +58,13 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-reportingCore.xml",
"classpath:/org/opennms/web/svclayer/applicationContext-svclayer.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultPollServiceIntegrationTest.java b/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultPollServiceIntegrationTest.java
index 649b41663759..998e220ee50f 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultPollServiceIntegrationTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultPollServiceIntegrationTest.java
@@ -49,15 +49,15 @@
@RunWith(OpenNMSJUnit4ClassRunner.class)
@ContextConfiguration(locations={
- "classpath:META-INF/opennms/applicationContext-soa.xml",
- "classpath:META-INF/opennms/applicationContext-dao.xml",
- "classpath:META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-soa.xml",
+ "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:org/opennms/web/svclayer/applicationContext-svclayer.xml",
"classpath*:/META-INF/opennms/applicationContext-reportingCore.xml",
- "classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase
diff --git a/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSiteStatusServiceIntegrationTest.java b/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSiteStatusServiceIntegrationTest.java
index 08a3b22ed3a7..bef9acb7a8d3 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSiteStatusServiceIntegrationTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSiteStatusServiceIntegrationTest.java
@@ -77,7 +77,8 @@
//"classpath:/org/opennms/web/svclayer/applicationContext-svclayer.xml",
"classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml",
"classpath:/testSiteStatusServiceContext.xml",
- "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml"
+ "classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
})
@JUnitConfigurationEnvironment
public class DefaultSiteStatusServiceIntegrationTest implements InitializingBean {
diff --git a/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSurveillanceServiceIntegrationTest.java b/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSurveillanceServiceIntegrationTest.java
index 1b9ac86df780..3979ef10358e 100644
--- a/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSurveillanceServiceIntegrationTest.java
+++ b/opennms-webapp/src/test/java/org/opennms/web/svclayer/support/DefaultSurveillanceServiceIntegrationTest.java
@@ -51,13 +51,13 @@
"classpath:/META-INF/opennms/applicationContext-soa.xml",
"classpath:/META-INF/opennms/applicationContext-dao.xml",
"classpath:/META-INF/opennms/applicationContext-commonConfigs.xml",
+ "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml",
"classpath:/META-INF/opennms/applicationContext-databasePopulator.xml",
"classpath*:/META-INF/opennms/component-dao.xml",
"classpath*:/META-INF/opennms/component-service.xml",
"classpath:org/opennms/web/svclayer/applicationContext-svclayer.xml",
"classpath:/META-INF/opennms/applicationContext-reportingCore.xml",
- "classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml",
- "classpath:/META-INF/opennms/applicationContext-minimal-conf.xml"
+ "classpath:/META-INF/opennms/applicationContext-insertData-enabled.xml"
})
@JUnitConfigurationEnvironment
@JUnitTemporaryDatabase