This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from 7073eb3 Enable to drop some files from the assembly in the mojo of
the same name (#1205)
new 0241b93 [KARAF-4609] Allow use of env variables to override some
configurations
new c7f3f99 [KARAF-4609] Add configadmin interpolation plugin and update
documentation
new 1d09db2 Merge pull request #1203 from jbonofre/KARAF-4609
The 8329 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:
.../resources/etc/config.properties | 5 ++
assemblies/features/framework/pom.xml | 4 ++
.../framework/src/main/feature/feature.xml | 12 +++-
.../bundle/core/internal/MavenConfigService.java | 2 +-
.../apache/karaf/config/command/ListCommand.java | 4 +-
.../completers/ConfigurationPropertyCompleter.java | 2 +-
.../config/core/impl/ConfigRepositoryImpl.java | 4 +-
.../config/core/impl/KarafConfigurationPlugin.java | 59 +++++++++++++++
.../karaf/config/core/impl/osgi/Activator.java | 16 ++++-
.../karaf/config/command/EditCommandTest.java | 4 +-
.../core/impl/KarafConfigurationPluginTest.java | 33 ++++-----
.../karaf/diagnostic/common/LogDumpProvider.java | 2 +-
.../karaf-config-example-static/pom.xml | 4 +-
.../org/apache/karaf/example/config/Activator.java | 2 +-
.../internal/service/FeatureConfigInstaller.java | 6 +-
.../internal/service/FeaturesServiceImpl.java | 2 +-
.../java/org/apache/karaf/features/AppendTest.java | 2 +-
.../karaf/http/core/internal/ProxyServiceImpl.java | 4 +-
.../org/apache/karaf/itests/KarafTestSupport.java | 6 +-
.../itests/ConfigManagedServiceFactoryTest.java | 14 ++--
.../apache/karaf/itests/ExternalConfigTest.java | 2 +-
.../java/org/apache/karaf/itests/MavenTest.java | 2 +-
.../apache/karaf/itests/OverrideConfigTest.java | 4 +-
.../karaf/itests/examples/ConfigExampleTest.java | 2 +-
...ryptableConfigAdminPropertyPlaceholderTest.java | 2 +-
.../jaas/modules/osgi/OsgiConfigLoginModule.java | 2 +-
.../karaf/log/core/internal/LogServiceImpl.java | 4 +-
.../karaf/log/core/internal/SetLogLevelTest.java | 2 +-
.../main/asciidoc/user-guide/configuration.adoc | 83 ++++++++++++++++++++++
pom.xml | 7 ++
.../apache/karaf/profile/command/ProfileEdit.java | 2 +-
.../service/guard/impl/GuardProxyCatalog.java | 2 +-
.../service/guard/impl/GuardProxyCatalogTest.java | 1 +
.../services/staticcm/StaticConfigAdminImpl.java | 6 +-
.../impl/SecuredCommandConfigTransformer.java | 6 +-
.../osgi/secured/SecuredSessionFactoryImpl.java | 2 +-
36 files changed, 249 insertions(+), 67 deletions(-)
create mode 100644
config/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java
copy event/src/main/java/org/apache/karaf/event/service/Activator.java =>
config/src/test/java/org/apache/karaf/config/core/impl/KarafConfigurationPluginTest.java
(52%)