You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2021/09/03 16:44:24 UTC
[felix-dev] branch scrR8 updated (b503f5d -> 4f2f15e)
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from b503f5d Reference target attributes must not override component properties
add 143ba44 Move OSGi Converter to OSGi at Eclipse
add 7af9efd Revert commit 143ba444db23ca1746a8e28824025bb6b2327ca8 for now.
add f065b19 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.16
add 1f9722e [maven-release-plugin] prepare for next development iteration
add 9387b52 [maven-release-plugin] prepare release org.apache.felix.converter-1.0.18
add 693d09c [maven-release-plugin] prepare for next development iteration
add 7c78fc7 FELIX-6422 : Use property type password in metatype info for passwords
add f070d00 FELIX-6423 : Use property type password for password
add e013310 Update webconsole changelog
add 4b28bcb FELIX-6424 : Update commons-io to 2.8.0
add 03fb0e5 FELIX-6425 : Update Jetty to 9.4.42.v20210604
add 22f6264 FELIX-6426: Update tomcat dependency to 8.5.66 (#78)
add fd13f2c Remove import package header
add b0c6079 [maven-release-plugin] prepare release org.apache.felix.http.servlet-api-1.1.4
add 8a65c36 [maven-release-plugin] prepare for next development iteration
add c6eab25 FELIX-6427 : Obfuscate configuration properties marked as password in metatype in configuration printer
add e08d253 FELIX-6428 : Provide a compatibility switch to enable password detection heuristic
add 9738d2a Update to inventory release
add b31df58 [maven-release-plugin] prepare release org.apache.felix.inventory-1.1.0
add d7c6ff9 [maven-release-plugin] prepare for next development iteration
add 53ce5c5 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.6.2
add d215906 [maven-release-plugin] prepare for next development iteration
add 8a1a50c [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.1.10
add d16746b [maven-release-plugin] prepare for next development iteration
add e187a3e FELIX-6430: fix usage of unsave (#80)
add 5425822 Minor comment cleanup
add 8208244 Minor cleanup
add 94ac077 Update changelogs
add f04fdb2 Cleanup
add 71cf760 FELIX-6430: fallback to builtin url handlers if we can't reflect on unsave
add f82dedc Update changelog
add ad47a52 [maven-release-plugin] prepare release org.apache.felix.resolver-2.0.4
add 6a59be9 [maven-release-plugin] prepare for next development iteration
add ea222cd Update version after release
add a8663af [maven-release-plugin] prepare release org.apache.felix.framework-7.0.1
add 16998aa [maven-release-plugin] prepare for next development iteration
add c52bd45 [maven-release-plugin] prepare release org.apache.felix.framework.security-2.8.1
add 505f29c [maven-release-plugin] prepare for next development iteration
add 1bca484 [maven-release-plugin] prepare release org.apache.felix.main-7.0.1
add 88ec06a [maven-release-plugin] prepare for next development iteration
add 47cadd3 Update framework version
add da3f110 [maven-release-plugin] prepare release org.apache.felix.main.distribution-7.0.1
add 2d8f01f [maven-release-plugin] prepare for next development iteration
add 09c897e FELIX-6436 : Exclude default values (from metatype) in Configuration
add 0d0ca21 Update changelog.txt in preparation for SCR 2.1.28 release
add 057bb85 Fix javadoc generation with JDK11
add e98ed85 [maven-release-plugin] prepare release org.apache.felix.scr-2.1.28
add 8df85ce [maven-release-plugin] prepare for next development iteration
add bbadfa2 FELIX-6441 Make it possible to run the Configuration Interpolation independently of Configuration Admin
add 67ab32b Merge pull request #83 from bosschaert/FELIX-6441-sq
add 744f1e4 FELIX-6441 - mention StandaloneInterpolator in README
add 53ef77e FELIX-6441 Make it possible to run the Configuration Interpolation independently of Configuration Admin
add 0b9b7d2 Merge pull request #85 from bosschaert/FELIX-6441-2
add 1b645db [maven-release-plugin] prepare release org.apache.felix.configadmin.plugin.interpolation-1.2.0
add 1f68433 [maven-release-plugin] prepare for next development iteration
add 194d23e FELIX-6399 : Reduce resource consumption during component checks
add c0431fb FELIX-6401 : Add deprecation annotations to systemready api
add 5f82178 FELIX-6400 : Reduce resource consumption during component checks
add 53490bf FELIX-6442 : NPE when generating ServiceReferenceDTOs (#86)
add cf2cf3c Introduced thread-safety while updating field during deactivation phase
add 6695a8a Merge pull request #81 from amitjoy/bug/FELIX-6439/npe-treemap
add f0d8815 FELIX-6442 : NPE when generating ServiceReferenceDTOs (#87)
add 8153539 FELIX-6399 : Reduce resource consumption during component checks
add 861d0ac FELIX-6401 : Add deprecation annotations to systemready api
add 058c863 Update test dependency to Apache Johnzon 1.2.14
add fc5e365e FELIX-6399 : Reduce resource consumption during component checks
add 465bb43 FELIX-6399 : Reduce resource consumption during component checks
add a3abd50 FELIX-6399 : Reduce resource consumption during component checks
add 286d7da FELIX-6445 : Recursive reference detection throws excepteion
add 50b85f1 FELIX-6217 : RootCauseCommand#rootcause causes a NoSuchElementException for OSGI comonents that do not exist
add 7a09233 FELIX-6400 : Reduce resource consumption during component checks
add 337d2ad FELIX-6447 : Log every status change of a HC
add fb3e84a Update to rootcause 0.2.0
add f6be149 [maven-release-plugin] prepare release org.apache.felix.healthcheck.core-2.0.10
add 30d1b4b [maven-release-plugin] prepare for next development iteration
add bda76d9 [maven-release-plugin] prepare release org.apache.felix.rootcause-0.2.0
add ccee23d [maven-release-plugin] prepare for next development iteration
add 04e5554 Correct scm info
add 30bf2fd [maven-release-plugin] prepare release org.apache.felix.systemready-0.5.0
add 0a5db36 [maven-release-plugin] prepare for next development iteration
add f72d2ee [maven-release-plugin] prepare release org.apache.felix.healthcheck.generalchecks-2.0.8
add 89b1e93 [maven-release-plugin] prepare for next development iteration
add ef866c1 FELIX-6448 : Simplify result cache for components check
add 57cd739 FELIX-6448 : Simplify result cache for components check
add d381c9c FELIX-6444 Contribute a compatible implementation of OSGi Features
add 6eff0d0 Merge pull request #88 from bosschaert/features-contribution
add 6d3be0d FELIX-6448 : Simplify result cache for components check
add 7c0747c FELIX-6449 : Make all health checks immediate
add ebb59b8 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.6.4
add 0956977 [maven-release-plugin] prepare for next development iteration
add f7ee499 [maven-release-plugin] prepare release org.apache.felix.systemready-0.6.0
add cab11b3 [maven-release-plugin] prepare for next development iteration
add 9124689 [maven-release-plugin] prepare release org.apache.felix.healthcheck.generalchecks-2.0.10
add cd9df15 [maven-release-plugin] prepare for next development iteration
add 5e30c21 Add support for variables
add 1743e11 Merge pull request #89 from bosschaert/features_impl_1
add 1d53fa9 FELIX-6452 : Potential NPE in HttpRequestsCheck.activate
add f8784a2 Remove spurious import
add 9287b26 [Features] Don't rely on internal cm.json classes.
add ebdd855 Merge pull request #91 from bosschaert/cmreader
add ee485b0 [Features] Register Feature Service
add a54097b Merge pull request #92 from bosschaert/features_reg_svc
add ffa4312 [maven-release-plugin] prepare release org.apache.felix.healthcheck.generalchecks-2.0.12
add e16919d [maven-release-plugin] prepare for next development iteration
add d600205 FELIX-6367 : Provide SPI for configuration management (WiP)
add f8dd428 FELIX-6453 : Change in configuration handling introduces by FELIX-6436
add b298317 FELIX-6367 : Provide SPI for configuration management (WiP)
add 82bc11c FELIX-6367 add null check (#94)
add 92f677b FELIX-6367 : Provide SPI for configuration management (WiP)
add 4431984 Fixes for gaps identified by the TCK
add 9abf655 Merge pull request #93 from bosschaert/tck_fixes
add 8d5e7c9 Features - fix typo in Exception-message
add 8016221 Merge pull request #95 from apache/stbischof-patch-1
add 52df6b2 Feature - Fix type in Exception-message (2)
add d07d1e8 Merge pull request #96 from stbischof/typo
add b3df153 FELIX-6367 : Provide SPI for configuration management (WiP)
add abf81ce FELIX-6434 : errorhandler can commit the response wice
add 33772fc FELIX-6456 : Update Jetty to 9.4.43.v20210629
add 5e247f4 FELIX-6367 : Provide SPI for configuration management
add b2454d5 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.7.0
add e9c74bb [maven-release-plugin] prepare for next development iteration
add 7fd0243 Prepare for release
add bd67e19 [maven-release-plugin] prepare release org.apache.felix.http.base-4.1.4
add 8bda502 [maven-release-plugin] prepare for next development iteration
add 3ce2804 [maven-release-plugin] prepare release org.apache.felix.http.bridge-4.1.4
add 613e06e [maven-release-plugin] prepare for next development iteration
add 74ccc4b [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.1.12
add 9c0b361 [maven-release-plugin] prepare for next development iteration
add 096b5fa [maven-release-plugin] prepare release org.apache.felix.scr-2.1.30
add 7481a12 [maven-release-plugin] prepare for next development iteration
add 1fc28f2 Update johnzon dependency
add 9c29711 Convert tabs to spaces
add 41f6f34 [Features] Add SCM info
add adc9559 [Features] Update OSGi API dependency to RC1
add 2ac4785 [maven-release-plugin] prepare release org.apache.felix.feature-0.9.0-RC1
add b50b6af [maven-release-plugin] prepare for next development iteration
new 4f2f15e Merge branch 'master' into scrR8
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cm.json/pom.xml | 2 +-
configadmin-plugins/interpolation/README.md | 7 +-
configadmin-plugins/interpolation/pom.xml | 2 +-
.../plugin/interpolation/Activator.java | 2 +-
.../InterpolationConfigurationPlugin.java | 11 +-
.../interpolation/StandaloneInterpolator.java | 83 ++
.../InterpolationConfigurationPluginTest.java | 12 +-
.../interpolation/StandaloneInterpolatorTest.java | 124 +++
.../interpolation/src/test/resources/res1/my.db | 1 +
converter/converter/pom.xml | 2 +-
.../interpolation => features}/pom.xml | 110 ++-
.../org/apache/felix/feature/impl/Activator.java | 34 +
.../felix/feature/impl/ArtifactBuilderImpl.java | 116 +++
.../felix/feature/impl/BuilderFactoryImpl.java | 59 ++
.../felix/feature/impl/BundleBuilderImpl.java | 116 +++
.../feature/impl/ConfigurationBuilderImpl.java | 112 +++
.../felix/feature/impl/ExtensionBuilderImpl.java | 151 ++++
.../felix/feature/impl/FeatureBuilderImpl.java | 275 ++++++
.../felix/feature/impl/FeatureServiceImpl.java | 460 ++++++++++
.../java/org/apache/felix/feature/impl/IDImpl.java | 221 +++++
.../org.osgi.service.feature.FeatureService | 1 +
.../felix/feature/impl/BundleBuilderImplTest.java | 105 +++
.../felix/feature/impl/FeatureServiceImplTest.java | 314 +++++++
.../src/test/resources/features/test-exfeat1.json | 26 +
.../src/test/resources/features/test-exfeat2.json | 9 +
.../src/test/resources/features/test-feature.json | 38 +
.../src/test/resources/features/test-feature2.json | 19 +
framework.security/doc/changelog.txt | 6 +
framework.security/pom.xml | 4 +-
framework/doc/changelog.txt | 11 +
framework/pom.xml | 3 +
.../org/apache/felix/framework/BundleImpl.java | 3 +-
.../apache/felix/framework/BundleRevisionImpl.java | 17 +-
.../org/apache/felix/framework/DTOFactory.java | 20 +-
.../org/apache/felix/framework/URLHandlers.java | 34 +-
.../framework/URLHandlersStreamHandlerProxy.java | 77 +-
.../apache/felix/framework/util/SecureAction.java | 60 +-
healthcheck/core/pom.xml | 23 +-
.../core/impl/executor/HealthCheckResultCache.java | 9 +-
healthcheck/generalchecks/pom.xml | 54 +-
.../hc/generalchecks/BundlesStartedCheck.java | 20 +-
.../apache/felix/hc/generalchecks/CpuCheck.java | 2 +-
.../felix/hc/generalchecks/DiskSpaceCheck.java | 2 +-
.../felix/hc/generalchecks/DsComponentsCheck.java | 152 ++--
.../hc/generalchecks/FrameworkStartCheck.java | 4 +-
.../felix/hc/generalchecks/HttpRequestsCheck.java | 174 ++--
.../felix/hc/generalchecks/JmxAttributeCheck.java | 30 +-
.../apache/felix/hc/generalchecks/MemoryCheck.java | 4 +-
.../hc/generalchecks/ScriptedHealthCheck.java | 14 +-
.../felix/hc/generalchecks/ServicesCheck.java | 34 +-
.../felix/hc/generalchecks/ThreadUsageCheck.java | 6 +-
.../generalchecks/scrutil/DsRootCauseAdapter.java | 9 +-
.../generalchecks/scrutil/DsRootCauseAnalyzer.java | 11 +-
http/base/pom.xml | 2 +-
.../http/base/internal/dispatch/Dispatcher.java | 15 +-
http/bridge/pom.xml | 4 +-
http/itest/pom.xml | 2 +-
http/jetty/pom.xml | 12 +-
.../jetty/internal/ConfigMetaTypeProvider.java | 22 +-
http/servlet-api/pom.xml | 8 +-
inventory/pom.xml | 5 +-
main.distribution/doc/changelog.txt | 6 +
main.distribution/doc/changelog_framework.txt | 11 +
main.distribution/doc/changelog_main.txt | 6 +
main.distribution/doc/changelog_resolver.txt | 6 +
main.distribution/pom.xml | 2 +-
main/doc/changelog.txt | 6 +
main/pom.xml | 3 +
resolver/doc/changelog.txt | 6 +
rootcause/bnd.bnd | 0
rootcause/pom.xml | 35 +-
.../java/org/apache/felix/rootcause/DSComp.java | 6 +
.../java/org/apache/felix/rootcause/DSRef.java | 7 +
.../org/apache/felix/rootcause/DSRootCause.java | 122 ++-
.../apache/felix/rootcause/RootCauseCommand.java | 11 +-
.../apache/felix/rootcause/RootCausePrinter.java | 36 +-
.../apache/felix/rootcause/DSRootCauseTest.java | 29 +-
.../org/apache/felix/rootcause/util/BaseTest.java | 10 +-
scr/changelog.txt | 6 +
scr/pom.xml | 1 +
.../felix/scr/impl/inject/field/FieldHandler.java | 27 +-
.../scr/impl/manager/ComponentContextImpl.java | 13 +-
systemready/pom.xml | 89 +-
.../org/apache/felix/systemready/CheckStatus.java | 5 +
.../org/apache/felix/systemready/StateType.java | 7 +-
.../org/apache/felix/systemready/SystemReady.java | 4 +
.../apache/felix/systemready/SystemReadyCheck.java | 5 +-
.../felix/systemready/SystemReadyMonitor.java | 4 +
.../org/apache/felix/systemready/SystemStatus.java | 9 +-
.../felix/systemready/impl/ComponentsCheck.java | 99 ++-
.../felix/systemready/impl/ServicesCheck.java | 12 +-
.../systemready/impl/SystemReadyMonitorImpl.java | 103 ++-
.../systemready/osgi/ComponentsCheckTest.java | 20 +-
.../systemready/osgi/SystemReadyMonitorTest.java | 2 +-
.../felix/systemready/osgi/util/BaseTest.java | 28 +-
webconsole/changelog.txt | 8 +
webconsole/pom.xml | 15 +-
.../org/apache/felix/webconsole/internal/Util.java | 21 +
.../internal/configuration/ConfigAdminSupport.java | 987 +++++----------------
.../internal/configuration/ConfigJsonSupport.java | 494 +++++++++++
.../internal/configuration/ConfigManager.java | 226 ++---
.../ConfigurationAdminConfigurationPrinter.java | 113 ++-
.../internal/configuration/ConfigurationUtil.java | 161 ++++
.../internal/configuration/MetaTypeSupport.java | 17 +-
.../configuration/MetatypePropertyDescriptor.java | 6 +
.../internal/configuration/PropertyDescriptor.java | 4 +
.../webconsole/internal/misc/ServletSupport.java | 41 +-
.../servlet/ConfigurationMetatypeSupport.java | 38 +-
.../internal/servlet/ConfigurationUtil.java | 29 +
.../webconsole/internal/servlet/OsgiManager.java | 25 +
.../felix/webconsole/spi/ConfigurationHandler.java | 71 ++
.../felix/webconsole/spi/ValidationException.java | 17 +-
.../apache/felix/webconsole/spi/package-info.java | 6 +-
.../main/resources/OSGI-INF/l10n/bundle.properties | 4 +
114 files changed, 4684 insertions(+), 1600 deletions(-)
create mode 100644 configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolator.java
create mode 100644 configadmin-plugins/interpolation/src/test/java/org/apache/felix/configadmin/plugin/interpolation/StandaloneInterpolatorTest.java
create mode 100644 configadmin-plugins/interpolation/src/test/resources/res1/my.db
copy {configadmin-plugins/interpolation => features}/pom.xml (51%)
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/Activator.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/ArtifactBuilderImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/BuilderFactoryImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/BundleBuilderImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/ConfigurationBuilderImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/ExtensionBuilderImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/FeatureBuilderImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/FeatureServiceImpl.java
create mode 100644 features/src/main/java/org/apache/felix/feature/impl/IDImpl.java
create mode 100644 features/src/main/resources/META-INF/services/org.osgi.service.feature.FeatureService
create mode 100644 features/src/test/java/org/apache/felix/feature/impl/BundleBuilderImplTest.java
create mode 100644 features/src/test/java/org/apache/felix/feature/impl/FeatureServiceImplTest.java
create mode 100644 features/src/test/resources/features/test-exfeat1.json
create mode 100644 features/src/test/resources/features/test-exfeat2.json
create mode 100644 features/src/test/resources/features/test-feature.json
create mode 100644 features/src/test/resources/features/test-feature2.json
delete mode 100644 rootcause/bnd.bnd
create mode 100644 webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigJsonSupport.java
create mode 100644 webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigurationUtil.java
copy systemready/src/main/java/org/apache/felix/systemready/SystemReadyCheck.java => webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ServletSupport.java (55%)
create mode 100644 webconsole/src/main/java/org/apache/felix/webconsole/spi/ConfigurationHandler.java
copy systemready/src/main/java/org/apache/felix/systemready/SystemReadyMonitor.java => webconsole/src/main/java/org/apache/felix/webconsole/spi/ValidationException.java (68%)
copy systemready/src/main/java/org/apache/felix/systemready/StateType.java => webconsole/src/main/java/org/apache/felix/webconsole/spi/package-info.java (89%)
[felix-dev] 01/01: Merge branch 'master' into scrR8
Posted by tj...@apache.org.
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 4f2f15e000eb1adf70984c64f27791da4ee98b51
Merge: b503f5d b50b6af
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Fri Sep 3 09:19:47 2021 -0500
Merge branch 'master' into scrR8
cm.json/pom.xml | 2 +-
configadmin-plugins/interpolation/README.md | 7 +-
configadmin-plugins/interpolation/pom.xml | 2 +-
.../plugin/interpolation/Activator.java | 2 +-
.../InterpolationConfigurationPlugin.java | 11 +-
.../interpolation/StandaloneInterpolator.java | 83 ++
.../InterpolationConfigurationPluginTest.java | 12 +-
.../interpolation/StandaloneInterpolatorTest.java | 124 +++
.../interpolation/src/test/resources/res1/my.db | 1 +
converter/converter/pom.xml | 2 +-
.../interpolation => features}/pom.xml | 110 ++-
.../org/apache/felix/feature/impl/Activator.java | 34 +
.../felix/feature/impl/ArtifactBuilderImpl.java | 116 +++
.../felix/feature/impl/BuilderFactoryImpl.java | 59 ++
.../felix/feature/impl/BundleBuilderImpl.java | 116 +++
.../feature/impl/ConfigurationBuilderImpl.java | 112 +++
.../felix/feature/impl/ExtensionBuilderImpl.java | 151 ++++
.../felix/feature/impl/FeatureBuilderImpl.java | 275 ++++++
.../felix/feature/impl/FeatureServiceImpl.java | 460 ++++++++++
.../java/org/apache/felix/feature/impl/IDImpl.java | 221 +++++
.../org.osgi.service.feature.FeatureService | 1 +
.../felix/feature/impl/BundleBuilderImplTest.java | 105 +++
.../felix/feature/impl/FeatureServiceImplTest.java | 314 +++++++
.../src/test/resources/features/test-exfeat1.json | 26 +
.../src/test/resources/features/test-exfeat2.json | 9 +
.../src/test/resources/features/test-feature.json | 38 +
.../src/test/resources/features/test-feature2.json | 19 +
framework.security/doc/changelog.txt | 6 +
framework.security/pom.xml | 4 +-
framework/doc/changelog.txt | 11 +
framework/pom.xml | 3 +
.../org/apache/felix/framework/BundleImpl.java | 3 +-
.../apache/felix/framework/BundleRevisionImpl.java | 17 +-
.../org/apache/felix/framework/DTOFactory.java | 20 +-
.../org/apache/felix/framework/URLHandlers.java | 34 +-
.../framework/URLHandlersStreamHandlerProxy.java | 77 +-
.../apache/felix/framework/util/SecureAction.java | 60 +-
healthcheck/core/pom.xml | 23 +-
.../core/impl/executor/HealthCheckResultCache.java | 9 +-
healthcheck/generalchecks/pom.xml | 54 +-
.../hc/generalchecks/BundlesStartedCheck.java | 20 +-
.../apache/felix/hc/generalchecks/CpuCheck.java | 2 +-
.../felix/hc/generalchecks/DiskSpaceCheck.java | 2 +-
.../felix/hc/generalchecks/DsComponentsCheck.java | 152 ++--
.../hc/generalchecks/FrameworkStartCheck.java | 4 +-
.../felix/hc/generalchecks/HttpRequestsCheck.java | 174 ++--
.../felix/hc/generalchecks/JmxAttributeCheck.java | 30 +-
.../apache/felix/hc/generalchecks/MemoryCheck.java | 4 +-
.../hc/generalchecks/ScriptedHealthCheck.java | 14 +-
.../felix/hc/generalchecks/ServicesCheck.java | 34 +-
.../felix/hc/generalchecks/ThreadUsageCheck.java | 6 +-
.../generalchecks/scrutil/DsRootCauseAdapter.java | 9 +-
.../generalchecks/scrutil/DsRootCauseAnalyzer.java | 11 +-
http/base/pom.xml | 2 +-
.../http/base/internal/dispatch/Dispatcher.java | 15 +-
http/bridge/pom.xml | 4 +-
http/itest/pom.xml | 2 +-
http/jetty/pom.xml | 12 +-
.../jetty/internal/ConfigMetaTypeProvider.java | 22 +-
http/servlet-api/pom.xml | 8 +-
inventory/pom.xml | 5 +-
main.distribution/doc/changelog.txt | 6 +
main.distribution/doc/changelog_framework.txt | 11 +
main.distribution/doc/changelog_main.txt | 6 +
main.distribution/doc/changelog_resolver.txt | 6 +
main.distribution/pom.xml | 2 +-
main/doc/changelog.txt | 6 +
main/pom.xml | 3 +
resolver/doc/changelog.txt | 6 +
rootcause/bnd.bnd | 0
rootcause/pom.xml | 35 +-
.../java/org/apache/felix/rootcause/DSComp.java | 6 +
.../java/org/apache/felix/rootcause/DSRef.java | 7 +
.../org/apache/felix/rootcause/DSRootCause.java | 122 ++-
.../apache/felix/rootcause/RootCauseCommand.java | 11 +-
.../apache/felix/rootcause/RootCausePrinter.java | 36 +-
.../apache/felix/rootcause/DSRootCauseTest.java | 29 +-
.../org/apache/felix/rootcause/util/BaseTest.java | 10 +-
scr/changelog.txt | 6 +
scr/pom.xml | 1 +
.../felix/scr/impl/inject/field/FieldHandler.java | 27 +-
.../scr/impl/manager/ComponentContextImpl.java | 13 +-
systemready/pom.xml | 89 +-
.../org/apache/felix/systemready/CheckStatus.java | 5 +
.../org/apache/felix/systemready/StateType.java | 7 +-
.../org/apache/felix/systemready/SystemReady.java | 4 +
.../apache/felix/systemready/SystemReadyCheck.java | 5 +-
.../felix/systemready/SystemReadyMonitor.java | 4 +
.../org/apache/felix/systemready/SystemStatus.java | 9 +-
.../felix/systemready/impl/ComponentsCheck.java | 99 ++-
.../felix/systemready/impl/ServicesCheck.java | 12 +-
.../systemready/impl/SystemReadyMonitorImpl.java | 103 ++-
.../systemready/osgi/ComponentsCheckTest.java | 20 +-
.../systemready/osgi/SystemReadyMonitorTest.java | 2 +-
.../felix/systemready/osgi/util/BaseTest.java | 28 +-
webconsole/changelog.txt | 8 +
webconsole/pom.xml | 15 +-
.../org/apache/felix/webconsole/internal/Util.java | 21 +
.../internal/configuration/ConfigAdminSupport.java | 987 +++++----------------
.../internal/configuration/ConfigJsonSupport.java | 494 +++++++++++
.../internal/configuration/ConfigManager.java | 226 ++---
.../ConfigurationAdminConfigurationPrinter.java | 113 ++-
.../internal/configuration/ConfigurationUtil.java | 161 ++++
.../internal/configuration/MetaTypeSupport.java | 17 +-
.../configuration/MetatypePropertyDescriptor.java | 6 +
.../internal/configuration/PropertyDescriptor.java | 4 +
.../webconsole/internal/misc/ServletSupport.java | 41 +-
.../servlet/ConfigurationMetatypeSupport.java | 38 +-
.../internal/servlet/ConfigurationUtil.java | 29 +
.../webconsole/internal/servlet/OsgiManager.java | 25 +
.../felix/webconsole/spi/ConfigurationHandler.java | 71 ++
.../felix/webconsole/spi/ValidationException.java | 17 +-
.../apache/felix/webconsole/spi/package-info.java | 6 +-
.../main/resources/OSGI-INF/l10n/bundle.properties | 4 +
114 files changed, 4684 insertions(+), 1600 deletions(-)
diff --cc scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
index 22d10b2,541e88b..b9e728f
--- a/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
@@@ -25,7 -25,7 +25,8 @@@ import java.lang.reflect.Modifier
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+ import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
@@@ -192,26 -183,22 +193,30 @@@ public class FieldHandle
{
// unary references
- // unbind needs only be done, if reference is dynamic and optional
+ // unbind needs only be done, if reference is dynamic and optional
if ( mType == METHOD_TYPE.UNBIND )
{
- if ( this.metadata.isOptional() && !this.metadata.isStatic() )
+ Map<RefPair<?, ?>, Object> boundValues = bp.getComponentContext().getBoundValues(metadata.getName());
+ synchronized (boundValues)
{
- // we only reset if it was previously set with this value
- if ( bp.getComponentContext().getBoundValues(metadata.getName()).size() == 1 )
+ if ( this.metadata.isOptional() && !this.metadata.isStatic() )
{
- if (valueType == ValueType.ref_optional)
+ // we only reset if it was previously set with this value
- if ( boundValues.size() == 1 )
++ if (boundValues.size() == 1)
{
- this.setFieldValue(componentInstance, Optional.empty());
- }
- else
- {
- // null the field if optional and unary
-- this.setFieldValue(componentInstance, null);
++ if (valueType == ValueType.ref_optional)
++ {
++ this.setFieldValue(componentInstance, Optional.empty());
++ }
++ else
++ {
++ // null the field if optional and unary
++ this.setFieldValue(componentInstance, null);
++ }
}
}
+ boundValues.remove(refPair);
}
- bp.getComponentContext().getBoundValues(metadata.getName()).remove(refPair);
}
// updated needs only be done, if the value type is map or tuple
// If it's a dynamic reference, the value can be updated