From 5265eb105af70c3c1b8c1fb6ae7fdc5426f9bb22 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 22 Feb 2024 16:02:26 -0500 Subject: [PATCH] fix the spring XSD versions in all application context files --- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-echo.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-rpc-client-mock.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-echo.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../META-INF/opennms/mockMessageDispatcherFactory.xml | 2 +- .../META-INF/opennms/mockSinkConsumerManager.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-snmp-profile-mapper.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-snmp.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../resources/META-INF/opennms/applicationContext-soa.xml | 4 ++-- .../core/soa/config/NamespaceHandlerTest-context.xml | 2 +- .../core/soa/support/ReferenceFactoryBeanTest-context.xml | 2 +- .../core/soa/support/ServiceFactoryBeanTest-context.xml | 2 +- .../support/ServiceReferenceIntegrationTest-context.xml | 2 +- .../opennms/applicationContext-alarm-driver-ext.xml | 2 +- .../META-INF/opennms/applicationContext-testDao.xml | 2 +- .../opennms/applicationContext-mock-usergroup.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 4 ++-- .../opennms/applicationContext-tracer-registry.xml | 4 ++-- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../broker/src/main/resources/activemq-default.xml | 4 ++-- .../broker/src/main/resources/activemq-dispatcher.xml | 2 +- .../broker/src/main/resources/activemq-receiver.xml | 2 +- .../opennms/applicationContext-alarm-driver-ext.xml | 2 +- .../META-INF/opennms/applicationContext-bsmd.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-collector.xml | 6 +++--- .../opennms/applicationContext-timeseries-osgi.xml | 2 +- .../opennms/applicationContext-timeseries-tcp.xml | 6 +++--- .../opennms/applicationContext-thresholdingConfigDaos.xml | 2 +- .../META-INF/opennms/applicationContext-config-dao.xml | 2 +- .../opennms/applicationContext-mockConfigManager.xml | 2 +- .../opennms/applicationContext-config-service.xml | 4 ++-- features/config/test/src/test/resources/mock-dao.xml | 4 ++-- .../applicationContext-deviceConfig-MonitorAdaptor.xml | 4 ++-- .../applicationContext-deviceconfig-persistence.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-deviceconfig-service.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 4 ++-- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-opennms-identity.xml | 4 ++-- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-eventCollectorMock.xml | 4 ++-- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../test/resources/META-INF/opennms/component-service.xml | 6 +++--- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../resources/META-INF/opennms/junit-component-dao.xml | 2 +- .../opennms/applicationContext-measurements-rest-test.xml | 2 +- .../test/resources/SnmpProtocolCollectorTestContext.xml | 2 +- .../test/resources/TcaProtocolCollectorTestContext.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-poller.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 6 +++--- .../availability/src/main/resources/beanRefContext.xml | 2 +- .../META-INF/opennms/applicationContext-reportingDao.xml | 4 ++-- .../opennms/applicationContext-reportingDaoTest.xml | 4 ++-- .../resources/META-INF/opennms/component-measurement.xml | 2 +- .../resources/META-INF/opennms/component-reporting.xml | 2 +- .../jasper-reports/src/main/resources/beanRefContext.xml | 2 +- .../opennms/applicationContext-reportingRepository.xml | 4 ++-- .../repository/src/main/resources/beanRefContext.xml | 2 +- .../applicationContext-reportingRepositoryTest.xml | 4 ++-- .../repository/src/test/resources/beanRefContext.xml | 2 +- .../META-INF/opennms/applicationContext-rest-mappers.xml | 2 +- .../security/AuthenticationIntegrationTest-context.xml | 2 +- .../main/resources/META-INF/opennms/component-service.xml | 6 +++--- .../opennms/applicationContext-jtiAdapterFactory.xml | 2 +- .../applicationContext-test-message-persister.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../test/resources/applicationContext-test-routeinfo.xml | 2 +- .../opennms/applicationContext-openconfig-components.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-test-troubleTicketer.xml | 4 ++-- .../netmgt/ticketd/applicationContext-configOverride.xml | 4 ++-- .../resources/META-INF/opennms/component-timeformat.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../opennms/applicationContext-usageanalytics.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../resources/META-INF/opennms/provisiond-extensions.xml | 2 +- .../resources/META-INF/opennms/component-measurement.xml | 2 +- .../netmgt/jasper/measurement/measurementBeans.xml | 2 +- .../resources/META-INF/opennms/provisiond-extensions.xml | 2 +- .../resources/META-INF/opennms/provisiond-extensions.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../META-INF/opennms/applicationContext-alarmd.xml | 2 +- .../resources/applicationContext-test-troubleTicketer.xml | 4 ++-- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../http-northbounder/src/test/resources/test-context.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../jms-northbounder/src/test/resources/test-context.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- .../src/main/filtered/etc/opennms-activemq.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/test-context-examples.xml | 4 ++-- .../src/test/resources/test-reload-context.xml | 4 ++-- .../META-INF/opennms/applicationContext-mockDao.xml | 2 +- ...ansactionalTemporaryDatabaseSpringContextTestsTest.xml | 2 +- opennms-dao/src/test/resources/upsertTest-context.xml | 2 +- .../META-INF/opennms/applicationContext-reportd.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-icmp.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/empty-context.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 8 ++++---- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/test/resources/test-spring-jmxconfig.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../test/resources/META-INF/opennms/test/detectors.xml | 2 +- .../META-INF/opennms/test/snmpConfigFactoryContext.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-detect.xml | 2 +- .../META-INF/opennms/applicationContext-rpc-dns.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../resources/META-INF/opennms/provisiond-extensions.xml | 2 +- .../META-INF/opennms/applicationContext-scan-executor.xml | 2 +- .../src/test/resources/META-INF/opennms/detectors.xml | 2 +- .../resources/META-INF/opennms/provisiond-extensions.xml | 2 +- .../resources/META-INF/opennms/provisiond-extensions.xml | 2 +- .../src/test/resources/mockForeignSourceContext.xml | 2 +- .../src/test/resources/testForeignSourceContext.xml | 2 +- .../src/main/resources/META-INF/opennms/empty-context.xml | 2 +- .../src/test/resources/pluginRegistryTest-context.xml | 6 +++--- .../src/main/resources/META-INF/opennms/component-dao.xml | 8 ++++---- .../src/test/resources/META-INF/opennms/empty-context.xml | 6 +++--- .../src/main/resources/META-INF/opennms/component-dao.xml | 8 ++++---- .../main/resources/META-INF/opennms/component-rrd-tcp.xml | 2 +- .../opennms/applicationContext-pollerConfigDaos.xml | 2 +- .../opennms/applicationContext-testPollerConfigDaos.xml | 2 +- .../opennms/applicationContext-deviceConfigDao.xml | 2 +- .../opennms/applicationContext-test-deviceConfig.xml | 2 +- .../opennms/applicationContext-test-sessionFactory.xml | 2 +- .../org/opennms/spring/xml/applicationContext-testAOP.xml | 2 +- .../main/resources/META-INF/opennms/component-service.xml | 2 +- .../src/test/resources/META-INF/opennms/component-dao.xml | 2 +- .../src/test/resources/applicationContext-rest-test.xml | 2 +- .../webapp/WEB-INF/applicationContext-spring-security.xml | 2 +- .../spring-security.d/activeDirectory.xml.disabled | 2 +- .../WEB-INF/spring-security.d/attribute-preauth.xml | 2 +- .../webapp/WEB-INF/spring-security.d/header-preauth.xml | 2 +- .../webapp/WEB-INF/spring-security.d/ldap.xml.disabled | 2 +- .../webapp/WEB-INF/spring-security.d/radius.xml.disabled | 2 +- .../src/test/resources/daoWebRepositoryTestContext.xml | 2 +- .../applicationContext-svclayer-dashboard-test.xml | 2 +- .../web/svclayer/applicationContext-svclayer-test.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/detectors.xml | 2 +- .../src/main/resources/META-INF/opennms/component-dao.xml | 2 +- .../resources/opennms-overlay/etc/opennms-activemq.xml | 2 +- 183 files changed, 225 insertions(+), 225 deletions(-) diff --git a/core/ipc/grpc/server/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/grpc/server/src/main/resources/META-INF/opennms/component-dao.xml index f521ceeaea45..ee3e7e79e417 100644 --- a/core/ipc/grpc/server/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/grpc/server/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/osgi/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/osgi/src/main/resources/META-INF/opennms/component-dao.xml index 4a2ffd9ea63b..0c5d26cad2f3 100644 --- a/core/ipc/osgi/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/osgi/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/rpc/common/src/main/resources/META-INF/opennms/applicationContext-rpc-echo.xml b/core/ipc/rpc/common/src/main/resources/META-INF/opennms/applicationContext-rpc-echo.xml index bddff1af5eb0..0ae959344f90 100644 --- a/core/ipc/rpc/common/src/main/resources/META-INF/opennms/applicationContext-rpc-echo.xml +++ b/core/ipc/rpc/common/src/main/resources/META-INF/opennms/applicationContext-rpc-echo.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/core/ipc/rpc/jms-impl/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/rpc/jms-impl/src/main/resources/META-INF/opennms/component-dao.xml index cfcd6cd05a9c..d99e85614ecb 100644 --- a/core/ipc/rpc/jms-impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/rpc/jms-impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/rpc/kafka/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/rpc/kafka/src/main/resources/META-INF/opennms/component-dao.xml index 9091330c25c8..f96678acd3f7 100644 --- a/core/ipc/rpc/kafka/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/rpc/kafka/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-mock.xml b/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-mock.xml index fb7e4ad4a69c..80677e8339d0 100644 --- a/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-mock.xml +++ b/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-mock.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/component-dao.xml index 01323bc4f709..cba2dcc983eb 100644 --- a/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/rpc/mock-impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/rpc/utils/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/rpc/utils/src/main/resources/META-INF/opennms/component-dao.xml index b810936f537f..292f05404858 100644 --- a/core/ipc/rpc/utils/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/rpc/utils/src/main/resources/META-INF/opennms/component-dao.xml @@ -2,7 +2,7 @@ diff --git a/core/ipc/sink/camel/client/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/sink/camel/client/src/main/resources/META-INF/opennms/component-dao.xml index 2aaed72c33b8..ee9edf577d0b 100644 --- a/core/ipc/sink/camel/client/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/sink/camel/client/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/sink/camel/server/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/sink/camel/server/src/main/resources/META-INF/opennms/component-dao.xml index 5b7b636010aa..f7559f84da14 100644 --- a/core/ipc/sink/camel/server/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/sink/camel/server/src/main/resources/META-INF/opennms/component-dao.xml @@ -2,7 +2,7 @@ diff --git a/core/ipc/sink/kafka/client/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/sink/kafka/client/src/main/resources/META-INF/opennms/component-dao.xml index 8ff97ee6fe4d..49029665a360 100644 --- a/core/ipc/sink/kafka/client/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/sink/kafka/client/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/sink/kafka/itests/src/test/resources/META-INF/opennms/applicationContext-rpc-echo.xml b/core/ipc/sink/kafka/itests/src/test/resources/META-INF/opennms/applicationContext-rpc-echo.xml index c666380e4881..2e950f1c65af 100644 --- a/core/ipc/sink/kafka/itests/src/test/resources/META-INF/opennms/applicationContext-rpc-echo.xml +++ b/core/ipc/sink/kafka/itests/src/test/resources/META-INF/opennms/applicationContext-rpc-echo.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/core/ipc/sink/kafka/server/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/sink/kafka/server/src/main/resources/META-INF/opennms/component-dao.xml index edb22c3637f9..371f7a679fad 100644 --- a/core/ipc/sink/kafka/server/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/sink/kafka/server/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockMessageDispatcherFactory.xml b/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockMessageDispatcherFactory.xml index e60b6556b0ff..93f9e882c7e1 100644 --- a/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockMessageDispatcherFactory.xml +++ b/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockMessageDispatcherFactory.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockSinkConsumerManager.xml b/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockSinkConsumerManager.xml index b2f20f33348c..56c076089b11 100644 --- a/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockSinkConsumerManager.xml +++ b/core/ipc/sink/mock-impl/src/main/resources/META-INF/opennms/mockSinkConsumerManager.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/twin/jms/publisher/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/twin/jms/publisher/src/main/resources/META-INF/opennms/component-dao.xml index 71bc5f71edce..72ad028b661a 100644 --- a/core/ipc/twin/jms/publisher/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/twin/jms/publisher/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/core/ipc/twin/kafka/publisher/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/twin/kafka/publisher/src/main/resources/META-INF/opennms/component-dao.xml index 1f4101803b55..33433fb21413 100644 --- a/core/ipc/twin/kafka/publisher/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/ipc/twin/kafka/publisher/src/main/resources/META-INF/opennms/component-dao.xml @@ -2,7 +2,7 @@ diff --git a/core/jmx/api/src/main/resources/META-INF/opennms/component-dao.xml b/core/jmx/api/src/main/resources/META-INF/opennms/component-dao.xml index aabdd7f74d44..374bffb05445 100644 --- a/core/jmx/api/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/jmx/api/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/core/mate/model/src/main/resources/META-INF/opennms/component-dao.xml b/core/mate/model/src/main/resources/META-INF/opennms/component-dao.xml index e13c66588e86..c0d905f52106 100644 --- a/core/mate/model/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/mate/model/src/main/resources/META-INF/opennms/component-dao.xml @@ -2,7 +2,7 @@ diff --git a/core/snmp/api/src/main/resources/META-INF/opennms/component-dao.xml b/core/snmp/api/src/main/resources/META-INF/opennms/component-dao.xml index 3fcaea4e8912..96eb32e87241 100644 --- a/core/snmp/api/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/snmp/api/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/applicationContext-snmp-profile-mapper.xml b/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/applicationContext-snmp-profile-mapper.xml index b4ad144d920a..0ea7c40070a1 100644 --- a/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/applicationContext-snmp-profile-mapper.xml +++ b/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/applicationContext-snmp-profile-mapper.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/component-dao.xml b/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/component-dao.xml index aa36103c8e02..2ad5f33269d4 100644 --- a/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/snmp/profile-mapper/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-snmp.xml b/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-snmp.xml index 1dedd9f249e0..61241f4d9d9e 100644 --- a/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-snmp.xml +++ b/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-snmp.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml b/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml index 413a00c99721..779f7b34c8cb 100644 --- a/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/snmp/proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/core/soa/src/main/resources/META-INF/opennms/applicationContext-soa.xml b/core/soa/src/main/resources/META-INF/opennms/applicationContext-soa.xml index 94f4322db7b0..8a1a38d7e2b2 100644 --- a/core/soa/src/main/resources/META-INF/opennms/applicationContext-soa.xml +++ b/core/soa/src/main/resources/META-INF/opennms/applicationContext-soa.xml @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> - \ No newline at end of file + diff --git a/core/soa/src/test/resources/org/opennms/core/soa/config/NamespaceHandlerTest-context.xml b/core/soa/src/test/resources/org/opennms/core/soa/config/NamespaceHandlerTest-context.xml index 049d05625aa4..ad113e74f3e9 100644 --- a/core/soa/src/test/resources/org/opennms/core/soa/config/NamespaceHandlerTest-context.xml +++ b/core/soa/src/test/resources/org/opennms/core/soa/config/NamespaceHandlerTest-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/core/soa/src/test/resources/org/opennms/core/soa/support/ReferenceFactoryBeanTest-context.xml b/core/soa/src/test/resources/org/opennms/core/soa/support/ReferenceFactoryBeanTest-context.xml index 4e34e4840b91..353ca4f040b5 100644 --- a/core/soa/src/test/resources/org/opennms/core/soa/support/ReferenceFactoryBeanTest-context.xml +++ b/core/soa/src/test/resources/org/opennms/core/soa/support/ReferenceFactoryBeanTest-context.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd "> - \ No newline at end of file + diff --git a/core/tracing/registry/src/main/resources/META-INF/opennms/applicationContext-tracer-registry.xml b/core/tracing/registry/src/main/resources/META-INF/opennms/applicationContext-tracer-registry.xml index a3b9af03e784..540d3a59c76c 100644 --- a/core/tracing/registry/src/main/resources/META-INF/opennms/applicationContext-tracer-registry.xml +++ b/core/tracing/registry/src/main/resources/META-INF/opennms/applicationContext-tracer-registry.xml @@ -2,7 +2,7 @@ - \ No newline at end of file + diff --git a/core/tracing/registry/src/main/resources/META-INF/opennms/component-dao.xml b/core/tracing/registry/src/main/resources/META-INF/opennms/component-dao.xml index aba89bca1b5d..a5b52f469517 100644 --- a/core/tracing/registry/src/main/resources/META-INF/opennms/component-dao.xml +++ b/core/tracing/registry/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/activemq/broker/src/main/resources/activemq-default.xml b/features/activemq/broker/src/main/resources/activemq-default.xml index ce51ab231671..6a4113872a20 100644 --- a/features/activemq/broker/src/main/resources/activemq-default.xml +++ b/features/activemq/broker/src/main/resources/activemq-default.xml @@ -19,7 +19,7 @@ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> @@ -161,4 +161,4 @@ - \ No newline at end of file + diff --git a/features/activemq/broker/src/main/resources/activemq-dispatcher.xml b/features/activemq/broker/src/main/resources/activemq-dispatcher.xml index aa2f5133b16a..d0117b059760 100644 --- a/features/activemq/broker/src/main/resources/activemq-dispatcher.xml +++ b/features/activemq/broker/src/main/resources/activemq-dispatcher.xml @@ -18,7 +18,7 @@ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> diff --git a/features/activemq/broker/src/main/resources/activemq-receiver.xml b/features/activemq/broker/src/main/resources/activemq-receiver.xml index 21623b20bc1c..d9bd72245926 100644 --- a/features/activemq/broker/src/main/resources/activemq-receiver.xml +++ b/features/activemq/broker/src/main/resources/activemq-receiver.xml @@ -18,7 +18,7 @@ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> diff --git a/features/alarms/history/elastic/src/test/resources/META-INF/opennms/applicationContext-alarm-driver-ext.xml b/features/alarms/history/elastic/src/test/resources/META-INF/opennms/applicationContext-alarm-driver-ext.xml index 177cf6afda46..95d8452f830f 100644 --- a/features/alarms/history/elastic/src/test/resources/META-INF/opennms/applicationContext-alarm-driver-ext.xml +++ b/features/alarms/history/elastic/src/test/resources/META-INF/opennms/applicationContext-alarm-driver-ext.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/bsm/daemon/src/main/resources/META-INF/opennms/applicationContext-bsmd.xml b/features/bsm/daemon/src/main/resources/META-INF/opennms/applicationContext-bsmd.xml index 50e517a17ec9..539f492f8d17 100644 --- a/features/bsm/daemon/src/main/resources/META-INF/opennms/applicationContext-bsmd.xml +++ b/features/bsm/daemon/src/main/resources/META-INF/opennms/applicationContext-bsmd.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/bsm/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml b/features/bsm/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml index 8fb8688e035f..79a00b0cbefe 100644 --- a/features/bsm/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/bsm/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/collection/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-collector.xml b/features/collection/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-collector.xml index a055c329c268..094d7a75ab20 100644 --- a/features/collection/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-collector.xml +++ b/features/collection/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-collector.xml @@ -4,9 +4,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/collection/persistence-osgi/src/main/resources/META-INF/opennms/applicationContext-timeseries-osgi.xml b/features/collection/persistence-osgi/src/main/resources/META-INF/opennms/applicationContext-timeseries-osgi.xml index 9612e51c2c3a..4e025a80ee13 100644 --- a/features/collection/persistence-osgi/src/main/resources/META-INF/opennms/applicationContext-timeseries-osgi.xml +++ b/features/collection/persistence-osgi/src/main/resources/META-INF/opennms/applicationContext-timeseries-osgi.xml @@ -2,7 +2,7 @@ @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/features/collection/thresholding/impl/src/main/resources/META-INF/opennms/applicationContext-thresholdingConfigDaos.xml b/features/collection/thresholding/impl/src/main/resources/META-INF/opennms/applicationContext-thresholdingConfigDaos.xml index 85d54d63bb39..ebe174dd300d 100644 --- a/features/collection/thresholding/impl/src/main/resources/META-INF/opennms/applicationContext-thresholdingConfigDaos.xml +++ b/features/collection/thresholding/impl/src/main/resources/META-INF/opennms/applicationContext-thresholdingConfigDaos.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/features/config/dao/impl/src/main/resources/META-INF/opennms/applicationContext-config-dao.xml b/features/config/dao/impl/src/main/resources/META-INF/opennms/applicationContext-config-dao.xml index 87c73e141bd1..b8d968139b29 100644 --- a/features/config/dao/impl/src/main/resources/META-INF/opennms/applicationContext-config-dao.xml +++ b/features/config/dao/impl/src/main/resources/META-INF/opennms/applicationContext-config-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/features/config/mock/src/main/resources/META-INF/opennms/applicationContext-mockConfigManager.xml b/features/config/mock/src/main/resources/META-INF/opennms/applicationContext-mockConfigManager.xml index 76a34ae5c3ce..213f42e9489c 100644 --- a/features/config/mock/src/main/resources/META-INF/opennms/applicationContext-mockConfigManager.xml +++ b/features/config/mock/src/main/resources/META-INF/opennms/applicationContext-mockConfigManager.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/features/config/service/impl/src/main/resources/META-INF/opennms/applicationContext-config-service.xml b/features/config/service/impl/src/main/resources/META-INF/opennms/applicationContext-config-service.xml index 5dea960c0f5c..6f2f7c9f5aad 100644 --- a/features/config/service/impl/src/main/resources/META-INF/opennms/applicationContext-config-service.xml +++ b/features/config/service/impl/src/main/resources/META-INF/opennms/applicationContext-config-service.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/features/config/test/src/test/resources/mock-dao.xml b/features/config/test/src/test/resources/mock-dao.xml index 63b8f33dbdcf..2dc6887cecad 100644 --- a/features/config/test/src/test/resources/mock-dao.xml +++ b/features/config/test/src/test/resources/mock-dao.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> - \ No newline at end of file + diff --git a/features/device-config/monitor-adaptor/src/main/resources/META-INF/opennms/applicationContext-deviceConfig-MonitorAdaptor.xml b/features/device-config/monitor-adaptor/src/main/resources/META-INF/opennms/applicationContext-deviceConfig-MonitorAdaptor.xml index 2e39e144898f..d28c62777945 100644 --- a/features/device-config/monitor-adaptor/src/main/resources/META-INF/opennms/applicationContext-deviceConfig-MonitorAdaptor.xml +++ b/features/device-config/monitor-adaptor/src/main/resources/META-INF/opennms/applicationContext-deviceConfig-MonitorAdaptor.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/features/device-config/persistence/impl/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-persistence.xml b/features/device-config/persistence/impl/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-persistence.xml index c353cb7b68aa..ac65b2137287 100644 --- a/features/device-config/persistence/impl/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-persistence.xml +++ b/features/device-config/persistence/impl/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-persistence.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/device-config/retrieval/src/main/resources/META-INF/opennms/component-dao.xml b/features/device-config/retrieval/src/main/resources/META-INF/opennms/component-dao.xml index f869112ba40c..f1409c57b365 100644 --- a/features/device-config/retrieval/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/device-config/retrieval/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/device-config/service/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-service.xml b/features/device-config/service/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-service.xml index ad4d78aa3502..dfb7f578cd7d 100644 --- a/features/device-config/service/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-service.xml +++ b/features/device-config/service/src/main/resources/META-INF/opennms/applicationContext-deviceconfig-service.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/device-config/ssh-scripting/src/main/resources/META-INF/opennms/component-dao.xml b/features/device-config/ssh-scripting/src/main/resources/META-INF/opennms/component-dao.xml index fa38c7be00b9..a406801750cb 100644 --- a/features/device-config/ssh-scripting/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/device-config/ssh-scripting/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/features/device-config/tftp/src/main/resources/META-INF/opennms/component-dao.xml b/features/device-config/tftp/src/main/resources/META-INF/opennms/component-dao.xml index e0aee6c3174c..1ded075447f0 100644 --- a/features/device-config/tftp/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/device-config/tftp/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/applicationContext-opennms-identity.xml b/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/applicationContext-opennms-identity.xml index 5198a400bd08..9918832b223c 100644 --- a/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/applicationContext-opennms-identity.xml +++ b/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/applicationContext-opennms-identity.xml @@ -2,7 +2,7 @@ - \ No newline at end of file + diff --git a/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/component-dao.xml b/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/component-dao.xml index a9c7a84fa7fb..b545f2a5cc5a 100644 --- a/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/distributed/opennms-identity/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/endpoints/grafana/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml b/features/endpoints/grafana/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml index 432f0e6bd095..0068a832ea24 100644 --- a/features/endpoints/grafana/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/endpoints/grafana/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/events/collector/src/test/resources/META-INF/opennms/applicationContext-eventCollectorMock.xml b/features/events/collector/src/test/resources/META-INF/opennms/applicationContext-eventCollectorMock.xml index f09642e07c56..f52fc5048c78 100644 --- a/features/events/collector/src/test/resources/META-INF/opennms/applicationContext-eventCollectorMock.xml +++ b/features/events/collector/src/test/resources/META-INF/opennms/applicationContext-eventCollectorMock.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> - \ No newline at end of file + diff --git a/features/flows/classification/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml b/features/flows/classification/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml index 16fc6d48dfd6..ed9ed72bdd30 100644 --- a/features/flows/classification/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/flows/classification/persistence/impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/geolocation/service/src/test/resources/META-INF/opennms/component-service.xml b/features/geolocation/service/src/test/resources/META-INF/opennms/component-service.xml index a3d527eb4ca5..ccf8ddca1f53 100644 --- a/features/geolocation/service/src/test/resources/META-INF/opennms/component-service.xml +++ b/features/geolocation/service/src/test/resources/META-INF/opennms/component-service.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd"> diff --git a/features/graph/dao/impl/src/main/resources/META-INF/opennms/component-dao.xml b/features/graph/dao/impl/src/main/resources/META-INF/opennms/component-dao.xml index d5d27080f00e..ccc358856486 100644 --- a/features/graph/dao/impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/graph/dao/impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/features/graph/service/src/test/resources/META-INF/opennms/component-dao.xml b/features/graph/service/src/test/resources/META-INF/opennms/component-dao.xml index 2af1aecee06f..e338bc186653 100644 --- a/features/graph/service/src/test/resources/META-INF/opennms/component-dao.xml +++ b/features/graph/service/src/test/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/jdbc-collector/src/main/resources/META-INF/opennms/component-dao.xml b/features/jdbc-collector/src/main/resources/META-INF/opennms/component-dao.xml index da90e2b4bbc9..811a8d03d923 100644 --- a/features/jdbc-collector/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/jdbc-collector/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/juniper-tca-collector/src/main/resources/META-INF/opennms/component-dao.xml b/features/juniper-tca-collector/src/main/resources/META-INF/opennms/component-dao.xml index 24650c7e72bf..46dc4d2b3114 100644 --- a/features/juniper-tca-collector/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/juniper-tca-collector/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/juniper-tca-collector/src/test/resources/META-INF/opennms/junit-component-dao.xml b/features/juniper-tca-collector/src/test/resources/META-INF/opennms/junit-component-dao.xml index 67f026c22165..fe9e1f67fbc0 100644 --- a/features/juniper-tca-collector/src/test/resources/META-INF/opennms/junit-component-dao.xml +++ b/features/juniper-tca-collector/src/test/resources/META-INF/opennms/junit-component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/measurements/rest/src/test/resources/META-INF/opennms/applicationContext-measurements-rest-test.xml b/features/measurements/rest/src/test/resources/META-INF/opennms/applicationContext-measurements-rest-test.xml index 1a5451398ebe..deca867294fb 100644 --- a/features/measurements/rest/src/test/resources/META-INF/opennms/applicationContext-measurements-rest-test.xml +++ b/features/measurements/rest/src/test/resources/META-INF/opennms/applicationContext-measurements-rest-test.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/nrtg/protocolcollector/snmp/src/test/resources/SnmpProtocolCollectorTestContext.xml b/features/nrtg/protocolcollector/snmp/src/test/resources/SnmpProtocolCollectorTestContext.xml index 990601727d66..d6a0ec2fff79 100644 --- a/features/nrtg/protocolcollector/snmp/src/test/resources/SnmpProtocolCollectorTestContext.xml +++ b/features/nrtg/protocolcollector/snmp/src/test/resources/SnmpProtocolCollectorTestContext.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/nrtg/protocolcollector/tca/src/test/resources/TcaProtocolCollectorTestContext.xml b/features/nrtg/protocolcollector/tca/src/test/resources/TcaProtocolCollectorTestContext.xml index b2daaeb8f47e..e646231c878f 100644 --- a/features/nrtg/protocolcollector/tca/src/test/resources/TcaProtocolCollectorTestContext.xml +++ b/features/nrtg/protocolcollector/tca/src/test/resources/TcaProtocolCollectorTestContext.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/poller/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-poller.xml b/features/poller/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-poller.xml index fa9785228fee..1fbc5d46b39d 100644 --- a/features/poller/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-poller.xml +++ b/features/poller/client-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-poller.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/prometheus-collector/src/main/resources/META-INF/opennms/component-dao.xml b/features/prometheus-collector/src/main/resources/META-INF/opennms/component-dao.xml index ca546b5c1775..7bf09654684d 100644 --- a/features/prometheus-collector/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/prometheus-collector/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/reporting/availability/src/main/resources/beanRefContext.xml b/features/reporting/availability/src/main/resources/beanRefContext.xml index a9b81bc4888b..75dcf9986ff3 100644 --- a/features/reporting/availability/src/main/resources/beanRefContext.xml +++ b/features/reporting/availability/src/main/resources/beanRefContext.xml @@ -1,7 +1,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/reporting/dao/src/main/resources/META-INF/opennms/applicationContext-reportingDao.xml b/features/reporting/dao/src/main/resources/META-INF/opennms/applicationContext-reportingDao.xml index 142def25af21..190c84fc53a8 100644 --- a/features/reporting/dao/src/main/resources/META-INF/opennms/applicationContext-reportingDao.xml +++ b/features/reporting/dao/src/main/resources/META-INF/opennms/applicationContext-reportingDao.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> - \ No newline at end of file + diff --git a/features/reporting/dao/src/test/resources/META-INF/opennms/applicationContext-reportingDaoTest.xml b/features/reporting/dao/src/test/resources/META-INF/opennms/applicationContext-reportingDaoTest.xml index ec4da13f99f4..fc687c918d62 100644 --- a/features/reporting/dao/src/test/resources/META-INF/opennms/applicationContext-reportingDaoTest.xml +++ b/features/reporting/dao/src/test/resources/META-INF/opennms/applicationContext-reportingDaoTest.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-measurement.xml b/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-measurement.xml index bca58ec5df81..9ec2b1ed6369 100644 --- a/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-measurement.xml +++ b/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-measurement.xml @@ -2,6 +2,6 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-reporting.xml b/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-reporting.xml index cc6237c17fb4..20ad2716a30f 100644 --- a/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-reporting.xml +++ b/features/reporting/jasper-reports/src/main/resources/META-INF/opennms/component-reporting.xml @@ -2,7 +2,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/reporting/jasper-reports/src/main/resources/beanRefContext.xml b/features/reporting/jasper-reports/src/main/resources/beanRefContext.xml index f19edb1a4e13..2faa2eb33a07 100644 --- a/features/reporting/jasper-reports/src/main/resources/beanRefContext.xml +++ b/features/reporting/jasper-reports/src/main/resources/beanRefContext.xml @@ -1,7 +1,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/reporting/repository/src/main/resources/META-INF/opennms/applicationContext-reportingRepository.xml b/features/reporting/repository/src/main/resources/META-INF/opennms/applicationContext-reportingRepository.xml index 142def25af21..190c84fc53a8 100644 --- a/features/reporting/repository/src/main/resources/META-INF/opennms/applicationContext-reportingRepository.xml +++ b/features/reporting/repository/src/main/resources/META-INF/opennms/applicationContext-reportingRepository.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> - \ No newline at end of file + diff --git a/features/reporting/repository/src/main/resources/beanRefContext.xml b/features/reporting/repository/src/main/resources/beanRefContext.xml index ce661d25fc2d..5340a5329637 100644 --- a/features/reporting/repository/src/main/resources/beanRefContext.xml +++ b/features/reporting/repository/src/main/resources/beanRefContext.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/reporting/repository/src/test/resources/META-INF/opennms/applicationContext-reportingRepositoryTest.xml b/features/reporting/repository/src/test/resources/META-INF/opennms/applicationContext-reportingRepositoryTest.xml index 142def25af21..190c84fc53a8 100644 --- a/features/reporting/repository/src/test/resources/META-INF/opennms/applicationContext-reportingRepositoryTest.xml +++ b/features/reporting/repository/src/test/resources/META-INF/opennms/applicationContext-reportingRepositoryTest.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> - \ No newline at end of file + diff --git a/features/reporting/repository/src/test/resources/beanRefContext.xml b/features/reporting/repository/src/test/resources/beanRefContext.xml index 3b39e9acaed0..ec756905d217 100644 --- a/features/reporting/repository/src/test/resources/beanRefContext.xml +++ b/features/reporting/repository/src/test/resources/beanRefContext.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/rest/mapper/src/test/resources/META-INF/opennms/applicationContext-rest-mappers.xml b/features/rest/mapper/src/test/resources/META-INF/opennms/applicationContext-rest-mappers.xml index ff4003de3f12..39a412fda9c7 100644 --- a/features/rest/mapper/src/test/resources/META-INF/opennms/applicationContext-rest-mappers.xml +++ b/features/rest/mapper/src/test/resources/META-INF/opennms/applicationContext-rest-mappers.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd "> diff --git a/features/springframework-security/src/test/resources/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml b/features/springframework-security/src/test/resources/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml index c26328f08079..dad5d7463365 100644 --- a/features/springframework-security/src/test/resources/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml +++ b/features/springframework-security/src/test/resources/org/opennms/web/springframework/security/AuthenticationIntegrationTest-context.xml @@ -1,6 +1,6 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/features/status/api/src/main/resources/META-INF/opennms/component-service.xml b/features/status/api/src/main/resources/META-INF/opennms/component-service.xml index 9bce6a628e2d..76fd023c63de 100644 --- a/features/status/api/src/main/resources/META-INF/opennms/component-service.xml +++ b/features/status/api/src/main/resources/META-INF/opennms/component-service.xml @@ -4,9 +4,9 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/features/telemetry/itests/src/test/resources/META-INF/opennms/applicationContext-jtiAdapterFactory.xml b/features/telemetry/itests/src/test/resources/META-INF/opennms/applicationContext-jtiAdapterFactory.xml index e7d0f1bde78d..cc74dd275aa8 100644 --- a/features/telemetry/itests/src/test/resources/META-INF/opennms/applicationContext-jtiAdapterFactory.xml +++ b/features/telemetry/itests/src/test/resources/META-INF/opennms/applicationContext-jtiAdapterFactory.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd"> diff --git a/features/ticketing/daemon/src/test/resources/org/opennms/netmgt/ticketd/applicationContext-configOverride.xml b/features/ticketing/daemon/src/test/resources/org/opennms/netmgt/ticketd/applicationContext-configOverride.xml index 9689443b8b5b..f965c3016cd4 100644 --- a/features/ticketing/daemon/src/test/resources/org/opennms/netmgt/ticketd/applicationContext-configOverride.xml +++ b/features/ticketing/daemon/src/test/resources/org/opennms/netmgt/ticketd/applicationContext-configOverride.xml @@ -2,8 +2,8 @@ + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd"> diff --git a/features/timeformat/impl/src/main/resources/META-INF/opennms/component-timeformat.xml b/features/timeformat/impl/src/main/resources/META-INF/opennms/component-timeformat.xml index c130284bbe5f..0c22719d45ff 100644 --- a/features/timeformat/impl/src/main/resources/META-INF/opennms/component-timeformat.xml +++ b/features/timeformat/impl/src/main/resources/META-INF/opennms/component-timeformat.xml @@ -5,7 +5,7 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/src/main/resources/META-INF/opennms/component-dao.xml b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/src/main/resources/META-INF/opennms/component-dao.xml index 7c6efbcca2ef..9d2afae83294 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/usageanalytics/impl/src/main/resources/META-INF/opennms/applicationContext-usageanalytics.xml b/features/usageanalytics/impl/src/main/resources/META-INF/opennms/applicationContext-usageanalytics.xml index 4bde6397af72..f0f586a3b93a 100644 --- a/features/usageanalytics/impl/src/main/resources/META-INF/opennms/applicationContext-usageanalytics.xml +++ b/features/usageanalytics/impl/src/main/resources/META-INF/opennms/applicationContext-usageanalytics.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/features/wsman/src/main/resources/META-INF/opennms/component-dao.xml b/features/wsman/src/main/resources/META-INF/opennms/component-dao.xml index f9ab7ae39d66..6c1f25d6afe2 100644 --- a/features/wsman/src/main/resources/META-INF/opennms/component-dao.xml +++ b/features/wsman/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/features/wsman/src/main/resources/META-INF/opennms/detectors.xml b/features/wsman/src/main/resources/META-INF/opennms/detectors.xml index 68a66b878500..592a87a1e8c2 100644 --- a/features/wsman/src/main/resources/META-INF/opennms/detectors.xml +++ b/features/wsman/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/integrations/opennms-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml b/integrations/opennms-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml index 7691e9c6ffb9..8f56c01f6a22 100644 --- a/integrations/opennms-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml +++ b/integrations/opennms-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/integrations/opennms-jasper-extensions/src/main/resources/META-INF/opennms/component-measurement.xml b/integrations/opennms-jasper-extensions/src/main/resources/META-INF/opennms/component-measurement.xml index ba32009015b2..b920a974b9f7 100644 --- a/integrations/opennms-jasper-extensions/src/main/resources/META-INF/opennms/component-measurement.xml +++ b/integrations/opennms-jasper-extensions/src/main/resources/META-INF/opennms/component-measurement.xml @@ -2,7 +2,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/integrations/opennms-jasper-extensions/src/main/resources/org/opennms/netmgt/jasper/measurement/measurementBeans.xml b/integrations/opennms-jasper-extensions/src/main/resources/org/opennms/netmgt/jasper/measurement/measurementBeans.xml index 6f41a802a974..0a95a179a0e3 100644 --- a/integrations/opennms-jasper-extensions/src/main/resources/org/opennms/netmgt/jasper/measurement/measurementBeans.xml +++ b/integrations/opennms-jasper-extensions/src/main/resources/org/opennms/netmgt/jasper/measurement/measurementBeans.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/integrations/opennms-puppet-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml b/integrations/opennms-puppet-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml index 066431122692..e98f5fc24ee6 100644 --- a/integrations/opennms-puppet-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml +++ b/integrations/opennms-puppet-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/integrations/opennms-reverse-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml b/integrations/opennms-reverse-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml index cb05f0be1309..5c4bc4492ee4 100644 --- a/integrations/opennms-reverse-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml +++ b/integrations/opennms-reverse-dns-provisioning-adapter/src/main/resources/META-INF/opennms/provisiond-extensions.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/integrations/opennms-vmware/src/main/resources/META-INF/opennms/component-dao.xml b/integrations/opennms-vmware/src/main/resources/META-INF/opennms/component-dao.xml index e4ccf76a6db0..bac96021261f 100644 --- a/integrations/opennms-vmware/src/main/resources/META-INF/opennms/component-dao.xml +++ b/integrations/opennms-vmware/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd" diff --git a/integrations/opennms-vmware/src/test/resources/META-INF/opennms/component-dao.xml b/integrations/opennms-vmware/src/test/resources/META-INF/opennms/component-dao.xml index feab7fdf422b..c369da56ca0c 100644 --- a/integrations/opennms-vmware/src/test/resources/META-INF/opennms/component-dao.xml +++ b/integrations/opennms-vmware/src/test/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/opennms-alarms/bsf-northbounder/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-alarms/bsf-northbounder/src/main/resources/META-INF/opennms/component-dao.xml index 12c2f7b49e19..bd67cca1720c 100644 --- a/opennms-alarms/bsf-northbounder/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-alarms/bsf-northbounder/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-alarms/daemon/src/main/resources/META-INF/opennms/applicationContext-alarmd.xml b/opennms-alarms/daemon/src/main/resources/META-INF/opennms/applicationContext-alarmd.xml index 010f608528db..4151f3f0d3c1 100644 --- a/opennms-alarms/daemon/src/main/resources/META-INF/opennms/applicationContext-alarmd.xml +++ b/opennms-alarms/daemon/src/main/resources/META-INF/opennms/applicationContext-alarmd.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/opennms-alarms/daemon/src/test/resources/applicationContext-test-troubleTicketer.xml b/opennms-alarms/daemon/src/test/resources/applicationContext-test-troubleTicketer.xml index ae0fbfa4bb30..1f95312bccb3 100644 --- a/opennms-alarms/daemon/src/test/resources/applicationContext-test-troubleTicketer.xml +++ b/opennms-alarms/daemon/src/test/resources/applicationContext-test-troubleTicketer.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd"> diff --git a/opennms-alarms/drools-northbounder/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-alarms/drools-northbounder/src/main/resources/META-INF/opennms/component-dao.xml index ca8d8e5ebd7a..9b30126958de 100644 --- a/opennms-alarms/drools-northbounder/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-alarms/drools-northbounder/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-alarms/email-northbounder/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-alarms/email-northbounder/src/main/resources/META-INF/opennms/component-dao.xml index b8b54b07cf7f..b0c9a797f495 100644 --- a/opennms-alarms/email-northbounder/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-alarms/email-northbounder/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-alarms/email-northbounder/src/test/resources/test-context.xml b/opennms-alarms/email-northbounder/src/test/resources/test-context.xml index daac473bbfe5..7610f124f1f9 100644 --- a/opennms-alarms/email-northbounder/src/test/resources/test-context.xml +++ b/opennms-alarms/email-northbounder/src/test/resources/test-context.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/opennms-alarms/http-northbounder/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-alarms/http-northbounder/src/main/resources/META-INF/opennms/component-dao.xml index fe7574eee80b..c76d2d52bdb9 100644 --- a/opennms-alarms/http-northbounder/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-alarms/http-northbounder/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-alarms/http-northbounder/src/test/resources/test-context.xml b/opennms-alarms/http-northbounder/src/test/resources/test-context.xml index daac473bbfe5..7610f124f1f9 100644 --- a/opennms-alarms/http-northbounder/src/test/resources/test-context.xml +++ b/opennms-alarms/http-northbounder/src/test/resources/test-context.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/opennms-alarms/jms-northbounder/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-alarms/jms-northbounder/src/main/resources/META-INF/opennms/component-dao.xml index 0d4bb3726aff..289126dd7d22 100644 --- a/opennms-alarms/jms-northbounder/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-alarms/jms-northbounder/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-alarms/jms-northbounder/src/test/resources/test-context.xml b/opennms-alarms/jms-northbounder/src/test/resources/test-context.xml index 8b20c3d9b660..373ed8b61699 100644 --- a/opennms-alarms/jms-northbounder/src/test/resources/test-context.xml +++ b/opennms-alarms/jms-northbounder/src/test/resources/test-context.xml @@ -1,7 +1,7 @@ diff --git a/opennms-config/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-config/src/main/resources/META-INF/opennms/component-dao.xml index cc96cb8bde33..152f2edfa9d7 100644 --- a/opennms-config/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-config/src/main/resources/META-INF/opennms/component-dao.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-correlation/drools-correlation-engine/src/test/resources/test-context-examples.xml b/opennms-correlation/drools-correlation-engine/src/test/resources/test-context-examples.xml index 0689a90c3569..6e0b6c75af27 100644 --- a/opennms-correlation/drools-correlation-engine/src/test/resources/test-context-examples.xml +++ b/opennms-correlation/drools-correlation-engine/src/test/resources/test-context-examples.xml @@ -1,7 +1,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/opennms-correlation/drools-correlation-engine/src/test/resources/test-reload-context.xml b/opennms-correlation/drools-correlation-engine/src/test/resources/test-reload-context.xml index 406dc35e34c2..7088c669bed0 100644 --- a/opennms-correlation/drools-correlation-engine/src/test/resources/test-reload-context.xml +++ b/opennms-correlation/drools-correlation-engine/src/test/resources/test-reload-context.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> 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 9277f090584d..0a5c99e1b66c 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 @@ -5,7 +5,7 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-dao/src/test/resources/META-INF/opennms/applicationContext-AbstractTransactionalTemporaryDatabaseSpringContextTestsTest.xml b/opennms-dao/src/test/resources/META-INF/opennms/applicationContext-AbstractTransactionalTemporaryDatabaseSpringContextTestsTest.xml index 35e157944db4..291023f8aeb0 100644 --- a/opennms-dao/src/test/resources/META-INF/opennms/applicationContext-AbstractTransactionalTemporaryDatabaseSpringContextTestsTest.xml +++ b/opennms-dao/src/test/resources/META-INF/opennms/applicationContext-AbstractTransactionalTemporaryDatabaseSpringContextTestsTest.xml @@ -1,7 +1,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/opennms-dao/src/test/resources/upsertTest-context.xml b/opennms-dao/src/test/resources/upsertTest-context.xml index e9e003be610b..e19b9f3cc3c0 100644 --- a/opennms-dao/src/test/resources/upsertTest-context.xml +++ b/opennms-dao/src/test/resources/upsertTest-context.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd diff --git a/opennms-enterprise-reporting/opennms-reportd/src/main/resources/META-INF/opennms/applicationContext-reportd.xml b/opennms-enterprise-reporting/opennms-reportd/src/main/resources/META-INF/opennms/applicationContext-reportd.xml index 783aa6337b40..3042023366f5 100644 --- a/opennms-enterprise-reporting/opennms-reportd/src/main/resources/META-INF/opennms/applicationContext-reportd.xml +++ b/opennms-enterprise-reporting/opennms-reportd/src/main/resources/META-INF/opennms/applicationContext-reportd.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-icmp.xml b/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-icmp.xml index 729778162d71..c0f44675e707 100644 --- a/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-icmp.xml +++ b/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-icmp.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml index 2a626243502c..a4b0181fe6c4 100644 --- a/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-icmp/opennms-icmp-proxy-rpc-impl/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-provision/opennms-detector-bsf/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-bsf/src/main/resources/META-INF/opennms/detectors.xml index f6f222e30ab8..452de550f2b9 100644 --- a/opennms-provision/opennms-detector-bsf/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-bsf/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/detectors.xml index a2deba1e278a..10bdab287e93 100644 --- a/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/empty-context.xml b/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/empty-context.xml index a2deba1e278a..10bdab287e93 100644 --- a/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/empty-context.xml +++ b/opennms-provision/opennms-detector-datagram/src/main/resources/META-INF/opennms/empty-context.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-dhcp/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-dhcp/src/main/resources/META-INF/opennms/detectors.xml index b4429fd6849a..f1a28a92603a 100644 --- a/opennms-provision/opennms-detector-dhcp/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-dhcp/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/opennms-provision/opennms-detector-generic/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-generic/src/main/resources/META-INF/opennms/detectors.xml index 9c08ff77f0d3..6ce8a8d71e75 100644 --- a/opennms-provision/opennms-detector-generic/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-generic/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-jdbc/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-jdbc/src/main/resources/META-INF/opennms/detectors.xml index 2cc8ece1bd8b..c8238ac9f71a 100644 --- a/opennms-provision/opennms-detector-jdbc/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-jdbc/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-jms/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-jms/src/main/resources/META-INF/opennms/detectors.xml index 398a020dba0f..f7e8b65eab96 100644 --- a/opennms-provision/opennms-detector-jms/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-jms/src/main/resources/META-INF/opennms/detectors.xml @@ -4,11 +4,11 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> - \ No newline at end of file + diff --git a/opennms-provision/opennms-detector-jmx/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-jmx/src/main/resources/META-INF/opennms/detectors.xml index 96ecb8347c54..8df048dd89bb 100644 --- a/opennms-provision/opennms-detector-jmx/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-jmx/src/main/resources/META-INF/opennms/detectors.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-jmx/src/test/resources/test-spring-jmxconfig.xml b/opennms-provision/opennms-detector-jmx/src/test/resources/test-spring-jmxconfig.xml index 13aa72ee4bb6..e7fdfc64f36f 100644 --- a/opennms-provision/opennms-detector-jmx/src/test/resources/test-spring-jmxconfig.xml +++ b/opennms-provision/opennms-detector-jmx/src/test/resources/test-spring-jmxconfig.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/opennms-provision/opennms-detector-lineoriented/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-lineoriented/src/main/resources/META-INF/opennms/detectors.xml index 4794dc364c8d..00ded57d0cab 100644 --- a/opennms-provision/opennms-detector-lineoriented/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-lineoriented/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-rdns-lookup/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-rdns-lookup/src/main/resources/META-INF/opennms/detectors.xml index 9426d2313aa0..7084997da779 100644 --- a/opennms-provision/opennms-detector-rdns-lookup/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-rdns-lookup/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-simple/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-simple/src/main/resources/META-INF/opennms/detectors.xml index 580997ba1d58..e93849bede4d 100644 --- a/opennms-provision/opennms-detector-simple/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-simple/src/main/resources/META-INF/opennms/detectors.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/detectors.xml b/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/detectors.xml index edc6c94b710e..61605a2af89f 100644 --- a/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/detectors.xml +++ b/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/detectors.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/snmpConfigFactoryContext.xml b/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/snmpConfigFactoryContext.xml index e69e71042011..7a05937f7173 100644 --- a/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/snmpConfigFactoryContext.xml +++ b/opennms-provision/opennms-detector-simple/src/test/resources/META-INF/opennms/test/snmpConfigFactoryContext.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-ssh/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-ssh/src/main/resources/META-INF/opennms/detectors.xml index d00c633dfdb4..5943b5b78c68 100644 --- a/opennms-provision/opennms-detector-ssh/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-ssh/src/main/resources/META-INF/opennms/detectors.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detector-web/src/main/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detector-web/src/main/resources/META-INF/opennms/detectors.xml index 7fc0a2a2d83a..75ea2b20f01c 100644 --- a/opennms-provision/opennms-detector-web/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detector-web/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-detect.xml b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-detect.xml index 5c9162b5e4d0..1dca3b82ce77 100644 --- a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-detect.xml +++ b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-detect.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-dns.xml b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-dns.xml index 571bfbf2c205..2f9937864105 100644 --- a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-dns.xml +++ b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/applicationContext-rpc-dns.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/component-dao.xml index f778eb801aaa..3668117bdced 100644 --- a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/component-dao.xml @@ -1,7 +1,7 @@ diff --git a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/provisiond-extensions.xml b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/provisiond-extensions.xml index c1d20c4412f7..8adc00e0c50d 100644 --- a/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/provisiond-extensions.xml +++ b/opennms-provision/opennms-detectorclient-rpc/src/main/resources/META-INF/opennms/provisiond-extensions.xml @@ -4,7 +4,7 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/applicationContext-scan-executor.xml b/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/applicationContext-scan-executor.xml index aebd3c44b414..133ec4aabd90 100644 --- a/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/applicationContext-scan-executor.xml +++ b/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/applicationContext-scan-executor.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/detectors.xml b/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/detectors.xml index 89b2eaff6d3c..c186d45ccf0b 100644 --- a/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/detectors.xml +++ b/opennms-provision/opennms-detectorclient-rpc/src/test/resources/META-INF/opennms/detectors.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-provision-geolocation/src/main/resources/META-INF/opennms/provisiond-extensions.xml b/opennms-provision/opennms-provision-geolocation/src/main/resources/META-INF/opennms/provisiond-extensions.xml index 1ed3db216c7f..92046ba3f9b9 100644 --- a/opennms-provision/opennms-provision-geolocation/src/main/resources/META-INF/opennms/provisiond-extensions.xml +++ b/opennms-provision/opennms-provision-geolocation/src/main/resources/META-INF/opennms/provisiond-extensions.xml @@ -1,7 +1,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/opennms-provision/opennms-provision-persistence/src/main/resources/META-INF/opennms/provisiond-extensions.xml b/opennms-provision/opennms-provision-persistence/src/main/resources/META-INF/opennms/provisiond-extensions.xml index 965736fc0a97..c9b612543a9f 100644 --- a/opennms-provision/opennms-provision-persistence/src/main/resources/META-INF/opennms/provisiond-extensions.xml +++ b/opennms-provision/opennms-provision-persistence/src/main/resources/META-INF/opennms/provisiond-extensions.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-provision-persistence/src/test/resources/mockForeignSourceContext.xml b/opennms-provision/opennms-provision-persistence/src/test/resources/mockForeignSourceContext.xml index f7e8d803d3f7..fea96ae2e2ef 100644 --- a/opennms-provision/opennms-provision-persistence/src/test/resources/mockForeignSourceContext.xml +++ b/opennms-provision/opennms-provision-persistence/src/test/resources/mockForeignSourceContext.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd" > diff --git a/opennms-provision/opennms-provision-persistence/src/test/resources/testForeignSourceContext.xml b/opennms-provision/opennms-provision-persistence/src/test/resources/testForeignSourceContext.xml index 2a5054aa5618..6238cef6b8f0 100644 --- a/opennms-provision/opennms-provision-persistence/src/test/resources/testForeignSourceContext.xml +++ b/opennms-provision/opennms-provision-persistence/src/test/resources/testForeignSourceContext.xml @@ -2,7 +2,7 @@ diff --git a/opennms-provision/opennms-provisiond/src/main/resources/META-INF/opennms/empty-context.xml b/opennms-provision/opennms-provisiond/src/main/resources/META-INF/opennms/empty-context.xml index a2deba1e278a..10bdab287e93 100644 --- a/opennms-provision/opennms-provisiond/src/main/resources/META-INF/opennms/empty-context.xml +++ b/opennms-provision/opennms-provisiond/src/main/resources/META-INF/opennms/empty-context.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-provisiond/src/test/resources/pluginRegistryTest-context.xml b/opennms-provision/opennms-provisiond/src/test/resources/pluginRegistryTest-context.xml index 424145556dfa..cf359dde3869 100644 --- a/opennms-provision/opennms-provisiond/src/test/resources/pluginRegistryTest-context.xml +++ b/opennms-provision/opennms-provisiond/src/test/resources/pluginRegistryTest-context.xml @@ -4,10 +4,10 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd"> diff --git a/opennms-provision/opennms-requisition-dns/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-provision/opennms-requisition-dns/src/main/resources/META-INF/opennms/component-dao.xml index 2d0e209e6db0..c9a19c8659ab 100644 --- a/opennms-provision/opennms-requisition-dns/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-provision/opennms-requisition-dns/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,9 +4,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/opennms-provision/opennms-requisition-dns/src/test/resources/META-INF/opennms/empty-context.xml b/opennms-provision/opennms-requisition-dns/src/test/resources/META-INF/opennms/empty-context.xml index 20b327cfa6fe..10bdab287e93 100644 --- a/opennms-provision/opennms-requisition-dns/src/test/resources/META-INF/opennms/empty-context.xml +++ b/opennms-provision/opennms-requisition-dns/src/test/resources/META-INF/opennms/empty-context.xml @@ -4,9 +4,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/opennms-provision/opennms-requisition-service/src/main/resources/META-INF/opennms/component-dao.xml b/opennms-provision/opennms-requisition-service/src/main/resources/META-INF/opennms/component-dao.xml index 8fb7336d7fe0..2f6e64ebea84 100644 --- a/opennms-provision/opennms-requisition-service/src/main/resources/META-INF/opennms/component-dao.xml +++ b/opennms-provision/opennms-requisition-service/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,9 +4,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/opennms-rrd/opennms-rrd-api/src/main/resources/META-INF/opennms/component-rrd-tcp.xml b/opennms-rrd/opennms-rrd-api/src/main/resources/META-INF/opennms/component-rrd-tcp.xml index aee9d53208dc..985f0680c364 100644 --- a/opennms-rrd/opennms-rrd-api/src/main/resources/META-INF/opennms/component-rrd-tcp.xml +++ b/opennms-rrd/opennms-rrd-api/src/main/resources/META-INF/opennms/component-rrd-tcp.xml @@ -2,7 +2,7 @@ diff --git a/opennms-services/src/main/resources/META-INF/opennms/applicationContext-pollerConfigDaos.xml b/opennms-services/src/main/resources/META-INF/opennms/applicationContext-pollerConfigDaos.xml index daf0f0804486..9b3733c22a2c 100644 --- a/opennms-services/src/main/resources/META-INF/opennms/applicationContext-pollerConfigDaos.xml +++ b/opennms-services/src/main/resources/META-INF/opennms/applicationContext-pollerConfigDaos.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-services/src/main/resources/META-INF/opennms/applicationContext-testPollerConfigDaos.xml b/opennms-services/src/main/resources/META-INF/opennms/applicationContext-testPollerConfigDaos.xml index 787a50488223..c66e56671217 100644 --- a/opennms-services/src/main/resources/META-INF/opennms/applicationContext-testPollerConfigDaos.xml +++ b/opennms-services/src/main/resources/META-INF/opennms/applicationContext-testPollerConfigDaos.xml @@ -2,7 +2,7 @@ diff --git a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-deviceConfigDao.xml b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-deviceConfigDao.xml index 2bd947e88d3c..9635ceb38d4d 100644 --- a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-deviceConfigDao.xml +++ b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-deviceConfigDao.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-deviceConfig.xml b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-deviceConfig.xml index 5f97ea182334..78fb57ab31be 100644 --- a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-deviceConfig.xml +++ b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-deviceConfig.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-sessionFactory.xml b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-sessionFactory.xml index 3a945e41fdcb..86e82f2eb536 100644 --- a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-sessionFactory.xml +++ b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-test-sessionFactory.xml @@ -5,7 +5,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-services/src/test/resources/org/opennms/spring/xml/applicationContext-testAOP.xml b/opennms-services/src/test/resources/org/opennms/spring/xml/applicationContext-testAOP.xml index 45785c9a6c76..c19eaab7e8b9 100644 --- a/opennms-services/src/test/resources/org/opennms/spring/xml/applicationContext-testAOP.xml +++ b/opennms-services/src/test/resources/org/opennms/spring/xml/applicationContext-testAOP.xml @@ -5,7 +5,7 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd diff --git a/opennms-web-api/src/main/resources/META-INF/opennms/component-service.xml b/opennms-web-api/src/main/resources/META-INF/opennms/component-service.xml index aa88d2bb859f..8cd4c6e11f95 100644 --- a/opennms-web-api/src/main/resources/META-INF/opennms/component-service.xml +++ b/opennms-web-api/src/main/resources/META-INF/opennms/component-service.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd "> diff --git a/opennms-webapp-rest/src/test/resources/META-INF/opennms/component-dao.xml b/opennms-webapp-rest/src/test/resources/META-INF/opennms/component-dao.xml index dc9fc5a85048..6baca36e7822 100644 --- a/opennms-webapp-rest/src/test/resources/META-INF/opennms/component-dao.xml +++ b/opennms-webapp-rest/src/test/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd"> diff --git a/opennms-webapp-rest/src/test/resources/applicationContext-rest-test.xml b/opennms-webapp-rest/src/test/resources/applicationContext-rest-test.xml index e1f0c998af6e..1bac829e28dd 100644 --- a/opennms-webapp-rest/src/test/resources/applicationContext-rest-test.xml +++ b/opennms-webapp-rest/src/test/resources/applicationContext-rest-test.xml @@ -3,7 +3,7 @@ xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd "> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/applicationContext-spring-security.xml b/opennms-webapp/src/main/webapp/WEB-INF/applicationContext-spring-security.xml index 457da99b149b..9d183d012feb 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/applicationContext-spring-security.xml +++ b/opennms-webapp/src/main/webapp/WEB-INF/applicationContext-spring-security.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd"> + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd"> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/activeDirectory.xml.disabled b/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/activeDirectory.xml.disabled index dd4196dc1b3b..bbd957934326 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/activeDirectory.xml.disabled +++ b/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/activeDirectory.xml.disabled @@ -2,7 +2,7 @@ diff --git a/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/attribute-preauth.xml b/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/attribute-preauth.xml index f476dafe2653..4b374055a01e 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/attribute-preauth.xml +++ b/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/attribute-preauth.xml @@ -2,7 +2,7 @@ diff --git a/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/header-preauth.xml b/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/header-preauth.xml index 3ab1dcd45d17..bfbbf95dd4a9 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/header-preauth.xml +++ b/opennms-webapp/src/main/webapp/WEB-INF/spring-security.d/header-preauth.xml @@ -2,7 +2,7 @@ diff --git a/opennms-webapp/src/test/resources/daoWebRepositoryTestContext.xml b/opennms-webapp/src/test/resources/daoWebRepositoryTestContext.xml index 6adf5e4145d1..c44c0ab74c45 100644 --- a/opennms-webapp/src/test/resources/daoWebRepositoryTestContext.xml +++ b/opennms-webapp/src/test/resources/daoWebRepositoryTestContext.xml @@ -1,5 +1,5 @@ - + diff --git a/opennms-webapp/src/test/resources/org/opennms/dashboard/applicationContext-svclayer-dashboard-test.xml b/opennms-webapp/src/test/resources/org/opennms/dashboard/applicationContext-svclayer-dashboard-test.xml index 89b092de5a45..b4eb23c7fd44 100644 --- a/opennms-webapp/src/test/resources/org/opennms/dashboard/applicationContext-svclayer-dashboard-test.xml +++ b/opennms-webapp/src/test/resources/org/opennms/dashboard/applicationContext-svclayer-dashboard-test.xml @@ -2,7 +2,7 @@ diff --git a/opennms-webapp/src/test/resources/org/opennms/web/svclayer/applicationContext-svclayer-test.xml b/opennms-webapp/src/test/resources/org/opennms/web/svclayer/applicationContext-svclayer-test.xml index 396ac7027984..e81a69e34ea9 100644 --- a/opennms-webapp/src/test/resources/org/opennms/web/svclayer/applicationContext-svclayer-test.xml +++ b/opennms-webapp/src/test/resources/org/opennms/web/svclayer/applicationContext-svclayer-test.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> diff --git a/opennms-wmi/src/main/resources/META-INF/opennms/detectors.xml b/opennms-wmi/src/main/resources/META-INF/opennms/detectors.xml index de45c764c264..30007ee5c30a 100644 --- a/opennms-wmi/src/main/resources/META-INF/opennms/detectors.xml +++ b/opennms-wmi/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/protocols/nsclient/src/main/resources/META-INF/opennms/detectors.xml b/protocols/nsclient/src/main/resources/META-INF/opennms/detectors.xml index a43048cb1cef..1a7465f686fb 100644 --- a/protocols/nsclient/src/main/resources/META-INF/opennms/detectors.xml +++ b/protocols/nsclient/src/main/resources/META-INF/opennms/detectors.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/protocols/radius/src/main/resources/META-INF/opennms/detectors.xml b/protocols/radius/src/main/resources/META-INF/opennms/detectors.xml index 1ada90b5ca63..397f563bebe3 100644 --- a/protocols/radius/src/main/resources/META-INF/opennms/detectors.xml +++ b/protocols/radius/src/main/resources/META-INF/opennms/detectors.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/protocols/xml/src/main/resources/META-INF/opennms/component-dao.xml b/protocols/xml/src/main/resources/META-INF/opennms/component-dao.xml index 0bc6519250d6..32a1a95dcd0f 100644 --- a/protocols/xml/src/main/resources/META-INF/opennms/component-dao.xml +++ b/protocols/xml/src/main/resources/META-INF/opennms/component-dao.xml @@ -4,7 +4,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:onmsgi="http://xmlns.opennms.org/xsd/spring/onms-osgi" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd http://xmlns.opennms.org/xsd/spring/onms-osgi http://xmlns.opennms.org/xsd/spring/onms-osgi.xsd" diff --git a/smoke-test/src/main/resources/opennms-overlay/etc/opennms-activemq.xml b/smoke-test/src/main/resources/opennms-overlay/etc/opennms-activemq.xml index 2c2efebad16a..528dd4a17bbe 100644 --- a/smoke-test/src/main/resources/opennms-overlay/etc/opennms-activemq.xml +++ b/smoke-test/src/main/resources/opennms-overlay/etc/opennms-activemq.xml @@ -18,7 +18,7 @@ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">