Discussion:
[opennms-cvs] [OpenNMS/opennms] fdd7a2: Allow the configs to be extended.
Jesse White
2017-07-20 13:51:50 UTC
Permalink
Branch: refs/heads/features/extend-the-config
Home: https://github.com/OpenNMS/opennms
Commit: fdd7a2f161e5d308ed7c7056d00d0c8d989c331b
https://github.com/OpenNMS/opennms/commit/fdd7a2f161e5d308ed7c7056d00d0c8d989c331b
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: a7c7ac72c6eb576db43997966180a14cfb83ba1c
https://github.com/OpenNMS/opennms/commit/a7c7ac72c6eb576db43997966180a14cfb83ba1c
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: db9c6368e70d1071bba701fd06c8d36a3916f1b0
https://github.com/OpenNMS/opennms/commit/db9c6368e70d1071bba701fd06c8d36a3916f1b0
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: 80bbdeadd5df3bedf99252b0b4f85310e32b7d62
https://github.com/OpenNMS/opennms/commit/80bbdeadd5df3bedf99252b0b4f85310e32b7d62
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: 7820c001cd6c6cf03f02d9608a8f0a86a4e173c0
https://github.com/OpenNMS/opennms/commit/7820c001cd6c6cf03f02d9608a8f0a86a4e173c0
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: 4f74878189c0a76af2d04b02f27f2748357c283b
https://github.com/OpenNMS/opennms/commit/4f74878189c0a76af2d04b02f27f2748357c283b
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: dd0706324843f46a55cdf83b891bfec234f21122
https://github.com/OpenNMS/opennms/commit/dd0706324843f46a55cdf83b891bfec234f21122
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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: 0ae6528f04ccce899f2a50d6799946eb56a3ecde
https://github.com/OpenNMS/opennms/commit/0ae6528f04ccce899f2a50d6799946eb56a3ecde
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 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.


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

Changed paths:
M opennms-dao/src/main/java/org/opennms/netmgt/dao/support/PropertiesGraphDao.java

Log Message:
-----------
Add support for extending snmp-graph.properties


Commit: 26b1a45377fe3eaf00b9aec0e905aae763b8db5b
https://github.com/OpenNMS/opennms/commit/26b1a45377fe3eaf00b9aec0e905aae763b8db5b
Author: Jesse White <***@opennms.org>
Date: 2017-07-20 (Thu, 20 Jul 2017)

Changed paths:
M opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java

Log Message:
-----------
Fix compilation error.


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

Changed paths:
M opennms-config/src/main/java/org/opennms/netmgt/config/DefaultEventConfDao.java

Log Message:
-----------
Add support for extensions to the eventconf.


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

Changed paths:
M core/spring/src/main/java/org/opennms/core/spring/ReloadableResource.java
M core/xml/src/main/java/org/opennms/core/xml/AbstractJaxbConfigDao.java

Log Message:
-----------
Avoid reading the input stream twice on init when dealing with non file resources.


Compare: https://github.com/OpenNMS/opennms/compare/a5c3f5253783...b925e3202665
Loading...