[commons-configuration] 02/02: Merge tag 'upstream/1.10'
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 3 04:48:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository commons-configuration.
commit 529ac53d40a25008c76dc69939de851c8691e821
Merge: f39634a 59b6103
Author: tony mancill <tmancill at debian.org>
Date: Wed Sep 2 21:47:14 2015 -0700
Merge tag 'upstream/1.10'
Upstream version 1.10
LICENSE.txt | 202 ++
NOTICE.txt | 5 +
RELEASE-NOTES.txt | 100 +
conf/CommonsConfiguration.xsd | 129 ++
conf/HEADER.txt | 16 +
conf/README | 4 +
conf/checkstyle-suppressions.xml | 33 +
conf/checkstyle.xml | 188 ++
conf/findbugs-exclude-filter.xml | 31 +
pom.xml | 681 ++++++
src/changes/changes.xml | 1805 +++++++++++++++
src/main/assembly/bin.xml | 45 +
src/main/assembly/src.xml | 40 +
.../configuration/AbstractConfiguration.java | 1309 +++++++++++
.../configuration/AbstractFileConfiguration.java | 1092 +++++++++
.../AbstractHierarchicalFileConfiguration.java | 579 +++++
.../commons/configuration/BaseConfiguration.java | 198 ++
.../configuration/BaseConfigurationXMLReader.java | 137 ++
.../configuration/CombinedConfiguration.java | 976 ++++++++
.../configuration/CompositeConfiguration.java | 578 +++++
.../commons/configuration/Configuration.java | 598 +++++
.../configuration/ConfigurationBuilder.java | 46 +
.../configuration/ConfigurationComparator.java | 40 +
.../configuration/ConfigurationConverter.java | 133 ++
.../configuration/ConfigurationException.java | 78 +
.../configuration/ConfigurationFactory.java | 903 ++++++++
.../commons/configuration/ConfigurationKey.java | 687 ++++++
.../commons/configuration/ConfigurationMap.java | 210 ++
.../ConfigurationRuntimeException.java | 79 +
.../commons/configuration/ConfigurationUtils.java | 759 +++++++
.../configuration/ConfigurationXMLReader.java | 364 +++
.../commons/configuration/ConversionException.java | 77 +
.../commons/configuration/DataConfiguration.java | 1979 ++++++++++++++++
.../configuration/DatabaseConfiguration.java | 709 ++++++
.../configuration/DefaultConfigurationBuilder.java | 1800 +++++++++++++++
.../commons/configuration/DefaultFileSystem.java | 373 +++
.../DynamicCombinedConfiguration.java | 935 ++++++++
.../configuration/EnvironmentConfiguration.java | 91 +
.../commons/configuration/FileConfiguration.java | 293 +++
.../commons/configuration/FileOptionsProvider.java | 75 +
.../apache/commons/configuration/FileSystem.java | 181 ++
.../commons/configuration/FileSystemBased.java | 32 +
.../configuration/HierarchicalConfiguration.java | 1769 ++++++++++++++
.../HierarchicalConfigurationConverter.java | 203 ++
.../HierarchicalConfigurationXMLReader.java | 211 ++
.../HierarchicalINIConfiguration.java | 884 +++++++
.../HierarchicalReloadableConfiguration.java | 81 +
.../HierarchicalXMLConfiguration.java | 42 +
.../commons/configuration/INIConfiguration.java | 493 ++++
.../commons/configuration/JNDIConfiguration.java | 482 ++++
.../org/apache/commons/configuration/Lock.java | 84 +
.../commons/configuration/MapConfiguration.java | 295 +++
.../MultiFileHierarchicalConfiguration.java | 871 +++++++
.../PatternSubtreeConfigurationWrapper.java | 541 +++++
.../configuration/PrefixedKeysIterator.java | 125 +
.../configuration/PropertiesConfiguration.java | 1516 ++++++++++++
.../PropertiesConfigurationLayout.java | 1064 +++++++++
.../commons/configuration/PropertyConverter.java | 1062 +++++++++
.../StrictConfigurationComparator.java | 82 +
.../configuration/SubnodeConfiguration.java | 347 +++
.../commons/configuration/SubsetConfiguration.java | 386 ++++
.../commons/configuration/SystemConfiguration.java | 97 +
.../commons/configuration/VFSFileSystem.java | 409 ++++
.../configuration/VerifiableOutputStream.java | 31 +
.../commons/configuration/XMLConfiguration.java | 1650 ++++++++++++++
.../configuration/XMLPropertiesConfiguration.java | 425 ++++
.../configuration/beanutils/BeanDeclaration.java | 102 +
.../configuration/beanutils/BeanFactory.java | 78 +
.../configuration/beanutils/BeanHelper.java | 521 +++++
.../beanutils/ConfigurationDynaBean.java | 244 ++
.../beanutils/ConfigurationDynaClass.java | 156 ++
.../beanutils/DefaultBeanFactory.java | 110 +
.../beanutils/XMLBeanDeclaration.java | 428 ++++
.../commons/configuration/beanutils/package.html | 35 +
.../event/ConfigurationErrorEvent.java | 94 +
.../event/ConfigurationErrorListener.java | 51 +
.../configuration/event/ConfigurationEvent.java | 159 ++
.../configuration/event/ConfigurationListener.java | 45 +
.../commons/configuration/event/EventSource.java | 364 +++
.../commons/configuration/event/package.html | 32 +
.../interpol/ConfigurationInterpolator.java | 389 ++++
.../configuration/interpol/ConstantLookup.java | 172 ++
.../configuration/interpol/EnvironmentLookup.java | 65 +
.../commons/configuration/interpol/ExprLookup.java | 334 +++
.../commons/configuration/interpol/package.html | 31 +
.../org/apache/commons/configuration/package.html | 33 +
.../plist/PropertyListConfiguration.java | 713 ++++++
.../plist/XMLPropertyListConfiguration.java | 804 +++++++
.../commons/configuration/plist/package.html | 31 +
.../reloading/FileChangedReloadingStrategy.java | 226 ++
.../reloading/InvariantReloadingStrategy.java | 47 +
.../reloading/ManagedReloadingStrategy.java | 94 +
.../reloading/ManagedReloadingStrategyMBean.java | 32 +
.../configuration/reloading/Reloadable.java | 31 +
.../configuration/reloading/ReloadingStrategy.java | 55 +
.../reloading/VFSFileChangedReloadingStrategy.java | 208 ++
.../commons/configuration/reloading/package.html | 34 +
.../configuration/resolver/CatalogResolver.java | 521 +++++
.../resolver/DefaultEntityResolver.java | 130 ++
.../configuration/resolver/EntityRegistry.java | 63 +
.../resolver/EntityResolverSupport.java | 41 +
.../commons/configuration/resolver/package.html | 31 +
.../configuration/tree/ConfigurationNode.java | 269 +++
.../tree/ConfigurationNodeVisitor.java | 67 +
.../tree/ConfigurationNodeVisitorAdapter.java | 65 +
.../tree/DefaultConfigurationKey.java | 876 +++++++
.../tree/DefaultConfigurationNode.java | 717 ++++++
.../tree/DefaultExpressionEngine.java | 545 +++++
.../configuration/tree/ExpressionEngine.java | 92 +
.../commons/configuration/tree/MergeCombiner.java | 164 ++
.../commons/configuration/tree/NodeAddData.java | 196 ++
.../commons/configuration/tree/NodeCombiner.java | 124 +
.../configuration/tree/OverrideCombiner.java | 153 ++
.../commons/configuration/tree/TreeUtils.java | 82 +
.../commons/configuration/tree/UnionCombiner.java | 211 ++
.../commons/configuration/tree/ViewNode.java | 119 +
.../apache/commons/configuration/tree/package.html | 31 +
.../xpath/ConfigurationNodeIteratorAttribute.java | 80 +
.../tree/xpath/ConfigurationNodeIteratorBase.java | 197 ++
.../xpath/ConfigurationNodeIteratorChildren.java | 144 ++
.../tree/xpath/ConfigurationNodePointer.java | 270 +++
.../xpath/ConfigurationNodePointerFactory.java | 89 +
.../tree/xpath/XPathExpressionEngine.java | 426 ++++
.../commons/configuration/tree/xpath/package.html | 32 +
.../configuration/web/AppletConfiguration.java | 65 +
.../configuration/web/BaseWebConfiguration.java | 113 +
.../configuration/web/ServletConfiguration.java | 75 +
.../web/ServletContextConfiguration.java | 76 +
.../web/ServletFilterConfiguration.java | 63 +
.../web/ServletRequestConfiguration.java | 91 +
.../apache/commons/configuration/web/package.html | 32 +
src/main/javacc/PropertyListParser.jj | 291 +++
src/main/resources/PropertyList-1.0.dtd | 35 +
src/main/resources/digesterRules.xml | 42 +
src/main/resources/properties.dtd | 29 +
src/site/resources/images/logo.png | Bin 0 -> 15567 bytes
src/site/resources/images/logo.xcf | Bin 0 -> 27319 bytes
src/site/resources/profile.cobertura | 0
src/site/site.xml | 42 +
src/site/xdoc/building.xml | 120 +
src/site/xdoc/dependencies.xml | 173 ++
src/site/xdoc/download_configuration.xml | 138 ++
src/site/xdoc/index.xml | 101 +
src/site/xdoc/issue-tracking.xml | 102 +
src/site/xdoc/javadocarchive.xml | 46 +
src/site/xdoc/mail-lists.xml | 202 ++
src/site/xdoc/userguide/howto_basicfeatures.xml | 361 +++
src/site/xdoc/userguide/howto_beans.xml | 358 +++
.../xdoc/userguide/howto_combinedconfiguration.xml | 758 ++++++
.../userguide/howto_compositeconfiguration.xml | 101 +
.../xdoc/userguide/howto_configurationbuilder.xml | 894 ++++++++
src/site/xdoc/userguide/howto_events.xml | 240 ++
src/site/xdoc/userguide/howto_filebased.xml | 244 ++
src/site/xdoc/userguide/howto_filesystems.xml | 131 ++
src/site/xdoc/userguide/howto_multitenant.xml | 171 ++
src/site/xdoc/userguide/howto_properties.xml | 445 ++++
src/site/xdoc/userguide/howto_utilities.xml | 279 +++
src/site/xdoc/userguide/howto_xml.xml | 1163 ++++++++++
src/site/xdoc/userguide/overview.xml | 213 ++
src/site/xdoc/userguide/user_guide.xml | 148 ++
.../configuration/BaseNonStringProperties.java | 191 ++
.../commons/configuration/ConfigurationAssert.java | 136 ++
.../ConfigurationErrorListenerImpl.java | 104 +
.../DatabaseConfigurationTestHelper.java | 230 ++
.../configuration/FileURLStreamHandler.java | 64 +
.../configuration/InterpolationTestHelper.java | 257 +++
.../org/apache/commons/configuration/Logging.java | 271 +++
.../configuration/MockInitialContextFactory.java | 241 ++
.../configuration/NonCloneableConfiguration.java | 70 +
.../commons/configuration/NonStringTestHolder.java | 160 ++
.../configuration/TestAbstractConfiguration.java | 195 ++
.../TestAbstractConfigurationBasicFeatures.java | 529 +++++
.../configuration/TestBaseConfiguration.java | 733 ++++++
.../TestBaseConfigurationXMLReader.java | 161 ++
.../configuration/TestBaseNullConfiguration.java | 434 ++++
.../commons/configuration/TestCatalogResolver.java | 106 +
.../configuration/TestCombinedConfiguration.java | 999 ++++++++
.../configuration/TestCompositeConfiguration.java | 931 ++++++++
...tCompositeConfigurationNonStringProperties.java | 41 +
.../commons/configuration/TestConfiguration.java | 46 +
.../configuration/TestConfigurationConverter.java | 141 ++
.../configuration/TestConfigurationFactory.java | 407 ++++
.../configuration/TestConfigurationKey.java | 262 +++
.../configuration/TestConfigurationMap.java | 92 +
.../configuration/TestConfigurationSet.java | 104 +
.../configuration/TestConfigurationUtils.java | 459 ++++
.../configuration/TestDataConfiguration.java | 2402 ++++++++++++++++++++
.../configuration/TestDatabaseConfiguration.java | 551 +++++
.../TestDefaultConfigurationBuilder.java | 1279 +++++++++++
.../TestDynamicCombinedConfiguration.java | 371 +++
.../TestEnvironmentConfiguration.java | 103 +
.../commons/configuration/TestEqualBehaviour.java | 258 +++
.../commons/configuration/TestEqualsProperty.java | 42 +
.../configuration/TestFileConfiguration.java | 652 ++++++
.../TestHierarchicalConfiguration.java | 1252 ++++++++++
.../TestHierarchicalConfigurationXMLReader.java | 77 +
.../TestHierarchicalINIConfiguration.java | 971 ++++++++
.../TestHierarchicalXMLConfiguration.java | 296 +++
.../configuration/TestINIConfiguration.java | 256 +++
.../configuration/TestJNDIConfiguration.java | 375 +++
.../configuration/TestJNDIEnvironmentValues.java | 152 ++
.../configuration/TestMapConfiguration.java | 159 ++
.../TestMapConfigurationRegression.java | 39 +
.../TestMultiFileHierarchicalConfiguration.java | 316 +++
.../configuration/TestNonStringProperties.java | 38 +
.../TestNullCompositeConfiguration.java | 451 ++++
.../TestNullJNDIEnvironmentValues.java | 151 ++
.../TestPatternSubtreeConfiguration.java | 71 +
.../configuration/TestPropertiesConfiguration.java | 1359 +++++++++++
.../TestPropertiesConfigurationLayout.java | 845 +++++++
.../configuration/TestPropertiesSequence.java | 146 ++
.../configuration/TestPropertyConverter.java | 390 ++++
.../TestStrictConfigurationComparator.java | 95 +
.../configuration/TestSubnodeConfiguration.java | 625 +++++
.../configuration/TestSubsetConfiguration.java | 352 +++
.../configuration/TestSystemConfiguration.java | 52 +
.../TestSystemConfigurationRegression.java | 35 +
.../configuration/TestThreesomeConfiguration.java | 67 +
.../configuration/TestVFSConfigurationBuilder.java | 1200 ++++++++++
.../TestWebdavConfigurationBuilder.java | 1059 +++++++++
.../configuration/TestXMLConfiguration.java | 1948 ++++++++++++++++
.../TestXMLPropertiesConfiguration.java | 146 ++
.../beanutils/BeanCreationTestBean.java | 61 +
.../BeanCreationTestBeanWithListChild.java | 66 +
.../configuration/beanutils/TestBeanHelper.java | 613 +++++
.../beanutils/TestConfigurationDynaBean.java | 734 ++++++
.../TestConfigurationDynaBeanXMLConfig.java | 45 +
.../beanutils/TestDefaultBeanFactory.java | 108 +
.../beanutils/TestXMLBeanDeclaration.java | 425 ++++
.../event/AbstractTestConfigurationEvents.java | 189 ++
.../event/AbstractTestFileConfigurationEvents.java | 148 ++
.../event/ConfigurationListenerTestImpl.java | 131 ++
.../event/TestDatabaseConfigurationEvents.java | 56 +
.../configuration/event/TestEventSource.java | 394 ++++
.../event/TestHierarchicalConfigurationEvents.java | 133 ++
.../event/TestMapConfigurationEvents.java | 36 +
.../event/TestPropertiesConfigurationEvents.java | 50 +
.../event/TestSubsetConfigurationEvents.java | 37 +
.../event/TestXMLConfigurationEvents.java | 48 +
.../interpol/TestConfigurationInterpolator.java | 351 +++
.../configuration/interpol/TestConstantLookup.java | 151 ++
.../interpol/TestEnvironmentLookup.java | 71 +
.../configuration/interpol/TestExprLookup.java | 92 +
.../plist/AbstractTestPListEvents.java | 67 +
.../plist/TestPropertyListConfiguration.java | 414 ++++
.../plist/TestPropertyListConfigurationEvents.java | 49 +
.../plist/TestPropertyListParser.java | 81 +
.../plist/TestXMLPropertyListConfiguration.java | 409 ++++
.../TestXMLPropertyListConfigurationEvents.java | 48 +
.../reloading/FileAlwaysReloadingStrategy.java | 51 +
.../reloading/FileRandomReloadingStrategy.java | 86 +
.../TestFileChangedReloadingStrategy.java | 228 ++
.../reloading/TestManagedReloadingStrategy.java | 68 +
.../TestVFSFileChangedReloadingStrategy.java | 159 ++
.../apache/commons/configuration/test/HsqlDB.java | 123 +
.../configuration/tree/AbstractCombinerTest.java | 95 +
.../tree/TestDefaultConfigurationKey.java | 516 +++++
.../tree/TestDefaultConfigurationNode.java | 507 +++++
.../tree/TestDefaultExpressionEngine.java | 539 +++++
.../configuration/tree/TestMergeCombiner.java | 184 ++
.../configuration/tree/TestNodeAddData.java | 107 +
.../configuration/tree/TestOverrideCombiner.java | 178 ++
.../configuration/tree/TestUnionCombiner.java | 136 ++
.../commons/configuration/tree/TestViewNode.java | 144 ++
.../tree/xpath/AbstractXPathTest.java | 156 ++
.../xpath/TestConfigurationIteratorAttributes.java | 103 +
.../TestConfigurationNodeIteratorChildren.java | 247 ++
.../tree/xpath/TestConfigurationNodePointer.java | 191 ++
.../xpath/TestConfigurationNodePointerFactory.java | 178 ++
.../tree/xpath/TestXPathExpressionEngine.java | 449 ++++
.../xpath/TestXPathExpressionEngineInConfig.java | 118 +
.../configuration/web/TestAppletConfiguration.java | 157 ++
.../web/TestServletConfiguration.java | 82 +
.../web/TestServletContextConfiguration.java | 119 +
.../web/TestServletFilterConfiguration.java | 99 +
.../web/TestServletRequestConfiguration.java | 146 ++
.../resources/01/testMultiConfiguration_1001.xml | 39 +
src/test/resources/catalog.xml | 25 +
src/test/resources/catalog2.xml | 26 +
.../resources/config/deep/deepinclude.properties | 15 +
src/test/resources/config/deep/deeptest.properties | 17 +
.../config/deep/deeptestinvalid.properties | 19 +
src/test/resources/config/deep/test.properties | 15 +
.../resources/config/deep/testEqualDeep.properties | 26 +
.../config/deep/testFileFromClasspath.xml | 23 +
src/test/resources/config/test.properties | 25 +
src/test/resources/configA.xml | 19 +
src/test/resources/configB.xml | 19 +
src/test/resources/dataset.xml | 76 +
src/test/resources/include-interpol.properties | 18 +
src/test/resources/include.properties | 19 +
src/test/resources/jndi.properties | 17 +
src/test/resources/log4j-test.xml | 33 +
src/test/resources/resolver.dtd | 19 +
src/test/resources/sample.xml | 28 +
src/test/resources/sample.xsd | 38 +
src/test/resources/sample_1001.xml | 24 +
src/test/resources/test.ini | 17 +
src/test/resources/test.plist | 60 +
src/test/resources/test.plist.xml | 103 +
src/test/resources/test.properties | 126 +
src/test/resources/test.properties.xml | 24 +
src/test/resources/test.xml | 119 +
src/test/resources/test2.plist.xml | 29 +
src/test/resources/test2.properties | 59 +
src/test/resources/testClasspath.properties | 67 +
src/test/resources/testComplexInitialization.xml | 50 +
.../testConfigurationInterpolatorUpdate.xml | 54 +
src/test/resources/testConfigurationProvider.xml | 53 +
.../resources/testConfigurationXMLDocument.xml | 26 +
src/test/resources/testDigesterBadXML.xml | 26 +
src/test/resources/testDigesterConfiguration.xml | 23 +
src/test/resources/testDigesterConfiguration2.xml | 31 +
src/test/resources/testDigesterConfiguration3.xml | 30 +
.../testDigesterConfigurationBasePath.xml | 27 +
.../testDigesterConfigurationInclude1.xml | 53 +
.../testDigesterConfigurationInclude2.properties | 22 +
.../testDigesterConfigurationNamespaceAware.xml | 23 +
.../testDigesterConfigurationOverwrite.properties | 21 +
.../testDigesterConfigurationReverseOrder.xml | 22 +
.../testDigesterConfigurationSysProps.xml | 23 +
.../testDigesterConfigurationWithProps.xml | 21 +
src/test/resources/testDigesterCreateObject.xml | 26 +
.../testDigesterOptionalConfiguration.xml | 33 +
.../testDigesterOptionalConfigurationEx.xml | 26 +
src/test/resources/testDtd.xml | 23 +
src/test/resources/testEncoding.xml | Bin 0 -> 1818 bytes
src/test/resources/testEqual.properties | 26 +
src/test/resources/testEqualDigester.xml | 21 +
src/test/resources/testExpression.xml | 56 +
src/test/resources/testExtendedClass.xml | 50 +
.../testExtendedXMLConfigurationProvider.xml | 54 +
.../resources/testFactoryPropertiesInclude.xml | 24 +
.../testFileReloadConfigurationBuilder.xml | 51 +
.../testFileReloadConfigurationBuilder2.xml | 51 +
src/test/resources/testFileSystem.xml | 54 +
src/test/resources/testGlobalLookup.xml | 53 +
.../resources/testHierarchicalXMLConfiguration.xml | 72 +
.../testHierarchicalXMLConfiguration2.xml | 47 +
src/test/resources/testInterpolation.properties | 22 +
src/test/resources/testInterpolation.xml | 31 +
src/test/resources/testInterpolationBuilder.xml | 31 +
src/test/resources/testMultiConfiguration.xsd | 113 +
src/test/resources/testMultiConfiguration_1001.xml | 39 +
src/test/resources/testMultiConfiguration_1002.xml | 31 +
src/test/resources/testMultiConfiguration_1003.xml | 31 +
src/test/resources/testMultiConfiguration_1004.xml | 26 +
src/test/resources/testMultiConfiguration_2001.xml | 28 +
src/test/resources/testMultiConfiguration_2002.xml | 33 +
src/test/resources/testMultiConfiguration_3001.xml | 40 +
src/test/resources/testMultiConfiguration_3002.xml | 32 +
.../resources/testMultiConfiguration_default.xml | 49 +
src/test/resources/testMultiDynamic_default.xml | 56 +
src/test/resources/testMultiDynamic_default2.xml | 57 +
.../testMultiTenentConfigurationBuilder.xml | 46 +
.../testMultiTenentConfigurationBuilder2.xml | 51 +
.../testMultiTenentConfigurationBuilder3.xml | 51 +
.../testMultiTenentConfigurationBuilder4.xml | 55 +
.../testMultiTenentConfigurationBuilder5.xml | 51 +
src/test/resources/testPatternSubtreeConfig.xml | 61 +
src/test/resources/testResolver.xml | 22 +
src/test/resources/testSequence.properties | 23 +
src/test/resources/testSequenceDigester.xml | 21 +
src/test/resources/testSystemProperties.xml | 32 +
.../testVFSMultiTenentConfigurationBuilder1.xml | 52 +
.../testVFSMultiTenentConfigurationBuilder2.xml | 52 +
src/test/resources/testValidateInvalid.xml | 48 +
src/test/resources/testValidateValid.xml | 46 +
src/test/resources/testValidation.xml | 32 +
src/test/resources/testValidation2.xml | 32 +
src/test/resources/testValidation3.xml | 41 +
src/test/resources/test_invalid_date.plist.xml | 32 +
src/test/resources/testcombine1.xml | 79 +
src/test/resources/testcombine2.xml | 78 +
src/test/resources/testdb.script | 95 +
src/test/resources/threesome.properties | 22 +
376 files changed, 90610 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-configuration.git
More information about the pkg-java-commits
mailing list