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 2012/12/11 13:56:58 UTC

svn commit: r1420137 - in /karaf/branches/karaf-2.3.x/shell/ssh/src/main: java/org/apache/karaf/shell/ssh/SshServerAction.java resources/OSGI-INF/blueprint/shell-ssh.xml

Author: jbonofre
Date: Tue Dec 11 12:56:57 2012
New Revision: 1420137

URL: http://svn.apache.org/viewvc?rev=1420137&view=rev
Log:
[KARAF-2050] Update the default SSHd idle timeout to 1800000ms

Modified:
    karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java
    karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml

Modified: karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java?rev=1420137&r1=1420136&r2=1420137&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java (original)
+++ karaf/branches/karaf-2.3.x/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshServerAction.java Tue Dec 11 12:56:57 2012
@@ -41,8 +41,8 @@ public class SshServerAction extends Osg
     @Option(name = "-b", aliases = { "--background"}, description = "The service will run in the background (Default: true)", required = false, multiValued = false)
     private boolean background = true;
 
-    @Option(name = "-i", aliases = { "--idle-timeout" }, description = "The session idle timeout (Default: 60000ms)", required = false, multiValued = false)
-    private long idleTimeout = 60000;
+    @Option(name = "-i", aliases = { "--idle-timeout" }, description = "The session idle timeout (Default: 1800000ms)", required = false, multiValued = false)
+    private long idleTimeout = 1800000;
 
     private BlueprintContainer container;
 

Modified: karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=1420137&r1=1420136&r2=1420137&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Tue Dec 11 12:56:57 2012
@@ -39,7 +39,7 @@
         <cm:default-properties>
             <cm:property name="sshPort" value="8101"/>
             <cm:property name="sshHost" value="0.0.0.0"/>
-            <cm:property name="sshIdleTimeout" value="60000"/>
+            <cm:property name="sshIdleTimeout" value="1800000"/>
             <cm:property name="sshRealm" value="karaf"/>
             <cm:property name="sshRole" value="$[karaf.admin.role]"/>
             <cm:property name="hostKey" value="$[karaf.base]/etc/host.key"/>