Repository: karaf Updated Branches: refs/heads/master 18c31df22 -> 162393dab
Use karaf.etc instead of karaf.base + /etc Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/162393da Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/162393da Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/162393da Branch: refs/heads/master Commit: 162393dab6f4a1787c60387cc178e99ead70b28e Parents: 18c31df Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Apr 8 17:58:06 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Apr 8 17:58:06 2014 +0200 ---------------------------------------------------------------------- demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java | 1 + .../main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java | 2 +- shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java | 2 +- shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/162393da/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java ---------------------------------------------------------------------- diff --git a/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java b/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java index 22f8098..db08a14 100644 --- a/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java +++ b/demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java @@ -35,6 +35,7 @@ public class WebAppListener implements ServletContextListener { System.setProperty("karaf.home", root); System.setProperty("karaf.base", root); System.setProperty("karaf.data", root + "/data"); + System.setProperty("karaf.etc", root + "/etc"); System.setProperty("karaf.history", root + "/data/history.txt"); System.setProperty("karaf.instances", root + "/instances"); System.setProperty("karaf.startLocalConsole", "false"); http://git-wip-us.apache.org/repos/asf/karaf/blob/162393da/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java index ecbcc1e..d1d838c 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java @@ -31,7 +31,7 @@ import java.util.Map; public class KarafRealm implements JaasRealm, ManagedService { - private static final String KARAF_ETC = System.getProperty("karaf.base") + File.separatorChar + "etc"; + private static final String KARAF_ETC = System.getProperty("karaf.etc"); private static final String REALM = "karaf"; private static final String PROPERTIES_MODULE = "org.apache.karaf.jaas.modules.properties.PropertiesLoginModule"; private static final String PUBLIC_KEY_MODULE = "org.apache.karaf.jaas.modules.publickey.PublickeyLoginModule"; http://git-wip-us.apache.org/repos/asf/karaf/blob/162393da/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java index b87cefb..1e9626d 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java @@ -122,7 +122,7 @@ public class Activator extends BaseActivator implements ManagedService { String sshHost = getString("sshHost", "0.0.0.0"); long sshIdleTimeout = getLong("sshIdleTimeout", 1800000); String sshRealm = getString("sshRealm", "karaf"); - String hostKey = getString("hostKey", System.getProperty("karaf.base") + "/etc/host.key"); + String hostKey = getString("hostKey", System.getProperty("karaf.etc") + "/host.key"); String authMethods = getString("authMethods", "keyboard-interactive,password,publickey"); int keySize = getInt("keySize", 1024); String algorithm = getString("algorithm", "DSA"); http://git-wip-us.apache.org/repos/asf/karaf/blob/162393da/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml index 68c5da3..d621707 100644 --- a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml +++ b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml @@ -22,7 +22,7 @@ <AD id="sshPort" type="Integer" default="8101" name="%sshPort.name" description="%sshPort.description"/> <AD id="sshHost" type="String" default="0.0.0.0" name="%sshHost.name" description="%sshHost.description"/> <AD id="sshRealm" type="String" default="karaf" name="%sshRealm.name" description="%sshRealm.description"/> - <AD id="hostKey" type="String" default="${karaf.base}/etc/host.key" name="%hostKey.name" description="%hostKey.description"/> + <AD id="hostKey" type="String" default="${karaf.etc}/host.key" name="%hostKey.name" description="%hostKey.description"/> <AD id="keySize" type="integer" default="1024" name="%keySize.name" description="%keySize.description"/> <AD id="algorithm" type="String" default="DSA" name="%algorithm.name" description="%algorithm.description"/> </OCD>
