diff --git a/opennms-webapp-rest/pom.xml b/opennms-webapp-rest/pom.xml index 520a2b80f336..bdb3e6319fab 100644 --- a/opennms-webapp-rest/pom.xml +++ b/opennms-webapp-rest/pom.xml @@ -337,6 +337,12 @@ opennms-rrd-api test + + org.opennms.features + org.opennms.features.timeseries + ${project.version} + test + org.opennms.features.collection org.opennms.features.collection.persistence.osgi diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AcknowledgmentRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AcknowledgmentRestServiceIT.java index 309212554f29..d89c3b6f4ee0 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AcknowledgmentRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AcknowledgmentRestServiceIT.java @@ -73,7 +73,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class AcknowledgmentRestServiceIT extends AbstractSpringJerseyRestTestCase { @Autowired diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java index 32b386387bf7..0d3019e3ad24 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmRestServiceIT.java @@ -80,7 +80,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class AlarmRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmStatsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmStatsRestServiceIT.java index 97540552c01a..69604772dde9 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmStatsRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AlarmStatsRestServiceIT.java @@ -83,7 +83,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class AlarmStatsRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetRecordResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetRecordResourceIT.java index e1108122a8f4..5d57c71b2899 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetRecordResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetRecordResourceIT.java @@ -61,7 +61,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class AssetRecordResourceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetSuggestionsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetSuggestionsRestServiceIT.java index 0f919d99c0b0..0aea68ea66e0 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetSuggestionsRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AssetSuggestionsRestServiceIT.java @@ -68,7 +68,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class AssetSuggestionsRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AvailabilityRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AvailabilityRestServiceIT.java index 81ef126d6dbe..ffb8a66da774 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AvailabilityRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/AvailabilityRestServiceIT.java @@ -68,7 +68,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class AvailabilityRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/CategoryRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/CategoryRestServiceIT.java index edf2799a934d..65a64afd71a2 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/CategoryRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/CategoryRestServiceIT.java @@ -68,7 +68,7 @@ "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class CategoryRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/EventRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/EventRestServiceIT.java index 9160fa8bb27d..2312752b1bc5 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/EventRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/EventRestServiceIT.java @@ -60,7 +60,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class EventRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceConfigRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceConfigRestServiceIT.java index 7ebdfb6e1e2d..eab69305b52d 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceConfigRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceConfigRestServiceIT.java @@ -58,7 +58,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class ForeignSourceConfigRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceRestServiceIT.java index eeadc5f83e3b..e40fdcc4bdf8 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ForeignSourceRestServiceIT.java @@ -54,7 +54,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class ForeignSourceRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GroupRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GroupRestServiceIT.java index 538b80d9d068..3cafe69f4d80 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GroupRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GroupRestServiceIT.java @@ -74,7 +74,7 @@ "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class GroupRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(GroupRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GzipEncodingRestIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GzipEncodingRestIT.java index 55b4fa664ff6..a0e4c7ea133b 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GzipEncodingRestIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/GzipEncodingRestIT.java @@ -72,7 +72,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class GzipEncodingRestIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/HardwareInventoryResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/HardwareInventoryResourceIT.java index 67062c704a32..1b7f28f72e7f 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/HardwareInventoryResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/HardwareInventoryResourceIT.java @@ -62,7 +62,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class HardwareInventoryResourceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IPhoneRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IPhoneRestServiceIT.java index 6f883487aa92..fdc5d8cd61ff 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IPhoneRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IPhoneRestServiceIT.java @@ -66,7 +66,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class IPhoneRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IfServicesRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IfServicesRestServiceIT.java index 6414608fa82b..3897187f2326 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IfServicesRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/IfServicesRestServiceIT.java @@ -66,7 +66,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class IfServicesRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/InfoRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/InfoRestServiceIT.java index f259e87b620f..2be2af833c09 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/InfoRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/InfoRestServiceIT.java @@ -70,7 +70,7 @@ "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class InfoRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(InfoRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/KscRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/KscRestServiceIT.java index 85f40fb0fcdc..39b84b3f7d8b 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/KscRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/KscRestServiceIT.java @@ -68,7 +68,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class KscRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MinionRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MinionRestServiceIT.java index 3743f53e66da..fda1bfa9470d 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MinionRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MinionRestServiceIT.java @@ -56,7 +56,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class MinionRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MonitoringLocationRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MonitoringLocationRestServiceIT.java index 39c3f23f6a40..824d604e3d07 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MonitoringLocationRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/MonitoringLocationRestServiceIT.java @@ -56,7 +56,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class MonitoringLocationRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(org.opennms.web.rest.v2.MonitoringLocationRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NodeRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NodeRestServiceIT.java index e3e352457a01..0d7d9230c0c7 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NodeRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NodeRestServiceIT.java @@ -97,7 +97,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class NodeRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(NodeRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NotificationRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NotificationRestServiceIT.java index a1cb3fc58b34..61e6c7195d62 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NotificationRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/NotificationRestServiceIT.java @@ -62,7 +62,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class NotificationRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/OutageRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/OutageRestServiceIT.java index b574ca79ce06..04a2eeeada4e 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/OutageRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/OutageRestServiceIT.java @@ -76,7 +76,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class OutageRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/RequisitionRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/RequisitionRestServiceIT.java index 2fea0d453873..5a11c0ffd4f2 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/RequisitionRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/RequisitionRestServiceIT.java @@ -61,7 +61,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class RequisitionRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ScheduledOutagesRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ScheduledOutagesRestServiceIT.java index ad0fcf20aecd..6fe6698a4274 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ScheduledOutagesRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/ScheduledOutagesRestServiceIT.java @@ -83,7 +83,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class ScheduledOutagesRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/SnmpConfigRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/SnmpConfigRestServiceIT.java index 36f3024c0747..94fcc08ca968 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/SnmpConfigRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/SnmpConfigRestServiceIT.java @@ -66,7 +66,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class SnmpConfigRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/TimelineRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/TimelineRestServiceIT.java index 2e0d25400bf8..29e95e90f069 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/TimelineRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/TimelineRestServiceIT.java @@ -55,7 +55,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class TimelineRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(NodeRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/UserRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/UserRestServiceIT.java index 654ad5eea66f..f2dfb625576d 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/UserRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/UserRestServiceIT.java @@ -76,7 +76,7 @@ "classpath:/META-INF/opennms/applicationContext-mock-usergroup.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class UserRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final String PASSWORD = "21232F297A57A5A743894A0E4A801FC3"; diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/WebAssetsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/WebAssetsRestServiceIT.java index 3ab3d38f56e6..f17082c3ed2e 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/WebAssetsRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/WebAssetsRestServiceIT.java @@ -54,7 +54,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class WebAssetsRestServiceIT extends AbstractSpringJerseyRestTestCase { protected void beforeServletStart() throws Exception { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/AgentConfigurationResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/AgentConfigurationResourceIT.java index c6a6f0a76f6a..bf78c0de2d92 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/AgentConfigurationResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/AgentConfigurationResourceIT.java @@ -57,7 +57,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class AgentConfigurationResourceIT extends AbstractSpringJerseyRestTestCase { @SuppressWarnings("unused") diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/DataCollectionConfigResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/DataCollectionConfigResourceIT.java index 284d4f646ca9..019caa789ac3 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/DataCollectionConfigResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/DataCollectionConfigResourceIT.java @@ -57,7 +57,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class DataCollectionConfigResourceIT extends AbstractSpringJerseyRestTestCase { @SuppressWarnings("unused") diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/JmxDataCollectionConfigResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/JmxDataCollectionConfigResourceIT.java index bf9d17d4419d..5897dd5491b5 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/JmxDataCollectionConfigResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/JmxDataCollectionConfigResourceIT.java @@ -56,7 +56,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class JmxDataCollectionConfigResourceIT extends AbstractSpringJerseyRestTestCase { @SuppressWarnings("unused") diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/SnmpConfigurationResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/SnmpConfigurationResourceIT.java index 55846c8e5eec..e9e683e63606 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/SnmpConfigurationResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/SnmpConfigurationResourceIT.java @@ -51,7 +51,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class SnmpConfigurationResourceIT extends AbstractSpringJerseyRestTestCase { @SuppressWarnings("unused") diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/TrapdConfigurationResourceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/TrapdConfigurationResourceIT.java index d61e6027138f..2b8686a14e52 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/TrapdConfigurationResourceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/config/TrapdConfigurationResourceIT.java @@ -51,7 +51,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class TrapdConfigurationResourceIT extends AbstractSpringJerseyRestTestCase { @SuppressWarnings("unused") diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/json/RequisitionRestServiceJsonIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/json/RequisitionRestServiceJsonIT.java index 3e5dc726a08e..e5cda3e8b1f0 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/json/RequisitionRestServiceJsonIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v1/json/RequisitionRestServiceJsonIT.java @@ -64,7 +64,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class RequisitionRestServiceJsonIT extends AbstractSpringJerseyRestJsonTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/AlarmRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/AlarmRestServiceIT.java index 2079c4a28cc7..7d98f90e068d 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/AlarmRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/AlarmRestServiceIT.java @@ -89,7 +89,10 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment(systemProperties="org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger") +@JUnitConfigurationEnvironment(systemProperties={ + "org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger", + "org.opennms.timeseries.strategy=integration" +}) @JUnitTemporaryDatabase @Transactional public class AlarmRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/ApplicationStatusRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/ApplicationStatusRestServiceIT.java index 917df463637e..7fb40b436660 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/ApplicationStatusRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/ApplicationStatusRestServiceIT.java @@ -65,7 +65,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class ApplicationStatusRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/DiscoveryRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/DiscoveryRestServiceIT.java index f8ac07543bb4..7f1b9b0a9e7c 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/DiscoveryRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/DiscoveryRestServiceIT.java @@ -57,7 +57,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class DiscoveryRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java index 01fffdac2054..6c73c998f3ed 100755 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfPersistenceServiceIT.java @@ -69,7 +69,7 @@ "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class EventConfPersistenceServiceIT { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java index 4fd1dcd5fffb..96c5c9f302e4 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventConfRestServiceIT.java @@ -86,7 +86,7 @@ }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class EventConfRestServiceIT { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventRestServiceIT.java index 3e4d7a4b5318..7bed73fbdc38 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/EventRestServiceIT.java @@ -60,7 +60,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class EventRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IfServicesRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IfServicesRestServiceIT.java index 390f1421fd8d..bc756806ab39 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IfServicesRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IfServicesRestServiceIT.java @@ -66,7 +66,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class IfServicesRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(IfServicesRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IpInterfaceRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IpInterfaceRestServiceIT.java index b5c53b7f465a..e3c775d61fb9 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IpInterfaceRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/IpInterfaceRestServiceIT.java @@ -51,7 +51,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class IpInterfaceRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(IpInterfaceRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MetadataRestIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MetadataRestIT.java index b92c4642dd0a..ff0fbe7f4c31 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MetadataRestIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MetadataRestIT.java @@ -61,7 +61,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class MetadataRestIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(MetadataRestIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MinionRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MinionRestServiceIT.java index 866394ec7766..5ee10868da93 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MinionRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MinionRestServiceIT.java @@ -55,7 +55,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class MinionRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringLocationRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringLocationRestServiceIT.java index f99ae745efc6..d9e42335ca9a 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringLocationRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringLocationRestServiceIT.java @@ -69,7 +69,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class MonitoringLocationRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(MonitoringLocationRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringSystemsRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringSystemsRestServiceIT.java index 99ca7c0183e4..d5a906164d4d 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringSystemsRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/MonitoringSystemsRestServiceIT.java @@ -57,7 +57,10 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment(systemProperties="org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger") +@JUnitConfigurationEnvironment(systemProperties={ + "org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger", + "org.opennms.timeseries.strategy=integration" +}) @JUnitTemporaryDatabase @Transactional public class MonitoringSystemsRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeLinkRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeLinkRestServiceIT.java index 8fe7a092b90c..f83b8a0b2882 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeLinkRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeLinkRestServiceIT.java @@ -92,7 +92,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class NodeLinkRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(NodeLinkRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeRestServiceIT.java index 5adbb56f0e8e..0e2721a1ac22 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NodeRestServiceIT.java @@ -71,7 +71,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class NodeRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(NodeRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NotificationRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NotificationRestServiceIT.java index a372454d82dc..44ef43629bff 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NotificationRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/NotificationRestServiceIT.java @@ -54,7 +54,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class NotificationRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OpenApiIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OpenApiIT.java index 2272c0ee1c69..e0433ee7bf5b 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OpenApiIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OpenApiIT.java @@ -48,7 +48,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml", "classpath:/applicationContext-rest-test.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class OpenApiIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(OpenApiIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OutageRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OutageRestServiceIT.java index 35d6b6b4a354..aa3ca026d93f 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OutageRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/OutageRestServiceIT.java @@ -51,7 +51,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class OutageRestServiceIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SearchPropertiesIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SearchPropertiesIT.java index c121c6f971a9..6cc495f75870 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SearchPropertiesIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SearchPropertiesIT.java @@ -52,7 +52,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class SearchPropertiesIT extends AbstractSpringJerseyRestTestCase { diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SnmpInterfaceRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SnmpInterfaceRestServiceIT.java index 42d4db4cbf7d..62a0a5feff78 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SnmpInterfaceRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/SnmpInterfaceRestServiceIT.java @@ -52,7 +52,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase public class SnmpInterfaceRestServiceIT extends AbstractSpringJerseyRestTestCase { private static final Logger LOG = LoggerFactory.getLogger(SnmpInterfaceRestServiceIT.class); diff --git a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/UserDefinedLinkRestServiceIT.java b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/UserDefinedLinkRestServiceIT.java index ceedfd6245ad..97de978f77a1 100644 --- a/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/UserDefinedLinkRestServiceIT.java +++ b/opennms-webapp-rest/src/test/java/org/opennms/web/rest/v2/UserDefinedLinkRestServiceIT.java @@ -65,7 +65,7 @@ "file:src/main/webapp/WEB-INF/applicationContext-svclayer.xml", "file:src/main/webapp/WEB-INF/applicationContext-cxf-common.xml" }) -@JUnitConfigurationEnvironment +@JUnitConfigurationEnvironment(systemProperties = "org.opennms.timeseries.strategy=integration") @JUnitTemporaryDatabase @Transactional public class UserDefinedLinkRestServiceIT extends AbstractSpringJerseyRestTestCase {