You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/12/03 09:52:35 UTC
svn commit: r722811 - in /servicemix/smx4/kernel/trunk: ./
gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/
gshell/gshell-core/
gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd...
Author: gnodet
Date: Wed Dec 3 00:52:35 2008
New Revision: 722811
URL: http://svn.apache.org/viewvc?rev=722811&view=rev
Log:
SMX4KNL-144: Use SSH related commands from gshell
Removed:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/GShellShellFactory.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshAction.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshServerAction.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/commands/remote/
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/remote/
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/sshd/
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java?rev=722811&r1=722810&r2=722811&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java Wed Dec 3 00:52:35 2008
@@ -37,7 +37,7 @@
protected Object doExecute() throws Exception {
int port = getExistingInstance(instance).getPort();
- ShellContextHolder.get().getShell().execute("remote/ssh -u " + username + " -p " + password + " -n " + instance + " tcp://localhost:" + port);
+ ShellContextHolder.get().getShell().execute("remote/ssh -l " + username + " -P " + password + " -p " + port + " localhost");
return Result.SUCCESS;
}
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=722811&r1=722810&r2=722811&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Wed Dec 3 00:52:35 2008
@@ -58,6 +58,7 @@
org.bouncycastle*;resolution:=optional,
com.sun*;resolution:=optional,
com.google.code.sshd.server.keyprovider,
+ org.jsecurity*;resolution:=optional,
*
</gshell.osgi.import>
<!-- TODO: remove plexus util package -->
@@ -114,19 +115,11 @@
<artifactId>gshell-vfs</artifactId>
<version>${gshell.version}</version>
</dependency>
- <!--
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
- <artifactId>gshell-remote</artifactId>
+ <artifactId>gshell-ssh</artifactId>
<version>${gshell.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jsecurity</groupId>
- <artifactId>jsecurity</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.gshell.wisdom</groupId>
<artifactId>gshell-wisdom-core</artifactId>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml?rev=722811&r1=722810&r2=722811&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml Wed Dec 3 00:52:35 2008
@@ -131,11 +131,11 @@
<gshell:command-bundle>
<gshell:command name="remote/ssh">
- <gshell:action class="org.apache.servicemix.kernel.gshell.core.sshd.SshAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.ssh.SshAction"/>
</gshell:command>
<gshell:command name="remote/sshd">
- <gshell:action class="org.apache.servicemix.kernel.gshell.core.sshd.SshServerAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.ssh.SshServerAction"/>
</gshell:command>
</gshell:command-bundle>
@@ -159,95 +159,95 @@
<gshell:command name="optional/hostname">
<gshell:action class="org.apache.geronimo.gshell.commands.optional.HostnameAction"/>
</gshell:command>
- </gshell:command-bundle>
- <gshell:command-bundle>
- <gshell:command name="vfs/cd">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ChangeDirectoryAction"/>
+ <gshell:command name="optional/cat">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.CatAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:command name="vfs/pwd" type="stateless">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CurrentDirectoryAction"/>
- </gshell:command>
-
- <gshell:command name="vfs/ls">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ListDirectoryAction"/>
+ <gshell:command name="optional/edit">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.EditAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:link name="vfs/dir" target="vfs/ls"/>
-
- <gshell:command name="vfs/cp">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CopyAction"/>
+ <gshell:command name="optional/touch">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.TouchAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
- <ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:link name="vfs/copy" target="vfs/cp"/>
-
- <gshell:command name="vfs/rm">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.RemoveAction"/>
+ <gshell:command name="optional/find">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.FindAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:link name="vfs/del" target="vfs/rm"/>
+ <gshell:command name="optional/grep">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.GrepAction"/>
+ </gshell:command>
+ </gshell:command-bundle>
- <gshell:command name="optional/cat">
- <gshell:action class="org.apache.geronimo.gshell.commands.optional.CatAction"/>
+ <gshell:command-bundle>
+ <gshell:command name="vfs/cd">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ChangeDirectoryAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:command name="optional/edit">
- <gshell:action class="org.apache.geronimo.gshell.commands.optional.EditAction"/>
+ <gshell:command name="vfs/pwd" type="stateless">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CurrentDirectoryAction"/>
+ </gshell:command>
+
+ <gshell:command name="vfs/ls">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ListDirectoryAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:command name="optional/touch">
- <gshell:action class="org.apache.geronimo.gshell.commands.optional.TouchAction"/>
+ <gshell:link name="vfs/dir" target="vfs/ls"/>
+
+ <gshell:command name="vfs/cp">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CopyAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
+ <ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:command name="vfs/fileinfo">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FileInfoAction"/>
+ <gshell:link name="vfs/copy" target="vfs/cp"/>
+
+ <gshell:command name="vfs/rm">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.RemoveAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- <gshell:command name="optional/find">
- <gshell:action class="org.apache.geronimo.gshell.commands.optional.FindAction"/>
+ <gshell:link name="vfs/del" target="vfs/rm"/>
+
+ <gshell:command name="vfs/fileinfo">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FileInfoAction"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
-
- <gshell:command name="optional/grep">
- <gshell:action class="org.apache.geronimo.gshell.commands.optional.GrepAction"/>
- </gshell:command>
</gshell:command-bundle>
</beans>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml?rev=722811&r1=722810&r2=722811&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml Wed Dec 3 00:52:35 2008
@@ -42,8 +42,7 @@
<bean name="sshServer" class="com.google.code.sshd.SshServer" factory-method="setUpDefaultServer" scope="prototype">
<property name="port" value="${sshPort}" />
<property name="shellFactory">
- <bean class="org.apache.servicemix.kernel.gshell.core.sshd.GShellShellFactory">
- <property name="branding" ref="branding" />
+ <bean class="org.apache.geronimo.gshell.commands.ssh.ShellFactoryImpl">
<property name="completers">
<list>
<ref bean="commandsCompleter"/>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=722811&r1=722810&r2=722811&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Wed Dec 3 00:52:35 2008
@@ -88,7 +88,7 @@
<junit.version>4.4_1</junit.version>
<jline.version>0.9.94</jline.version>
<log4j.version>1.2.14</log4j.version>
- <mina.version>1.1.6_1</mina.version>
+ <mina.version>1.1.7_1-SNAPSHOT</mina.version>
<oro.version>2.0.8_1</oro.version>
<pax.logging.version>1.2.1</pax.logging.version>
<pax.url.version>0.3.2</pax.url.version>
@@ -552,49 +552,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-remote-client</artifactId>
- <version>${gshell.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-remote-common</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-ssh</artifactId>
<version>${gshell.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-remote-server</artifactId>
- <version>${gshell.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>