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 2014/05/01 17:22:07 UTC

git commit: [KARAF-2958] Fix security blueprint example in the dev guide

Repository: karaf
Updated Branches:
  refs/heads/master 5252b630b -> c0c439e64


[KARAF-2958] Fix security blueprint example in the dev guide


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c0c439e6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c0c439e6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c0c439e6

Branch: refs/heads/master
Commit: c0c439e6407288efbf0eff2a3fb13ab5d366ceb0
Parents: 5252b63
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu May 1 17:21:35 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu May 1 17:21:35 2014 +0200

----------------------------------------------------------------------
 .../src/main/webapp/developers-guide/security-framework.conf   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c0c439e6/manual/src/main/webapp/developers-guide/security-framework.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/developers-guide/security-framework.conf b/manual/src/main/webapp/developers-guide/security-framework.conf
index ad2c691..8283cbd 100644
--- a/manual/src/main/webapp/developers-guide/security-framework.conf
+++ b/manual/src/main/webapp/developers-guide/security-framework.conf
@@ -32,13 +32,13 @@ Here are two examples using this schema:
            xmlns:jaas="http://karaf.apache.org/xmlns/jaas/v1.0.0"
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
-    <!-- Bean to allow the $[karaf.base] property to be correctly resolved -->
-    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
-
     <type-converters>
         <bean class="org.apache.karaf.jaas.modules.properties.PropertiesConverter"/>
     </type-converters> 
 
+    <!-- Bean to allow the $[karaf.base] property to be correctly resolved -->
+    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
+
     <jaas:config name="myrealm">
         <jaas:module className="org.apache.karaf.jaas.modules.properties.PropertiesLoginModule" 
                      flags="required">