felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r939592 - in /felix/trunk/karaf: assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg pom.xml shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
Date Fri, 30 Apr 2010 08:57:58 GMT
Author: gnodet
Date: Fri Apr 30 08:57:57 2010
New Revision: 939592

URL: http://svn.apache.org/viewvc?rev=939592&view=rev
Log:
FELIX-1921: Provide a way to configure the host used for karaf ssh server

Modified:
    felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
    felix/trunk/karaf/pom.xml
    felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml

Modified: felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg?rev=939592&r1=939591&r2=939592&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
Fri Apr 30 08:57:57 2010
@@ -19,5 +19,6 @@
 
 #
 sshPort=8101
+sshHost=0.0.0.0
 sshRealm=karaf
 hostKey=${karaf.base}/etc/host.key

Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=939592&r1=939591&r2=939592&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Fri Apr 30 08:57:57 2010
@@ -102,7 +102,7 @@
         <servlet.api.version>2.5</servlet.api.version>
         <spring.osgi.version>1.2.0</spring.osgi.version>
         <spring.version>2.5.6.SEC01</spring.version>
-        <sshd.version>0.3.0</sshd.version>
+        <sshd.version>0.4.0-SNAPSHOT</sshd.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>

Modified: felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=939592&r1=939591&r2=939592&view=diff
==============================================================================
--- felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (original)
+++ felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Fri Apr
30 08:57:57 2010
@@ -32,6 +32,7 @@
     <cm:property-placeholder persistent-id="org.apache.felix.karaf.shell">
         <cm:default-properties>
             <cm:property name="sshPort" value="8101"/>
+            <cm:property name="sshHost" value="0.0.0.0"/>
             <cm:property name="sshRealm" value="karaf"/>
             <cm:property name="hostKey" value="${karaf.base}/etc/host.key"/>
         </cm:default-properties>
@@ -59,6 +60,7 @@
 
     <bean id="sshServer" class="org.apache.sshd.SshServer" factory-method="setUpDefaultServer"
scope="prototype">
         <property name="port" value="${sshPort}"/>
+        <property name="host" value="${sshHost}"/>
         <property name="shellFactory">
             <bean class="org.apache.felix.karaf.shell.ssh.ShellFactoryImpl">
                 <property name="completers">



Mime
View raw message