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/04/09 12:03:13 UTC
git commit: Use karaf.etc everywhere
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 059c755ac -> c3a4605b1
Use karaf.etc everywhere
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c3a4605b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c3a4605b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c3a4605b
Branch: refs/heads/karaf-3.0.x
Commit: c3a4605b15b8c38c9e86fd9f96cab3c8f5003e7e
Parents: 059c755
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 9 12:02:48 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 9 12:02:48 2014 +0200
----------------------------------------------------------------------
demos/web/src/main/java/org/apache/karaf/web/WebAppListener.java | 1 +
.../java/org/apache/karaf/shell/commands/impl/InfoAction.java | 1 +
shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml | 4 ++--
shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c3a4605b/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/c3a4605b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
index 913b52d..6bf3516 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
@@ -67,6 +67,7 @@ public class InfoAction extends OsgiCommandSupport {
printValue("Karaf version", maxNameLen, System.getProperty("karaf.version"));
printValue("Karaf home", maxNameLen, System.getProperty("karaf.home"));
printValue("Karaf base", maxNameLen, System.getProperty("karaf.base"));
+ printValue("Karaf etc", maxNameLen, System.getProperty("karaf.etc"));
printValue("OSGi Framework", maxNameLen, bundleContext.getBundle(0).getSymbolicName() + " - " +
bundleContext.getBundle(0).getVersion());
System.out.println();
http://git-wip-us.apache.org/repos/asf/karaf/blob/c3a4605b/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml b/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
index fc63ceb..4b16181 100644
--- a/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
+++ b/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
@@ -44,8 +44,8 @@
<cm:property name="sshHost" value="0.0.0.0"/>
<cm:property name="sshIdleTimeout" value="1800000"/>
<cm:property name="sshRealm" value="karaf"/>
- <cm:property name="hostKey" value="$[karaf.base]/etc/host.key"/>
- <cm:property name="authorizedKeys" value="$[karaf.base]/etc/authorized_keys"/>
+ <cm:property name="hostKey" value="$[karaf.etc]/host.key"/>
+ <cm:property name="authorizedKeys" value="$[karaf.etc]/authorized_keys"/>
<cm:property name="authMethods" value="keyboard-interactive,password,publickey"/>
<cm:property name="keySize" value="1024"/>
<cm:property name="algorithm" value="DSA"/>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c3a4605b/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..79b2f63 100644
--- a/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ b/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -22,8 +22,8 @@
<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="keySize" type="integer" default="1024" name="%keySize.name" description="%keySize.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>
<Designate pid="org.apache.karaf.shell">