You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/10/19 16:23:17 UTC
[karaf] branch master updated: [KARAF-6420] Disable jaas blueprint
config by default, can be enabled by installing jaas-deployer feature
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 99510dc [KARAF-6420] Disable jaas blueprint config by default, can be enabled by installing jaas-deployer feature
new d04bd20 Merge pull request #1239 from jbonofre/KARAF-6420
99510dc is described below
commit 99510dcfb1ea23d0fac81d41d9d71202b8885bcd
Author: jbonofre <jb...@apache.org>
AuthorDate: Mon Oct 19 16:02:28 2020 +0200
[KARAF-6420] Disable jaas blueprint config by default, can be enabled by installing jaas-deployer feature
---
assemblies/features/standard/src/main/feature/feature.xml | 11 ++++++-----
.../main/asciidoc/developer-guide/security-framework.adoc | 12 +++++++++---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index df773b7..abcafb5 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -635,6 +635,12 @@ update = manager
<bundle start-level="30">mvn:org.apache.karaf.instance/org.apache.karaf.instance.core/${project.version}</bundle>
</feature>
+ <feature name="jaas-deployer" description="Allow support of blueprint JAAS configuration in the deploy folder" version="${project.version}">
+ <feature>aries-blueprint</feature>
+ <feature>jaas</feature>
+ <bundle start-level="30">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.config/${project.version}</bundle>
+ </feature>
+
<feature name="jaas" description="Provide JAAS support" version="${project.version}">
<config name="org.apache.karaf.jaas">
################################################################################
@@ -703,10 +709,6 @@ encryption.encoding = hexadecimal
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${project.version}</bundle>
<conditional>
- <condition>aries-blueprint</condition>
- <bundle start-level="30">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.config/${project.version}</bundle>
- </conditional>
- <conditional>
<condition>shell</condition>
<config name="org.apache.karaf.command.acl.jaas">
################################################################################
@@ -1643,7 +1645,6 @@ jul.layout.type = simple
<feature name="standard" description="Wrap feature describing all features part of a standard distribution" version="${project.version}">
<feature>wrap</feature>
- <feature>aries-blueprint</feature>
<feature>shell</feature>
<feature>shell-compat</feature>
<feature>feature</feature>
diff --git a/manual/src/main/asciidoc/developer-guide/security-framework.adoc b/manual/src/main/asciidoc/developer-guide/security-framework.adoc
index b764d05..fe0f9fb 100644
--- a/manual/src/main/asciidoc/developer-guide/security-framework.adoc
+++ b/manual/src/main/asciidoc/developer-guide/security-framework.adoc
@@ -31,10 +31,16 @@ up HTTPS connectors or using certificates for WS-Security.
A very simple XML schema for spring has been defined, allowing the deployment of a new realm or a new keystore very easily.
-==== Schema
+==== Schema and Deployer
-To override or deploy a new realm, you can use the following XSD which is supported by a Spring namespace handler and
-can thus be defined in a Spring xml configuration file.
+To override or deploy a new realm, you can use the following XSD which is supported by a Blueprint namespace handler and
+can thus be defined in a Blueprint xml configuration file.
+You can directly create a XML file in the Apache Karaf `deploy` folder. To enable this JAAS config deployer, you have first
+to install the `jaas-deployer` feature:
+
+----
+karaf@root()> feature:install jaas-deployer
+----
You can find the schema at the following http://karaf.apache.org/xmlns/jaas/v1.1.0