This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch scrR8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit e1b549051b706187ab0dd1fb94912cb5f70f7d38 Merge: 2de0937 88c71ec Author: Thomas Watson <[email protected]> AuthorDate: Tue Jun 1 12:42:11 2021 -0500 Merge branch 'master' into scrR8 cm.json/pom.xml | 12 +- .../org/apache/felix/cm/json/Configurations.java | 2 +- .../cm/json/impl/ConfigurationReaderImpl.java | 12 +- .../felix/cm/json/impl/OrderedDictionary.java | 274 ++++++++++-- .../org/apache/felix/cm/json/package-info.java | 2 +- .../cm/json/impl/ConfigurationReaderImplTest.java | 9 + .../felix/cm/json/impl/OrderedDictionaryTest.java | 134 ++++++ .../resources/configs/single-duplicatekeys.json | 4 + configadmin-plugins/interpolation/README.md | 7 +- configadmin-plugins/interpolation/pom.xml | 6 +- .../InterpolationConfigurationPlugin.java | 27 +- .../plugin/interpolation/Interpolator.java | 7 +- .../InterpolationConfigurationPluginTest.java | 43 +- .../interpolation/src/test/resources/foo.bar | 1 + .../src/test/resources/{ => other}/testfile.txt | 0 configadmin/README.md | 2 +- configadmin/pom.xml | 2 +- .../apache/felix/cm/file/ConfigurationHandler.java | 4 +- .../felix/cm/file/ConfigurationHandlerTest.java | 60 +++ configurator/pom.xml | 4 +- .../felix/configurator/impl/model/Config.java | 20 +- .../org/osgi/util/converter/ConvertingImpl.java | 8 +- .../org/osgi/util/converter/ConverterTest.java | 33 ++ .../.gradle-wrapper/gradle-wrapper.properties | 2 +- dependencymanager/changelog.txt | 16 + dependencymanager/cnf/build.bnd | 13 + dependencymanager/cnf/ext/libraries.bnd | 2 +- dependencymanager/cnf/repository.mvn | 14 +- dependencymanager/gradle.properties | 4 +- .../bnd.bnd | 2 +- .../changelog.txt | 13 + .../resources/DEPENDENCIES | 2 +- .../resources/NOTICE | 2 +- .../bnd.bnd | 2 +- .../changelog.txt | 13 + .../resources/DEPENDENCIES | 2 +- .../resources/NOTICE | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 28 +- .../bnd.bnd | 2 +- .../changelog.txt | 13 + .../resources/DEPENDENCIES | 2 +- .../resources/NOTICE | 2 +- .../bnd.bnd | 2 +- .../changelog.txt | 13 + .../resources/DEPENDENCIES | 2 +- .../resources/NOTICE | 2 +- .../org.apache.felix.dependencymanager/bnd.bnd | 2 +- .../changelog.txt | 13 +- .../resources/DEPENDENCIES | 2 +- .../resources/NOTICE | 2 +- dependencymanager/release/README.release | 26 +- dependencymanager/release/build.gradle | 29 +- dependencymanager/release/resources/bin/NOTICE | 2 +- dependencymanager/release/resources/bin/README.bin | 21 +- dependencymanager/release/resources/src/NOTICE | 2 +- dependencymanager/release/resources/src/README.src | 21 +- fileinstall/doc/changelog.txt | 11 + fileinstall/pom.xml | 40 +- .../fileinstall/internal/ConfigInstaller.java | 308 ++++++++++++-- .../fileinstall/internal/DirectoryWatcher.java | 8 +- .../apache/felix/fileinstall/internal/Scanner.java | 38 +- .../apache/felix/fileinstall/internal/Util.java | 8 + .../apache/felix/fileinstall/internal/Watcher.java | 28 +- .../felix/fileinstall/internal/WatcherScanner.java | 6 +- .../fileinstall/internal/ConfigInstallerTest.java | 179 ++++++-- framework.security/pom.xml | 4 +- framework/pom.xml | 57 ++- .../framework/URLHandlersBundleURLConnection.java | 35 +- .../java/org/apache/felix/framework/util/Util.java | 18 +- framework/src/main/java/org/osgi/dto/DTO.java | 462 +++++++++++---------- .../src/main/java/org/osgi/dto/package-info.java | 6 +- .../java/org/osgi/resource/dto/CapabilityDTO.java | 2 +- .../org/osgi/resource/dto/CapabilityRefDTO.java | 2 +- .../java/org/osgi/resource/dto/RequirementDTO.java | 2 +- .../org/osgi/resource/dto/RequirementRefDTO.java | 2 +- .../java/org/osgi/resource/dto/ResourceDTO.java | 2 +- .../main/java/org/osgi/resource/dto/WireDTO.java | 2 +- .../main/java/org/osgi/resource/dto/WiringDTO.java | 2 +- .../java/org/osgi/resource/dto/package-info.java | 6 +- .../main/java/org/osgi/resource/package-info.java | 6 +- .../osgi/service/packageadmin/package-info.java | 6 +- .../org/osgi/service/startlevel/package-info.java | 6 +- .../java/org/osgi/service/url/package-info.java | 6 +- .../java/org/osgi/util/tracker/package-info.java | 6 +- framework/src/main/resources/default.properties | 16 +- .../felix/framework/ResourceLoadingTest.java | 58 +++ http/itest/pom.xml | 2 +- http/jetty/pom.xml | 6 +- .../apache/felix/http/jetty/ConnectorFactory.java | 1 + .../felix/http/jetty/internal/JettyService.java | 4 +- inventory/changelog.txt | 10 +- inventory/pom.xml | 13 +- .../inventory/impl/InventoryPrinterAdapter.java | 30 +- .../impl/InventoryPrinterDescription.java | 18 +- .../impl/InventoryPrinterManagerImpl.java | 71 ++-- .../impl/helper/JSONConfigurationWriter.java | 15 +- .../org/apache/felix/inventory/FormatTest.java | 10 +- .../impl/helper/JSONConfigurationWriterTest.java | 27 +- .../felix/log/ConfigurationListenerImpl.java | 14 +- log/src/main/java/org/apache/felix/log/Log.java | 32 +- main/pom.xml | 81 +++- metatype/changelog.txt | 6 + metatype/pom.xml | 5 +- .../main/java/org/apache/felix/metatype/AD.java | 9 +- .../org/apache/felix/metatype/ADValidator.java | 45 +- .../java/org/apache/felix/metatype/ADTest.java | 20 +- .../org/apache/felix/metatype/ADValidatorTest.java | 11 +- .../java/org/osgi/service/resolver/Resolver.java | 8 +- .../org/osgi/service/resolver/package-info.java | 6 +- scr/changelog.txt | 28 ++ scr/pom.xml | 15 +- .../java/org/apache/felix/scr/impl/Activator.java | 6 +- .../scr/impl/config/ScrConfigurationImpl.java | 53 ++- .../felix/scr/impl/logger/ExtLogManager.java | 15 +- .../felix/scr/impl/logger/LogConfiguration.java | 97 +++++ .../apache/felix/scr/impl/logger/LogManager.java | 32 +- .../apache/felix/scr/impl/logger/NoOpLogger.java | 71 ++++ .../felix/scr/impl/logger/ScrLogManager.java | 30 +- .../felix/scr/impl/logger/ScrLoggerFactory.java | 71 ++++ .../felix/scr/impl/manager/DependencyManager.java | 2 +- .../felix/scr/impl/manager/ScrConfiguration.java | 24 +- .../apache/felix/scr/impl/logger/LoggerTest.java | 117 ++++-- .../scr/integration/ComponentConcurrencyTest.java | 1 + .../felix/scr/integration/ComponentTestBase.java | 2 +- tools/maven-bundle-plugin/pom.xml | 4 +- .../apache/felix/bundleplugin/BundlePlugin.java | 31 +- utils/pom.xml | 2 +- .../felix/utils/resource/ResourceBuilder.java | 7 +- webconsole/changelog.txt | 9 +- webconsole/pom.xml | 6 +- .../internal/configuration/ConfigAdminSupport.java | 7 +- .../internal/configuration/ConfigManager.java | 11 +- ...t.java => BasicWebConsoleSecurityProvider.java} | 141 ++----- .../webconsole/internal/servlet/OsgiManager.java | 28 +- .../internal/servlet/OsgiManagerHttpContext.java | 76 +--- .../main/resources/OSGI-INF/l10n/bundle.properties | 3 + webconsole/src/main/resources/res/ui/config.js | 34 +- .../src/main/resources/templates/config.html | 3 + .../servlet/OsgiManagerHttpContextTest.java | 9 +- 139 files changed, 2631 insertions(+), 1028 deletions(-)
