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 2009/02/13 08:35:17 UTC
svn commit: r744019 - in
/servicemix/smx4/kernel/trunk/gshell/gshell-core/src:
main/resources/META-INF/spring/
test/java/org/apache/servicemix/kernel/gshell/core/
test/resources/org/apache/servicemix/kernel/gshell/core/
Author: gnodet
Date: Fri Feb 13 07:35:17 2009
New Revision: 744019
URL: http://svn.apache.org/viewvc?rev=744019&view=rev
Log:
SMX4KNL-184: fix junit tests
Added:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml (contents, props changed)
- copied, changed from r744012, servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
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=744019&r1=744018&r2=744019&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 Fri Feb 13 07:35:17 2009
@@ -142,11 +142,11 @@
<gshell:action class="org.apache.geronimo.gshell.commands.shell.ExecuteAction"/>
</gshell:command>
- <gshell:command name="optional/java">
+ <gshell:command name="java">
<gshell:action class="org.apache.geronimo.gshell.commands.shell.JavaAction"/>
</gshell:command>
- <gshell:command name="optional/sleep">
+ <gshell:command name="sleep">
<gshell:action class="org.apache.geronimo.gshell.commands.shell.SleepAction"/>
</gshell:command>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java?rev=744019&r1=744018&r2=744019&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java Fri Feb 13 07:35:17 2009
@@ -83,7 +83,7 @@
context = new ClassPathXmlApplicationContext(
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
- "META-INF/spring/gshell-commands.xml",
+ "org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml",
"org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
@@ -109,7 +109,7 @@
context = new ClassPathXmlApplicationContext(
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
- "META-INF/spring/gshell-commands.xml",
+ "org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml",
"org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
@@ -138,7 +138,7 @@
context = new ClassPathXmlApplicationContext(
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
- "META-INF/spring/gshell-commands.xml",
+ "org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml",
"org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml (from r744012, 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/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml?p2=servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml&p1=servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml&r1=744012&r2=744019&rev=744019&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/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml Fri Feb 13 07:35:17 2009
@@ -128,67 +128,17 @@
</gshell:command-bundle>
<gshell:command-bundle>
- <gshell:command name="ssh">
- <gshell:action class="org.apache.geronimo.gshell.commands.ssh.SshAction"/>
- </gshell:command>
-
- <gshell:command name="sshd">
- <gshell:action class="org.apache.geronimo.gshell.commands.ssh.SshServerAction"/>
- </gshell:command>
- </gshell:command-bundle>
-
- <gshell:command-bundle>
- <gshell:command name="exec">
- <gshell:action class="org.apache.geronimo.gshell.commands.shell.ExecuteAction"/>
- </gshell:command>
-
- <gshell:command name="optional/java">
- <gshell:action class="org.apache.geronimo.gshell.commands.shell.JavaAction"/>
- </gshell:command>
-
- <gshell:command name="optional/sleep">
- <gshell:action class="org.apache.geronimo.gshell.commands.shell.SleepAction"/>
- </gshell:command>
-
- <gshell:command name="date">
- <gshell:action class="org.apache.geronimo.gshell.commands.shell.DateAction"/>
- </gshell:command>
-
- <gshell:command name="edit">
- <gshell:action class="org.apache.geronimo.gshell.commands.shell.EditAction">
- <property name="fileSystemAccess" ref="fileSystemAccess"/>
- </gshell:action>
- <gshell:completers>
- <ref bean="fileObjectNameCompleter"/>
- <null/>
- </gshell:completers>
- </gshell:command>
-
- <gshell:command name="find">
- <gshell:action class="org.apache.geronimo.gshell.commands.shell.FindAction">
- <property name="fileSystemAccess" ref="fileSystemAccess"/>
- </gshell:action>
+ <gshell:command name="vfs/ls">
+ <gshell:action class="org.apache.geronimo.gshell.commands.file.ListDirectoryAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
- </gshell:command-bundle>
+ </gshell:command-bundle>
<gshell:command-bundle>
- <gshell:command name="hostname">
- <gshell:action class="org.apache.geronimo.gshell.commands.network.HostnameAction"/>
- </gshell:command>
- </gshell:command-bundle>
-
- <gshell:command-bundle>
- <gshell:link name="print" target="echo"/>
-
- <gshell:command name="printf">
- <gshell:action class="org.apache.geronimo.gshell.commands.text.PrintfAction"/>
- </gshell:command>
-
- <gshell:command name="cat">
+ <gshell:command name="optional/cat">
<gshell:action class="org.apache.geronimo.gshell.commands.text.CatAction">
<property name="fileSystemAccess" ref="fileSystemAccess"/>
</gshell:action>
@@ -198,65 +148,10 @@
</gshell:completers>
</gshell:command>
- <gshell:command name="grep">
- <gshell:action class="org.apache.geronimo.gshell.commands.text.GrepAction"/>
- </gshell:command>
- </gshell:command-bundle>
-
- <gshell:command-bundle>
- <gshell:command name="cd">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.ChangeDirectoryAction" parent="vfsCommandActionTemplate"/>
- <gshell:completers>
- <ref bean="fileObjectNameCompleter"/>
- <null/>
- </gshell:completers>
- </gshell:command>
-
- <gshell:command name="pwd" type="stateless">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.CurrentDirectoryAction" parent="vfsCommandActionTemplate"/>
- </gshell:command>
-
- <gshell:command name="ls">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.ListDirectoryAction" parent="vfsCommandActionTemplate"/>
- <gshell:completers>
- <ref bean="fileObjectNameCompleter"/>
- <null/>
- </gshell:completers>
- </gshell:command>
-
- <gshell:link name="dir" target="ls"/>
-
- <gshell:command name="cp">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.CopyAction" parent="vfsCommandActionTemplate"/>
- <gshell:completers>
- <ref bean="fileObjectNameCompleter"/>
- <ref bean="fileObjectNameCompleter"/>
- <null/>
- </gshell:completers>
- </gshell:command>
-
- <gshell:link name="copy" target="cp"/>
-
- <gshell:command name="rm">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.RemoveAction" parent="vfsCommandActionTemplate"/>
- <gshell:completers>
- <ref bean="fileObjectNameCompleter"/>
- <null/>
- </gshell:completers>
- </gshell:command>
-
- <gshell:link name="del" target="rm"/>
-
- <gshell:command name="fileinfo">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.FileInfoAction" parent="vfsCommandActionTemplate"/>
- <gshell:completers>
- <ref bean="fileObjectNameCompleter"/>
- <null/>
- </gshell:completers>
- </gshell:command>
-
- <gshell:command name="touch">
- <gshell:action class="org.apache.geronimo.gshell.commands.file.TouchAction" parent="vfsCommandActionTemplate"/>
+ <gshell:command name="optional/find">
+ <gshell:action class="org.apache.geronimo.gshell.commands.shell.FindAction">
+ <property name="fileSystemAccess" ref="fileSystemAccess"/>
+ </gshell:action>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
Propchange: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml
------------------------------------------------------------------------------
svn:mergeinfo =