Repository: karaf Updated Branches: refs/heads/karaf-2.3.x dc4a05284 -> ad5a4b51e
[KARAF-3625] Fix location of the etc/users.properties file in the AutoEncrypytionSupport bean blueprint definition Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ad5a4b51 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ad5a4b51 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ad5a4b51 Branch: refs/heads/karaf-2.3.x Commit: ad5a4b51e84f4394f015d69b99aaced729cf9a05 Parents: dc4a052 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Apr 7 14:06:47 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Apr 7 14:06:47 2015 +0200 ---------------------------------------------------------------------- .../src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/ad5a4b51/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml b/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml index 0c7c0d5..36f2755 100644 --- a/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml +++ b/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml @@ -59,13 +59,13 @@ </jaas:module> </jaas:config> - <!-- Properties installer --> + <!-- AutoEncryption support --> <bean class="org.apache.karaf.jaas.modules.properties.AutoEncryptionSupport" init-method="init" destroy-method="destroy"> <argument> <map> <entry key="org.osgi.framework.BundleContext" value-ref="blueprintBundleContext"/> - <entry key="users" value="$[karaf.etc]/users.properties"/> + <entry key="users" value="$[karaf.base]/etc/users.properties"/> <entry key="encryption.name" value="${encryption.name}"/> <entry key="encryption.enabled" value="${encryption.enabled}"/> <entry key="encryption.prefix" value="${encryption.prefix}"/>
