Discussion:
[opennms-cvs] [OpenNMS/opennms] b47ee8: Allow the configs to be extended.
Jesse White
2017-07-19 15:59:49 UTC
Permalink
Branch: refs/heads/features/extend-the-config
Home: https://github.com/OpenNMS/opennms
Commit: b47ee891beef14f90a1bf37fb816363836ab1780
https://github.com/OpenNMS/opennms/commit/b47ee891beef14f90a1bf37fb816363836ab1780
Author: Jesse White <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)

Changed paths:
M core/xml/pom.xml
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
A core/xml/src/main/java/org/opennms/core/xml/ConfigProvider.java
A core/xml/src/test/java/org/opennms/core/xml/AbstractMergingJaxbConfigDaoTest.java

Log Message:
-----------
Allow the configs to be extended.


Commit: 0b11bac36781ea045b892420be3591521dca7f6b
https://github.com/OpenNMS/opennms/commit/0b11bac36781ea045b892420be3591521dca7f6b
Author: Jesse White <***@opennms.org>
Date: 2017-07-17 (Mon, 17 Jul 2017)

Changed paths:
M core/test-api/collection/src/main/java/org/opennms/core/collection/test/JUnitCollectorExecutionListener.java
M core/upgrade/src/main/java/org/opennms/upgrade/implementations/DataCollectionConfigMigrator17Offline.java
M core/upgrade/src/main/java/org/opennms/upgrade/implementations/SnmpInterfaceRrdMigratorOnline.java
M core/upgrade/src/test/java/org/opennms/upgrade/implementations/SnmpInterfaceRrdMigratorOnlineTest.java
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/DatacollectionConfig.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/IncludeCollection.java
M opennms-config/src/main/java/org/opennms/netmgt/config/DataCollectionConfigFactory.java
M opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java
M opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigFactoryTest.java
M opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigParserTest.java
A opennms-config/src/test/resources/NMS8030/etc/snmp-datacollection-config.d/.keep
M opennms-dao/src/test/java/org/opennms/netmgt/dao/DefaultDataCollectionConfigDaoIT.java
M opennms-services/src/test/java/org/opennms/netmgt/collectd/CollectorConfigDaoImplIT.java
M protocols/xml/src/test/java/org/opennms/protocols/xml/collector/HttpDataCollectionIT.java
M protocols/xml/src/test/java/org/opennms/protocols/xml/collector/NMS7963IT.java

Log Message:
-----------
First take at extending datacollection-config.xml.


Commit: 5269374253f8555f9e813854e1830d8d0f2a12d3
https://github.com/OpenNMS/opennms/commit/5269374253f8555f9e813854e1830d8d0f2a12d3
Author: Jesse White <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths:
A NOTES
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/DatacollectionConfig.java
M opennms-config/src/main/resources/META-INF/opennms/applicationContext-commonConfigs.xml
M opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigParserTest.java
A opennms-config/src/test/resources/ext/etc/datacollection-config.xml
A opennms-config/src/test/resources/ext/etc/datacollection/cisco-customized.xml
A opennms-config/src/test/resources/ext/etc/datacollection/cisco.xml
A opennms-config/src/test/resources/ext/etc/datacollection/mib2.xml
A opennms-config/src/test/resources/ext/etc/snmp-datacollection-config.d/.keep
A opennms-config/src/test/resources/ext/etc/snmp-datacollection-config.d/my.xml
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/config/DataCollectionConfigResource.java

Log Message:
-----------
Working extensions for the SNMP DC config.


Commit: 5704d0e61a2ede07984d5a52d98c45fa42cf8708
https://github.com/OpenNMS/opennms/commit/5704d0e61a2ede07984d5a52d98c45fa42cf8708
Author: Jesse White <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths:
R NOTES
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/DatacollectionConfig.java
M opennms-config/src/main/resources/META-INF/opennms/applicationContext-commonConfigs.xml
M opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigParserTest.java
R opennms-config/src/test/resources/ext/etc/datacollection-config.xml
R opennms-config/src/test/resources/ext/etc/datacollection/cisco-customized.xml
R opennms-config/src/test/resources/ext/etc/datacollection/cisco.xml
R opennms-config/src/test/resources/ext/etc/datacollection/mib2.xml
R opennms-config/src/test/resources/ext/etc/snmp-datacollection-config.d/.keep
R opennms-config/src/test/resources/ext/etc/snmp-datacollection-config.d/my.xml
M opennms-webapp-rest/src/main/java/org/opennms/web/rest/v1/config/DataCollectionConfigResource.java

Log Message:
-----------
Revert "Working extensions for the SNMP DC config."

This reverts commit 5269374253f8555f9e813854e1830d8d0f2a12d3.


Commit: 8e8f9471d1d04db563bdeb4fab334bd2b3198f6a
https://github.com/OpenNMS/opennms/commit/8e8f9471d1d04db563bdeb4fab334bd2b3198f6a
Author: Jesse White <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths:
M core/test-api/collection/src/main/java/org/opennms/core/collection/test/JUnitCollectorExecutionListener.java
M core/upgrade/src/main/java/org/opennms/upgrade/implementations/DataCollectionConfigMigrator17Offline.java
M core/upgrade/src/main/java/org/opennms/upgrade/implementations/SnmpInterfaceRrdMigratorOnline.java
M core/upgrade/src/test/java/org/opennms/upgrade/implementations/SnmpInterfaceRrdMigratorOnlineTest.java
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/DatacollectionConfig.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/IncludeCollection.java
M opennms-config/src/main/java/org/opennms/netmgt/config/DataCollectionConfigFactory.java
M opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java
M opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigFactoryTest.java
M opennms-config/src/test/java/org/opennms/netmgt/config/DataCollectionConfigParserTest.java
R opennms-config/src/test/resources/NMS8030/etc/snmp-datacollection-config.d/.keep
M opennms-dao/src/test/java/org/opennms/netmgt/dao/DefaultDataCollectionConfigDaoIT.java
M opennms-services/src/test/java/org/opennms/netmgt/collectd/CollectorConfigDaoImplIT.java
M protocols/xml/src/test/java/org/opennms/protocols/xml/collector/HttpDataCollectionIT.java
M protocols/xml/src/test/java/org/opennms/protocols/xml/collector/NMS7963IT.java

Log Message:
-----------
Revert "First take at extending datacollection-config.xml."

This reverts commit 0b11bac36781ea045b892420be3591521dca7f6b.


Commit: a00b4dd14064d8a098251c0a147a221db535adcb
https://github.com/OpenNMS/opennms/commit/a00b4dd14064d8a098251c0a147a221db535adcb
Author: Jesse White <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths:
M core/xml/pom.xml
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
R core/xml/src/main/java/org/opennms/core/xml/ConfigProvider.java
R core/xml/src/test/java/org/opennms/core/xml/AbstractMergingJaxbConfigDaoTest.java

Log Message:
-----------
Revert "Allow the configs to be extended."

This reverts commit b47ee891beef14f90a1bf37fb816363836ab1780.


Commit: 8fd8ed6826d5d480d198afc5446f88624ad3021e
https://github.com/OpenNMS/opennms/commit/8fd8ed6826d5d480d198afc5446f88624ad3021e
Author: Jesse White <***@opennms.org>
Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths:
M core/xml/pom.xml
M core/xml/src/main/java/org/opennms/core/xml/AbstractMergingJaxbConfigDao.java
A core/xml/src/main/java/org/opennms/core/xml/ConfigProvider.java
A core/xml/src/test/java/org/opennms/core/xml/AbstractMergingJaxbConfigDaoTest.java
M opennms-config-jaxb/src/main/java/org/opennms/netmgt/config/datacollection/DatacollectionConfig.java

Log Message:
-----------
Keep the good stuff.


Commit: 6f2916164fb97b0201ab7bf3c2acb41a200f9ba0
https://github.com/OpenNMS/opennms/commit/6f2916164fb97b0201ab7bf3c2acb41a200f9ba0
Author: Jesse White <***@opennms.org>
Date: 2017-07-19 (Wed, 19 Jul 2017)

Changed paths:
M core/api/pom.xml
A core/api/src/main/java/org/opennms/core/config/api/ClasspathResourceConfigurationProvider.java
A core/api/src/main/java/org/opennms/core/config/api/ConfigReloadContainer.java
A core/api/src/main/java/org/opennms/core/config/api/ConfigurationProvider.java
A core/api/src/main/java/org/opennms/core/config/api/ReloadableFile.java
A core/api/src/main/java/org/opennms/core/config/api/ReloadingContainer.java
A core/api/src/main/java/org/opennms/core/config/api/StringConfigurationProvider.java
A core/api/src/test/java/org/opennms/core/config/api/ConfigReloadingContainerTest.java
M core/spring/pom.xml
M core/spring/src/main/java/org/opennms/core/spring/FileReloadContainer.java
A core/spring/src/main/java/org/opennms/core/spring/ReloadableResource.java
M core/xml/pom.xml
M core/xml/src/main/java/org/opennms/core/xml/AbstractJaxbConfigDao.java
M opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java
M opennms-config/src/test/java/org/opennms/netmgt/config/JMXDataCollectionConfigDaoTest.java
M opennms-dao/src/main/java/org/opennms/netmgt/dao/jaxb/DefaultJavamailConfigurationDao.java
M opennms-dao/src/main/java/org/opennms/netmgt/dao/jaxb/DefaultMicroblogConfigurationDao.java

Log Message:
-----------
Revised implementation.


Compare: https://github.com/OpenNMS/opennms/compare/b47ee891beef^...6f2916164fb9
Loading...