You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/09/18 22:15:11 UTC
svn commit: r816769 [4/6] - in /felix/trunk/karaf: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/bin/
assembly/src/main/filtered-resources...
Copied: felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/OSGI-INF/blueprint/gshell-admin.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml?p2=felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/OSGI-INF/blueprint/gshell-admin.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/main/resources/OSGI-INF/blueprint/gshell-admin.xml (original)
+++ felix/trunk/karaf/shell/admin/src/main/resources/OSGI-INF/blueprint/shell-admin.xml Fri Sep 18 20:14:54 2009
@@ -21,14 +21,14 @@
xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
default-activation="lazy">
- <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="admin/create">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.CreateCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.CreateCommand">
<property name="adminService" ref="adminService" />
</action>
</command>
<command name="admin/connect">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.ConnectCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.ConnectCommand">
<property name="adminService" ref="adminService" />
</action>
<completers>
@@ -37,12 +37,12 @@
</completers>
</command>
<command name="admin/list">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.ListCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.ListCommand">
<property name="adminService" ref="adminService" />
</action>
</command>
<command name="admin/start">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.StartCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.StartCommand">
<property name="adminService" ref="adminService" />
</action>
<completers>
@@ -51,7 +51,7 @@
</completers>
</command>
<command name="admin/stop">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.StopCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.StopCommand">
<property name="adminService" ref="adminService" />
</action>
<completers>
@@ -60,7 +60,7 @@
</completers>
</command>
<command name="admin/destroy">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.DestroyCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.DestroyCommand">
<property name="adminService" ref="adminService" />
</action>
<completers>
@@ -69,7 +69,7 @@
</completers>
</command>
<command name="admin/change-port">
- <action class="org.apache.felix.karaf.gshell.admin.internal.commands.ChangePortCommand">
+ <action class="org.apache.felix.karaf.shell.admin.internal.commands.ChangePortCommand">
<property name="adminService" ref="adminService" />
</action>
<completers>
@@ -79,15 +79,15 @@
</command>
</command-bundle>
- <bean id="adminService" class="org.apache.felix.karaf.gshell.admin.internal.AdminServiceImpl" init-method="init">
+ <bean id="adminService" class="org.apache.felix.karaf.shell.admin.internal.AdminServiceImpl" init-method="init">
<property name="storageLocation" value="${karaf.home}/instances" />
</bean>
- <bean id="instanceCompleter" class="org.apache.felix.karaf.gshell.admin.internal.completers.InstanceCompleter">
+ <bean id="instanceCompleter" class="org.apache.felix.karaf.shell.admin.internal.completers.InstanceCompleter">
<property name="adminService" ref="adminService" />
</bean>
- <service ref="adminService" interface="org.apache.felix.karaf.gshell.admin.AdminService" />
+ <service ref="adminService" interface="org.apache.felix.karaf.shell.admin.AdminService" />
<!-- Allow the use of system properties -->
<ext:property-placeholder />
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/start)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/start&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/start.bat)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/start.bat&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/start.bat&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/stop)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/stop&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/stop.bat)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/bin/stop.bat&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/stop.bat&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.felix.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.apache.felix.karaf.shell.cfg&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.felix.karaf.shell.cfg&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/org.ops4j.pax.url.mvn.cfg&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.url.mvn.cfg&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/system.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties?p2=felix/trunk/karaf/shell/admin/src/main/resources/org/apache/felix/karaf/shell/admin/etc/system.properties&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/system.properties&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java?p2=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java?p2=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java (from r816756, felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/gshell/admin/main/ExecuteTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java?p2=felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/gshell/admin/main/ExecuteTest.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/gshell/admin/main/ExecuteTest.java (original)
+++ felix/trunk/karaf/shell/admin/src/test/java/org/apache/felix/karaf/shell/admin/main/ExecuteTest.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.admin.main;
+package org.apache.felix.karaf.shell.admin.main;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -28,9 +28,9 @@
import junit.framework.TestCase;
-import org.apache.felix.karaf.gshell.admin.AdminService;
-import org.apache.felix.karaf.gshell.admin.internal.AdminServiceImpl;
-import org.apache.felix.karaf.gshell.admin.internal.commands.AdminCommandSupport;
+import org.apache.felix.karaf.shell.admin.AdminService;
+import org.apache.felix.karaf.shell.admin.internal.AdminServiceImpl;
+import org.apache.felix.karaf.shell.admin.internal.commands.AdminCommandSupport;
import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock;
Copied: felix/trunk/karaf/shell/commands/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-commands/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/pom.xml?p2=felix/trunk/karaf/shell/commands/pom.xml&p1=felix/trunk/karaf/gshell/gshell-commands/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/pom.xml (original)
+++ felix/trunk/karaf/shell/commands/pom.xml Fri Sep 18 20:14:54 2009
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>gshell</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>shell</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.commands</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.commands</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell Various Commands</name>
+ <name>Apache Felix Karaf :: Shell Various Commands</name>
<description>
Provides SSH support to the console
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
</dependency>
</dependencies>
@@ -64,7 +64,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.gshell.console,
+ org.apache.felix.karaf.shell.console,
*
</Import-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/CatAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/CatAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/CatAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/CatAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/CatAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/CatAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/CatAction.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.io.IOException;
import java.io.BufferedReader;
@@ -27,7 +27,7 @@
import java.net.MalformedURLException;
import java.util.List;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/EchoAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/EchoAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/EchoAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/EchoAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/EchoAction.java Fri Sep 18 20:14:54 2009
@@ -1,11 +1,11 @@
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.util.List;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
@Command(scope = "shell", name = "echo", description="Echo or print arguments to STDOUT")
public class EchoAction extends OsgiCommandSupport
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/ExecuteAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/ExecuteAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/ExecuteAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/ExecuteAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/ExecuteAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/ExecuteAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/ExecuteAction.java Fri Sep 18 20:14:54 2009
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.util.List;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.karaf.gshell.commands.utils.PumpStreamHandler;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.commands.utils.PumpStreamHandler;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
/**
* Execute system processes.
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/GrepAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/GrepAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/GrepAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/GrepAction.java Fri Sep 18 20:14:54 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.io.IOException;
import java.io.Reader;
import java.io.InputStreamReader;
import java.util.regex.Pattern;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/HistoryAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/HistoryAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/HistoryAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/HistoryAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/HistoryAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/HistoryAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/HistoryAction.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
/**
* TODO
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/InfoAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/InfoAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/InfoAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/InfoAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/InfoAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/InfoAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/InfoAction.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.util.Locale;
import java.text.DecimalFormatSymbols;
@@ -29,7 +29,7 @@
import java.lang.management.GarbageCollectorMXBean;
import java.lang.reflect.Method;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
import org.fusesource.jansi.Ansi;
@@ -50,7 +50,7 @@
ClassLoadingMXBean cl = ManagementFactory.getClassLoadingMXBean();
//
- // print ServiceMix informations
+ // print Karaf informations
//
maxNameLen = 25;
System.out.println("Karaf");
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/JavaAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/JavaAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/JavaAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/JavaAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/JavaAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/JavaAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/JavaAction.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.lang.reflect.Method;
import java.util.List;
@@ -22,7 +22,7 @@
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
/**
* Execute a Java standard application.
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/MoreAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/MoreAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/MoreAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/MoreAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/MoreAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/MoreAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/MoreAction.java Fri Sep 18 20:14:54 2009
@@ -1,4 +1,4 @@
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/PrintfAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/PrintfAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/PrintfAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/PrintfAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/PrintfAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/PrintfAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/PrintfAction.java Fri Sep 18 20:14:54 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.util.Collection;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SleepAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SleepAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SleepAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SleepAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SleepAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SleepAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SleepAction.java Fri Sep 18 20:14:54 2009
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SortAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SortAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SortAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SortAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SortAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SortAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SortAction.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.io.BufferedReader;
import java.io.File;
@@ -37,7 +37,7 @@
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
/**
* Sort lines of text
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SourceAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SourceAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SourceAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SourceAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SourceAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/SourceAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/SourceAction.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
/**
* TODO
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/TacAction.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/TacAction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/TacAction.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/TacAction.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/TacAction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/TacAction.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/TacAction.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.io.StringWriter;
import java.io.BufferedReader;
@@ -27,7 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/PumpStreamHandler.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/utils/PumpStreamHandler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/PumpStreamHandler.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/PumpStreamHandler.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/utils/PumpStreamHandler.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/utils/PumpStreamHandler.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/PumpStreamHandler.java Fri Sep 18 20:14:54 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.karaf.gshell.commands.utils;
+package org.apache.felix.karaf.shell.commands.utils;
import java.io.InputStream;
import java.io.OutputStream;
Copied: felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/StreamPumper.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/utils/StreamPumper.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/StreamPumper.java?p2=felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/StreamPumper.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/utils/StreamPumper.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/java/org/apache/felix/karaf/gshell/commands/utils/StreamPumper.java (original)
+++ felix/trunk/karaf/shell/commands/src/main/java/org/apache/felix/karaf/shell/commands/utils/StreamPumper.java Fri Sep 18 20:14:54 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.karaf.gshell.commands.utils;
+package org.apache.felix.karaf.shell.commands.utils;
import java.io.InputStream;
import java.io.OutputStream;
Copied: felix/trunk/karaf/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?p2=felix/trunk/karaf/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml&p1=felix/trunk/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/main/resources/OSGI-INF/blueprint/gshell-commands.xml (original)
+++ felix/trunk/karaf/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Fri Sep 18 20:14:54 2009
@@ -19,51 +19,51 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="shell/cat">
- <action class="org.apache.felix.karaf.gshell.commands.CatAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.CatAction"/>
</command>
<command name="shell/echo">
- <action class="org.apache.felix.karaf.gshell.commands.EchoAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.EchoAction"/>
</command>
<command name="shell/exec">
- <action class="org.apache.felix.karaf.gshell.commands.ExecuteAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.ExecuteAction"/>
</command>
<command name="shell/grep">
- <action class="org.apache.felix.karaf.gshell.commands.GrepAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.GrepAction"/>
</command>
<!--
<command name="shell/history">
- <action class="org.apache.felix.karaf.gshell.commands.HistoryAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.HistoryAction"/>
</command>
-->
<command name="shell/info">
- <action class="org.apache.felix.karaf.gshell.commands.InfoAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.InfoAction"/>
</command>
<command name="shell/java">
- <action class="org.apache.felix.karaf.gshell.commands.JavaAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.JavaAction"/>
</command>
<!--
<command name="shell/more">
- <action class="org.apache.felix.karaf.gshell.commands.MoreAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.MoreAction"/>
</command>
-->
<command name="shell/printf">
- <action class="org.apache.felix.karaf.gshell.commands.PrintfAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.PrintfAction"/>
</command>
<command name="shell/sleep">
- <action class="org.apache.felix.karaf.gshell.commands.SleepAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.SleepAction"/>
</command>
<command name="shell/sort">
- <action class="org.apache.felix.karaf.gshell.commands.SortAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.SortAction"/>
</command>
<!--
<command name="shell/source">
- <action class="org.apache.felix.karaf.gshell.commands.SourceAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.SourceAction"/>
</command>
-->
<command name="shell/tac">
- <action class="org.apache.felix.karaf.gshell.commands.TacAction"/>
+ <action class="org.apache.felix.karaf.shell.commands.TacAction"/>
</command>
</command-bundle>
Copied: felix/trunk/karaf/shell/commands/src/test/java/org/apache/felix/karaf/shell/commands/SortTest.java (from r816756, felix/trunk/karaf/gshell/gshell-commands/src/test/java/org/apache/felix/karaf/gshell/commands/SortTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/src/test/java/org/apache/felix/karaf/shell/commands/SortTest.java?p2=felix/trunk/karaf/shell/commands/src/test/java/org/apache/felix/karaf/shell/commands/SortTest.java&p1=felix/trunk/karaf/gshell/gshell-commands/src/test/java/org/apache/felix/karaf/gshell/commands/SortTest.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-commands/src/test/java/org/apache/felix/karaf/gshell/commands/SortTest.java (original)
+++ felix/trunk/karaf/shell/commands/src/test/java/org/apache/felix/karaf/shell/commands/SortTest.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.commands;
+package org.apache.felix.karaf.shell.commands;
import java.util.Arrays;
import java.util.List;
Copied: felix/trunk/karaf/shell/config/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-config/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/pom.xml?p2=felix/trunk/karaf/shell/config/pom.xml&p1=felix/trunk/karaf/gshell/gshell-config/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/pom.xml (original)
+++ felix/trunk/karaf/shell/config/pom.xml Fri Sep 18 20:14:54 2009
@@ -22,25 +22,25 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>gshell</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>shell</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.config</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell ConfigAdmin Commands</name>
+ <name>Apache Felix Karaf :: Shell ConfigAdmin Commands</name>
<description>
- Provides the ConfigAdmin GShell commands
+ Provides the ConfigAdmin Shell commands
</description>
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.gshell.console,
+ org.apache.felix.karaf.shell.console,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/CancelCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/CancelCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/CancelCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/CancelCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import org.osgi.service.cm.ConfigurationAdmin;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ConfigCommandSupport.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ConfigCommandSupport.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ConfigCommandSupport.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ConfigCommandSupport.java Fri Sep 18 20:14:54 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationAdmin;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/EditCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/EditCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/EditCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/EditCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
import java.util.Properties;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ListCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ListCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ListCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/ListCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
import java.util.Enumeration;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropAppendCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropAppendCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropAppendCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropAppendCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropAppendCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropDelCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropDelCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropDelCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropDelCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropListCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropListCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropListCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropListCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
import java.util.Enumeration;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropSetCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropSetCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropSetCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/PropSetCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/UpdateCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/UpdateCommand.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/UpdateCommand.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/UpdateCommand.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import java.util.Dictionary;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationCompleter.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationCompleter.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationCompleter.java Fri Sep 18 20:14:54 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.felix.karaf.gshell.config.completers;
+package org.apache.felix.karaf.shell.config.completers;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.felix.karaf.gshell.console.completer.StringsCompleter;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.completer.StringsCompleter;
+import org.apache.felix.karaf.shell.console.Completer;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationEvent;
Copied: felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationPropertyCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationPropertyCompleter.java?p2=felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationPropertyCompleter.java&p1=felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java (original)
+++ felix/trunk/karaf/shell/config/src/main/java/org/apache/felix/karaf/shell/config/completers/ConfigurationPropertyCompleter.java Fri Sep 18 20:14:54 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.karaf.gshell.config.completers;
+package org.apache.felix.karaf.shell.config.completers;
import java.util.List;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
/**
* {@link jline.Completor} for Configuration Admin properties.
Copied: felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml (from r816756, felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?p2=felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml&p1=felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/main/resources/OSGI-INF/blueprint/gshell-config.xml (original)
+++ felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml Fri Sep 18 20:14:54 2009
@@ -20,55 +20,55 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
default-activation="lazy">
- <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+ <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
<command name="config/cancel">
- <action class="org.apache.felix.karaf.gshell.config.CancelCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.CancelCommand"/>
</command>
<command name="config/edit">
- <action class="org.apache.felix.karaf.gshell.config.EditCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.EditCommand"/>
<completers>
<ref component-id="configCompleter" />
<null/>
</completers>
</command>
<command name="config/list">
- <action class="org.apache.felix.karaf.gshell.config.ListCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.ListCommand"/>
</command>
<command name="config/propdel">
- <action class="org.apache.felix.karaf.gshell.config.PropDelCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.PropDelCommand"/>
<completers>
<ref component-id="configPropertyCompleter" />
<null/>
</completers>
</command>
<command name="config/proplist">
- <action class="org.apache.felix.karaf.gshell.config.PropListCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.PropListCommand"/>
</command>
<command name="config/propset">
- <action class="org.apache.felix.karaf.gshell.config.PropSetCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.PropSetCommand"/>
<completers>
<ref component-id="configPropertyCompleter" />
<null/>
</completers>
</command>
<command name="config/propappend">
- <action class="org.apache.felix.karaf.gshell.config.PropAppendCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.PropAppendCommand"/>
<completers>
<ref component-id="configPropertyCompleter" />
<null/>
</completers>
</command>
<command name="config/update">
- <action class="org.apache.felix.karaf.gshell.config.UpdateCommand"/>
+ <action class="org.apache.felix.karaf.shell.config.UpdateCommand"/>
</command>
</command-bundle>
- <bean id="configCompleter" class="org.apache.felix.karaf.gshell.config.completers.ConfigurationCompleter" init-method="init">
+ <bean id="configCompleter" class="org.apache.felix.karaf.shell.config.completers.ConfigurationCompleter" init-method="init">
<property name="admin" ref="configAdmin"/>
</bean>
<service ref="configCompleter" interface="org.osgi.service.cm.ConfigurationListener" />
- <bean id="configPropertyCompleter" class="org.apache.felix.karaf.gshell.config.completers.ConfigurationPropertyCompleter" />
+ <bean id="configPropertyCompleter" class="org.apache.felix.karaf.shell.config.completers.ConfigurationPropertyCompleter" />
<reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
Copied: felix/trunk/karaf/shell/config/src/test/java/org/apache/felix/karaf/shell/config/EditCommandTest.java (from r816756, felix/trunk/karaf/gshell/gshell-config/src/test/java/org/apache/felix/karaf/gshell/config/EditCommandTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/test/java/org/apache/felix/karaf/shell/config/EditCommandTest.java?p2=felix/trunk/karaf/shell/config/src/test/java/org/apache/felix/karaf/shell/config/EditCommandTest.java&p1=felix/trunk/karaf/gshell/gshell-config/src/test/java/org/apache/felix/karaf/gshell/config/EditCommandTest.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-config/src/test/java/org/apache/felix/karaf/gshell/config/EditCommandTest.java (original)
+++ felix/trunk/karaf/shell/config/src/test/java/org/apache/felix/karaf/shell/config/EditCommandTest.java Fri Sep 18 20:14:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.config;
+package org.apache.felix.karaf.shell.config;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
Copied: felix/trunk/karaf/shell/console/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-console/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/pom.xml?p2=felix/trunk/karaf/shell/console/pom.xml&p1=felix/trunk/karaf/gshell/gshell-console/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/pom.xml (original)
+++ felix/trunk/karaf/shell/console/pom.xml Fri Sep 18 20:14:54 2009
@@ -22,19 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>gshell</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>shell</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.gshell</groupId>
- <artifactId>org.apache.felix.karaf.gshell.console</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell Console</name>
+ <name>Apache Felix Karaf :: Shell Console</name>
<description>
- Provides the OSGi GShell integration
+ Provides the OSGi Shell integration
</description>
<dependencies>
@@ -102,7 +102,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Import-Package>
!javax.swing,
- !org.apache.felix.karaf.gshell.console*,
+ !org.apache.felix.karaf.shell.console*,
!org.fusesource.jansi*,
!org.apache.felix.gogo.commands*,
!jline,
@@ -112,7 +112,7 @@
</Import-Package>
<Export-Package>
org.apache.felix.gogo.commands*;version=${felix.gogo.version},
- org.apache.felix.karaf.gshell.console*;version=${pom.version},
+ org.apache.felix.karaf.shell.console*;version=${pom.version},
org.fusesource.jansi;version=${jansi.version},
jline;version=${jline.version},
Copied: felix/trunk/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/filtered-resources/org/apache/felix/karaf/gshell/console/branding.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties?p2=felix/trunk/karaf/shell/console/src/main/filtered-resources/org/apache/felix/karaf/shell/console/branding.properties&p1=felix/trunk/karaf/gshell/gshell-console/src/main/filtered-resources/org/apache/felix/karaf/gshell/console/branding.properties&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/console/src/main/java/jline/AnsiWindowsTerminal.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/jline/AnsiWindowsTerminal.java?p2=felix/trunk/karaf/shell/console/src/main/java/jline/AnsiWindowsTerminal.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/AnsiWindowsTerminal.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/console/src/main/java/jline/NoInterruptUnixTerminal.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/jline/NoInterruptUnixTerminal.java?p2=felix/trunk/karaf/shell/console/src/main/java/jline/NoInterruptUnixTerminal.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/jline/NoInterruptUnixTerminal.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BlueprintContainerAware.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/BlueprintContainerAware.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BlueprintContainerAware.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BlueprintContainerAware.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/BlueprintContainerAware.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/BlueprintContainerAware.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BlueprintContainerAware.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.console;
+package org.apache.felix.karaf.shell.console;
import org.osgi.service.blueprint.container.BlueprintContainer;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BundleContextAware.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/BundleContextAware.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BundleContextAware.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BundleContextAware.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/BundleContextAware.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/BundleContextAware.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/BundleContextAware.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.console;
+package org.apache.felix.karaf.shell.console;
import org.osgi.framework.BundleContext;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/CompletableFunction.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/CompletableFunction.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/CompletableFunction.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/CompletableFunction.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/CompletableFunction.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/CompletableFunction.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/CompletableFunction.java Fri Sep 18 20:14:54 2009
@@ -1,4 +1,4 @@
-package org.apache.felix.karaf.gshell.console;
+package org.apache.felix.karaf.shell.console;
import java.util.List;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/Completer.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/Completer.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/Completer.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/Completer.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/Completer.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/Completer.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/Completer.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.console;
+package org.apache.felix.karaf.shell.console;
import java.util.List;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/OsgiCommandSupport.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/OsgiCommandSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/OsgiCommandSupport.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/OsgiCommandSupport.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/OsgiCommandSupport.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/OsgiCommandSupport.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/OsgiCommandSupport.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.console;
+package org.apache.felix.karaf.shell.console;
import java.util.ArrayList;
import java.util.List;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/BlueprintCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/BlueprintCommand.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/BlueprintCommand.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/BlueprintCommand.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/BlueprintCommand.java Fri Sep 18 20:14:54 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.console.commands;
+package org.apache.felix.karaf.shell.console.commands;
import java.lang.reflect.Type;
import java.util.List;
@@ -31,10 +31,10 @@
import org.apache.felix.gogo.commands.basic.AbstractCommand;
import org.apache.felix.gogo.commands.basic.ActionPreparator;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
-import org.apache.felix.karaf.gshell.console.BlueprintContainerAware;
-import org.apache.felix.karaf.gshell.console.BundleContextAware;
-import org.apache.felix.karaf.gshell.console.CompletableFunction;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.BlueprintContainerAware;
+import org.apache.felix.karaf.shell.console.BundleContextAware;
+import org.apache.felix.karaf.shell.console.CompletableFunction;
+import org.apache.felix.karaf.shell.console.Completer;
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.Converter;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/GenericType.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/GenericType.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/GenericType.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/GenericType.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/GenericType.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/GenericType.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/GenericType.java Fri Sep 18 20:14:54 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.console.commands;
+package org.apache.felix.karaf.shell.console.commands;
import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/NamespaceHandler.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/NamespaceHandler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/NamespaceHandler.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/NamespaceHandler.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/NamespaceHandler.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/commands/NamespaceHandler.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/commands/NamespaceHandler.java Fri Sep 18 20:14:54 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.karaf.gshell.console.commands;
+package org.apache.felix.karaf.shell.console.commands;
import java.net.URL;
import java.util.List;
@@ -32,7 +32,7 @@
import org.apache.geronimo.blueprint.mutable.MutableValueMetadata;
import org.apache.geronimo.blueprint.mutable.MutableRefMetadata;
import org.apache.geronimo.blueprint.mutable.MutableCollectionMetadata;
-import org.apache.felix.karaf.gshell.console.CompletableFunction;
+import org.apache.felix.karaf.shell.console.CompletableFunction;
import org.osgi.service.blueprint.reflect.BeanArgument;
import org.osgi.service.blueprint.reflect.BeanProperty;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
@@ -79,7 +79,7 @@
private int nameCounter = 0;
public URL getSchemaLocation(String namespace) {
- return getClass().getResource("karaf-gshell.xsd");
+ return getClass().getResource("karaf-shell.xsd");
}
public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
@@ -259,7 +259,7 @@
}
public synchronized String getName() {
- return "gshell-" + ++nameCounter;
+ return "shell-" + ++nameCounter;
}
private static boolean nodeNameEquals(Node node, String name) {
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/AggregateCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/AggregateCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/AggregateCompleter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/AggregateCompleter.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/AggregateCompleter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/AggregateCompleter.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/AggregateCompleter.java Fri Sep 18 20:14:54 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.felix.karaf.gshell.console.completer;
+package org.apache.felix.karaf.shell.console.completer;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Collection;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
/**
* Completer which contains multipule completers and aggregates them together.
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/ArgumentCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/ArgumentCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/ArgumentCompleter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/ArgumentCompleter.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/ArgumentCompleter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/ArgumentCompleter.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/ArgumentCompleter.java Fri Sep 18 20:14:54 2009
@@ -4,11 +4,11 @@
* This software is distributable under the BSD license. See the terms of the
* BSD license in the documentation provided with this software.
*/
-package org.apache.felix.karaf.gshell.console.completer;
+package org.apache.felix.karaf.shell.console.completer;
import java.util.*;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
public class ArgumentCompleter implements Completer {
final Completer[] completers;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/CommandsCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/CommandsCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/CommandsCompleter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/CommandsCompleter.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/CommandsCompleter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/CommandsCompleter.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/CommandsCompleter.java Fri Sep 18 20:14:54 2009
@@ -1,4 +1,4 @@
-package org.apache.felix.karaf.gshell.console.completer;
+package org.apache.felix.karaf.shell.console.completer;
import java.util.List;
import java.util.Map;
@@ -8,8 +8,8 @@
import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.felix.karaf.gshell.console.Completer;
-import org.apache.felix.karaf.gshell.console.CompletableFunction;
+import org.apache.felix.karaf.shell.console.Completer;
+import org.apache.felix.karaf.shell.console.CompletableFunction;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.BundleContext;
import org.osgi.service.command.CommandProcessor;