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 2020/10/09 14:28:55 UTC
[felix-dev] 01/02: Merge branch 'master' into scrR8
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 b186ccc4ebb525387962c8179b889e898bd46418
Merge: 49599cc 03288b9
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Thu Oct 8 12:17:05 2020 -0500
Merge branch 'master' into scrR8
eventadmin/impl/changelog.txt | 9 ++
eventadmin/impl/pom.xml | 22 ++--
.../apache/felix/eventadmin/impl/Activator.java | 4 +-
.../felix/eventadmin/impl/Configuration.java | 24 +++--
.../eventadmin/impl/MetaTypeProviderImpl.java | 4 +-
.../impl/adapter/BundleEventAdapter.java | 5 +-
.../impl/adapter/FrameworkEventAdapter.java | 6 +-
.../eventadmin/impl/adapter/LogEventAdapter.java | 69 +++----------
.../impl/adapter/ServiceEventAdapter.java | 48 ++-------
.../eventadmin/impl/handler/EventAdminImpl.java | 23 +++++
.../eventadmin/impl/handler/EventHandlerProxy.java | 33 ++++--
.../impl/handler/EventHandlerTracker.java | 33 ++++++
.../{BlacklistLatch.java => DenylistLatch.java} | 22 ++--
.../felix/eventadmin/impl/tasks/HandlerTask.java | 16 +--
.../eventadmin/impl/tasks/SyncDeliverTasks.java | 8 +-
.../felix/eventadmin/impl/util/LogWrapper.java | 28 +++---
.../felix/eventadmin/ittests/AbstractTest.java | 27 +++--
.../apache/felix/eventadmin/ittests/Listener.java | 4 +-
.../eventadmin/perftests/PerformanceTestIT.java | 46 +++++----
.../apache/felix/framework/BundleRevisionImpl.java | 29 ++----
.../apache/felix/framework/BundleWiringImpl.java | 2 +-
.../apache/felix/framework/ServiceRegistry.java | 9 +-
.../framework/URLHandlersBundleURLConnection.java | 15 +--
.../felix/framework/ResourceLoadingTest.java | 8 ++
gogo/bom/pom.xml | 13 +--
gogo/command/doc/changelog.txt | 5 +
gogo/command/pom.xml | 9 +-
gogo/itest-jline/pom.xml | 2 +-
gogo/itest-shell/pom.xml | 2 +-
gogo/runtime/doc/changelog.txt | 6 ++
gogo/runtime/pom.xml | 7 +-
gogo/shell/doc/changelog.txt | 8 ++
gogo/shell/pom.xml | 9 +-
.../hc/core/impl/executor/HealthCheckFuture.java | 14 ++-
.../core/impl/filter/ServiceUnavailableFilter.java | 2 +-
http/base/pom.xml | 8 +-
.../felix/http/base/internal/HttpConfig.java | 94 +++++++++++++++++
.../base/internal/handler/HttpSessionWrapper.java | 20 +++-
.../base/internal/handler/PreprocessorHandler.java | 7 +-
.../internal/handler/WhiteboardFilterHandler.java | 22 ++--
.../handler/WhiteboardListenerHandler.java | 22 ++--
.../internal/handler/WhiteboardServletHandler.java | 18 +---
.../internal/logger/LogServiceEnabledLogger.java | 5 +-
.../internal/runtime/dto/RuntimeDTOBuilder.java | 6 --
.../internal/service/PerBundleHttpServiceImpl.java | 3 +-
.../http/base/internal/util/ServiceUtils.java | 89 +++++++++++++++++
.../whiteboard/SharedServletContextImpl.java | 1 -
.../whiteboard/WhiteboardContextHandler.java | 32 +++---
.../internal/context/ServletContextImplTest.java | 6 +-
.../internal/handler/FilterConfigImplTest.java | 14 +--
.../internal/handler/HttpSessionWrapperTest.java | 67 +++++++++++++
.../internal/handler/ServletConfigImplTest.java | 12 ++-
.../internal/registry/ErrorPageRegistryTest.java | 11 +-
.../registry/EventListenerRegistryTest.java | 7 +-
.../base/internal/registry/FilterRegistryTest.java | 6 +-
.../internal/registry/ServletRegistryTest.java | 13 +--
.../internal/runtime/AbstractInfoOrderingTest.java | 6 +-
.../base/internal/runtime/ListenerInfoTest.java | 1 +
http/bridge/pom.xml | 10 +-
http/itest/pom.xml | 36 +++----
http/jetty/pom.xml | 14 ++-
.../jetty/internal/ConfigMetaTypeProvider.java | 8 ++
.../jetty/internal/ConnectorFactoryTracker.java | 7 +-
.../felix/http/jetty/internal/JettyConfig.java | 4 +-
.../LoadBalancerCustomizerFactoryTracker.java | 11 +-
.../http/jetty/internal/RequestLogTracker.java | 24 +++--
http/parent/pom.xml | 13 +--
http/pom.xml | 2 +-
http/sslfilter/pom.xml | 33 +++---
.../felix/scr/impl/manager/DependencyManager.java | 111 ++++++++++++++++-----
.../scr/impl/manager/SingleComponentManager.java | 3 +-
.../scr/integration/ServiceBindGreedyTest.java | 54 +++++++---
.../integration/components/SimpleComponent.java | 8 +-
.../integration/components/SimpleServiceImpl.java | 24 +++--
webconsole-plugins/event/pom.xml | 51 +++++++---
.../plugins/event/internal/Activator.java | 8 +-
.../event/internal/ConfigurationListener.java | 12 ++-
.../plugins/event/internal/EventCollector.java | 18 ++--
.../plugins/event/internal/EventHandler.java | 9 +-
.../plugins/event/internal/EventInfo.java | 4 +-
.../event/internal/OptionalFeaturesHandler.java | 31 ++++--
.../plugins/event/internal/OsgiUtil.java | 30 +++---
.../plugins/event/internal/PluginServlet.java | 23 +++--
.../event/internal/PropertiesEditorSupport.java | 6 +-
.../internal/converter/ServiceEventConverter.java | 7 +-
webconsole/changelog.txt | 7 ++
webconsole/pom.xml | 7 +-
.../felix/webconsole/SimpleWebConsolePlugin.java | 41 ++++++++
.../i18n/ConsolePropertyResourceBundle.java | 8 +-
.../internal/servlet/OsgiManagerTest.java | 14 +++
90 files changed, 1097 insertions(+), 582 deletions(-)