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 [5/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/console/src/main/java/org/apache/felix/karaf/shell/console/completer/NullCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/NullCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/NullCompleter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/NullCompleter.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/NullCompleter.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/NullCompleter.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/NullCompleter.java Fri Sep 18 20:14:54 2009
@@ -1,8 +1,8 @@
-package org.apache.felix.karaf.gshell.console.completer;
+package org.apache.felix.karaf.shell.console.completer;
import java.util.List;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
public class NullCompleter implements Completer {
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/StringsCompleter.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/StringsCompleter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/StringsCompleter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/StringsCompleter.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/completer/StringsCompleter.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/StringsCompleter.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/completer/StringsCompleter.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.completer;
+package org.apache.felix.karaf.shell.console.completer;
import java.util.Arrays;
import java.util.Collection;
@@ -24,7 +24,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
/**
* Completer for a set of strings.
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/CompleterAsCompletor.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/CompleterAsCompletor.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/CompleterAsCompletor.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/CompleterAsCompletor.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/CompleterAsCompletor.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/CompleterAsCompletor.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/CompleterAsCompletor.java Fri Sep 18 20:14:54 2009
@@ -1,9 +1,9 @@
-package org.apache.felix.karaf.gshell.console.jline;
+package org.apache.felix.karaf.shell.console.jline;
import java.util.List;
import jline.Completor;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
/**
* Created by IntelliJ IDEA.
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/Console.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/Console.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/Console.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/Console.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/Console.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.jline;
+package org.apache.felix.karaf.shell.console.jline;
import java.io.IOException;
import java.io.InputStream;
@@ -34,7 +34,7 @@
import jline.UnsupportedTerminal;
import jline.WindowsTerminal;
import jline.AnsiWindowsTerminal;
-import org.apache.felix.karaf.gshell.console.Completer;
+import org.apache.felix.karaf.shell.console.Completer;
import org.osgi.service.command.CommandProcessor;
import org.osgi.service.command.CommandSession;
import org.osgi.service.command.Converter;
@@ -138,7 +138,7 @@
protected void welcome() {
Properties props = new Properties();
- loadProps(props, "/org/apache/felix/karaf/gshell/console/branding.properties");
+ loadProps(props, "/org/apache/felix/karaf/shell/console/branding.properties");
loadProps(props, "/org/apache/felix/karaf/branding/branding.properties");
String welcome = props.getProperty("welcome");
if (welcome != null && welcome.length() > 0) {
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/ConsoleFactory.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/ConsoleFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/ConsoleFactory.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/ConsoleFactory.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/ConsoleFactory.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/ConsoleFactory.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/ConsoleFactory.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.jline;
+package org.apache.felix.karaf.shell.console.jline;
import java.io.InputStream;
import java.io.PrintStream;
@@ -24,8 +24,8 @@
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.felix.karaf.gshell.console.Completer;
-import org.apache.felix.karaf.gshell.console.completer.AggregateCompleter;
+import org.apache.felix.karaf.shell.console.Completer;
+import org.apache.felix.karaf.shell.console.completer.AggregateCompleter;
import org.osgi.framework.BundleContext;
import org.osgi.service.command.CommandProcessor;
import org.osgi.service.command.CommandSession;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/TerminalFactory.java (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/TerminalFactory.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/TerminalFactory.java&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/TerminalFactory.java (original)
+++ felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/TerminalFactory.java Fri Sep 18 20:14:54 2009
@@ -1,4 +1,4 @@
-package org.apache.felix.karaf.gshell.console.jline;
+package org.apache.felix.karaf.shell.console.jline;
import jline.Terminal;
import jline.UnsupportedTerminal;
Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/keybindings.properties (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/keybindings.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/keybindings.properties?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/karaf/shell/console/jline/keybindings.properties&p1=felix/trunk/karaf/gshell/gshell-console/src/main/java/org/apache/felix/karaf/gshell/console/jline/keybindings.properties&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml?p2=felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml&p1=felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml (original)
+++ felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml Fri Sep 18 20:14:54 2009
@@ -35,11 +35,11 @@
unbind-method="unregister"/>
</reference-list>
- <bean id="commandCompleter" class="org.apache.felix.karaf.gshell.console.completer.CommandsCompleter">
+ <bean id="commandCompleter" class="org.apache.felix.karaf.shell.console.completer.CommandsCompleter">
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <bean id="consoleFactory" class="org.apache.felix.karaf.gshell.console.jline.ConsoleFactory">
+ <bean id="consoleFactory" class="org.apache.felix.karaf.shell.console.jline.ConsoleFactory">
<property name="start" value="$[karaf.startLocalConsole]"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
<property name="completers">
@@ -54,7 +54,7 @@
factory-ref="terminalFactory"
factory-method="getTerminal"/>
- <bean id="terminalFactory" class="org.apache.felix.karaf.gshell.console.jline.TerminalFactory"
+ <bean id="terminalFactory" class="org.apache.felix.karaf.shell.console.jline.TerminalFactory"
init-method="init"
destroy-method="destroy"/>
Copied: felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml?p2=felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml&p1=felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/resources/OSGI-INF/blueprint/gshell-namespacehandler.xml (original)
+++ felix/trunk/karaf/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml Fri Sep 18 20:14:54 2009
@@ -21,9 +21,9 @@
<service interface="org.apache.geronimo.blueprint.NamespaceHandler">
<service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0"/>
+ <entry key="osgi.service.blueprint.namespace" value="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"/>
</service-properties>
- <bean class="org.apache.felix.karaf.gshell.console.commands.NamespaceHandler"/>
+ <bean class="org.apache.felix.karaf.shell.console.commands.NamespaceHandler"/>
</service>
</blueprint>
Copied: felix/trunk/karaf/shell/console/src/main/resources/org/apache/felix/karaf/shell/console/commands/karaf-shell.xsd (from r816756, felix/trunk/karaf/gshell/gshell-console/src/main/resources/org/apache/felix/karaf/gshell/console/commands/karaf-gshell.xsd)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/resources/org/apache/felix/karaf/shell/console/commands/karaf-shell.xsd?p2=felix/trunk/karaf/shell/console/src/main/resources/org/apache/felix/karaf/shell/console/commands/karaf-shell.xsd&p1=felix/trunk/karaf/gshell/gshell-console/src/main/resources/org/apache/felix/karaf/gshell/console/commands/karaf-gshell.xsd&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-console/src/main/resources/org/apache/felix/karaf/gshell/console/commands/karaf-gshell.xsd (original)
+++ felix/trunk/karaf/shell/console/src/main/resources/org/apache/felix/karaf/shell/console/commands/karaf-shell.xsd Fri Sep 18 20:14:54 2009
@@ -20,10 +20,10 @@
<!-- $Rev: 699828 $ $Date: 2008-09-28 16:35:27 +0200 (Sun, 28 Sep 2008) $ -->
-<xsd:schema xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0"
+<xsd:schema xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- targetNamespace="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0"
+ targetNamespace="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
Copied: felix/trunk/karaf/shell/log/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-log/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/pom.xml?p2=felix/trunk/karaf/shell/log/pom.xml&p1=felix/trunk/karaf/gshell/gshell-log/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/pom.xml (original)
+++ felix/trunk/karaf/shell/log/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.log</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.log</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell Log Commands</name>
+ <name>Apache Felix Karaf :: Shell Log Commands</name>
<description>
Provides the OSGi Log commands
@@ -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>
<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/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayException.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayException.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayException.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayException.java Fri Sep 18 20:14:54 2009
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.log;
+package org.apache.felix.karaf.shell.log;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Command;
@Command(scope = "log", name = "display-exception", description = "Display the last exception from the log.")
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayLog.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayLog.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayLog.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/DisplayLog.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.log;
+package org.apache.felix.karaf.shell.log;
-import org.apache.felix.karaf.gshell.log.layout.PatternConverter;
-import org.apache.felix.karaf.gshell.log.layout.PatternParser;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.log.layout.PatternConverter;
+import org.apache.felix.karaf.shell.log.layout.PatternParser;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/GetLogLevel.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/GetLogLevel.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/GetLogLevel.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/GetLogLevel.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.log;
+package org.apache.felix.karaf.shell.log;
import java.util.Dictionary;
import java.util.Enumeration;
@@ -24,7 +24,7 @@
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-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/log/src/main/java/org/apache/felix/karaf/shell/log/LruList.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/LruList.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/LruList.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/LruList.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.log;
+package org.apache.felix.karaf.shell.log;
import java.util.Arrays;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/SetLogLevel.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/SetLogLevel.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/SetLogLevel.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/SetLogLevel.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.log;
+package org.apache.felix.karaf.shell.log;
import java.util.Dictionary;
-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;
import org.osgi.framework.ServiceReference;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/VmLogAppender.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/VmLogAppender.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/VmLogAppender.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/VmLogAppender.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.log;
+package org.apache.felix.karaf.shell.log;
import org.ops4j.pax.logging.spi.PaxAppender;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/AbsoluteTimeDateFormat.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/AbsoluteTimeDateFormat.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/AbsoluteTimeDateFormat.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/AbsoluteTimeDateFormat.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.log.layout;
+package org.apache.felix.karaf.shell.log.layout;
import java.text.DateFormat;
import java.text.FieldPosition;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/DateTimeDateFormat.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/DateTimeDateFormat.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/DateTimeDateFormat.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/DateTimeDateFormat.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.log.layout;
+package org.apache.felix.karaf.shell.log.layout;
import java.text.DateFormatSymbols;
import java.text.FieldPosition;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/FormattingInfo.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/FormattingInfo.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/FormattingInfo.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/FormattingInfo.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.log.layout;
+package org.apache.felix.karaf.shell.log.layout;
/**
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/ISO8601DateFormat.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/ISO8601DateFormat.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/ISO8601DateFormat.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/ISO8601DateFormat.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.log.layout;
+package org.apache.felix.karaf.shell.log.layout;
import java.text.FieldPosition;
import java.text.ParsePosition;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternConverter.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternConverter.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternConverter.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternConverter.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.log.layout;
+package org.apache.felix.karaf.shell.log.layout;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Copied: felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternParser.java (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternParser.java?p2=felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternParser.java&p1=felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java (original)
+++ felix/trunk/karaf/shell/log/src/main/java/org/apache/felix/karaf/shell/log/layout/PatternParser.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.log.layout;
+package org.apache.felix.karaf.shell.log.layout;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
Copied: felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml?p2=felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml&p1=felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/blueprint/gshell-log.xml (original)
+++ felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml Fri Sep 18 20:14:54 2009
@@ -29,36 +29,36 @@
</cm:default-properties>
</cm:property-placeholder>
- <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="log/display">
- <action class="org.apache.felix.karaf.gshell.log.DisplayLog">
+ <action class="org.apache.felix.karaf.shell.log.DisplayLog">
<property name="events" ref="events"/>
<property name="pattern" value="${pattern}"/>
</action>
</command>
<link name="log/d" target="log/display"/>
<command name="log/display-exception">
- <action class="org.apache.felix.karaf.gshell.log.DisplayException">
+ <action class="org.apache.felix.karaf.shell.log.DisplayException">
<property name="events" ref="events"/>
</action>
</command>
<link name="log/de" target="log/display-exception"/>
<command name="log/get">
- <action class="org.apache.felix.karaf.gshell.log.GetLogLevel" />
+ <action class="org.apache.felix.karaf.shell.log.GetLogLevel" />
</command>
<command name="log/set">
- <action class="org.apache.felix.karaf.gshell.log.SetLogLevel" />
+ <action class="org.apache.felix.karaf.shell.log.SetLogLevel" />
</command>
<alias name="ld" alias="log/d"/>
<alias name="lde" alias="log/de"/>
</command-bundle>
- <bean id="vmLogAppender" class="org.apache.felix.karaf.gshell.log.VmLogAppender">
+ <bean id="vmLogAppender" class="org.apache.felix.karaf.shell.log.VmLogAppender">
<property name="events" ref="events"/>
</bean>
- <bean id="events" class="org.apache.felix.karaf.gshell.log.LruList">
+ <bean id="events" class="org.apache.felix.karaf.shell.log.LruList">
<argument value="${size}"/>
</bean>
Copied: felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties?p2=felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/metatype/metatype.properties&p1=felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml (from r816756, felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml?p2=felix/trunk/karaf/shell/log/src/main/resources/OSGI-INF/metatype/metatype.xml&p1=felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
(empty)
Copied: felix/trunk/karaf/shell/obr/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-obr/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/pom.xml?p2=felix/trunk/karaf/shell/obr/pom.xml&p1=felix/trunk/karaf/gshell/gshell-obr/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/pom.xml (original)
+++ felix/trunk/karaf/shell/obr/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.obr</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell OBR Commands</name>
+ <name>Apache Felix Karaf :: Shell OBR Commands</name>
<description>
- Provides the OBR GShell commands
+ Provides the OBR Shell commands
</description>
<dependencies>
@@ -50,8 +50,8 @@
</dependency>
<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>
@@ -69,7 +69,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/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/AddUrlCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.net.URL;
import java.util.List;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/DeployCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/DeployCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/DeployCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/DeployCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.util.List;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/FileUtil.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/FileUtil.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/FileUtil.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/FileUtil.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.io.BufferedOutputStream;
import java.io.File;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/InfoCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/InfoCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/InfoCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/InfoCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.io.PrintStream;
import java.lang.reflect.Array;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.util.List;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ListUrlCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ObrCommandSupport.java Fri Sep 18 20:14:54 2009
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.obr;
+package org.apache.felix.karaf.shell.obr;
import java.io.PrintStream;
import java.util.List;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RefreshUrlCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.net.URL;
import java.util.List;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/RemoveUrlCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.net.URL;
import java.util.List;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/SourceCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import java.net.URL;
import java.util.List;
Copied: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/StartCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/StartCommand.java?p2=felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/StartCommand.java&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java (original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/StartCommand.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.obr;
+package org.apache.felix.karaf.shell.obr;
import org.osgi.service.obr.RepositoryAdmin;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (from r816756, felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?p2=felix/trunk/karaf/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml&p1=felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml (original)
+++ felix/trunk/karaf/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Fri Sep 18 20:14:54 2009
@@ -19,33 +19,33 @@
-->
<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="obr/addUrl">
- <action class="org.apache.felix.karaf.gshell.obr.AddUrlCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.AddUrlCommand"/>
</command>
<command name="obr/deploy">
- <action class="org.apache.felix.karaf.gshell.obr.DeployCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.DeployCommand"/>
</command>
<command name="obr/info">
- <action class="org.apache.felix.karaf.gshell.obr.InfoCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.InfoCommand"/>
</command>
<command name="obr/list">
- <action class="org.apache.felix.karaf.gshell.obr.ListCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.ListCommand"/>
</command>
<command name="obr/listUrl">
- <action class="org.apache.felix.karaf.gshell.obr.ListUrlCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.ListUrlCommand"/>
</command>
<command name="obr/removeUrl">
- <action class="org.apache.felix.karaf.gshell.obr.RemoveUrlCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.RemoveUrlCommand"/>
</command>
<command name="obr/refreshUrl">
- <action class="org.apache.felix.karaf.gshell.obr.RefreshUrlCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.RefreshUrlCommand"/>
</command>
<command name="obr/source">
- <action class="org.apache.felix.karaf.gshell.obr.SourceCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.SourceCommand"/>
</command>
<command name="obr/start">
- <action class="org.apache.felix.karaf.gshell.obr.StartCommand"/>
+ <action class="org.apache.felix.karaf.shell.obr.StartCommand"/>
</command>
</command-bundle>
Copied: felix/trunk/karaf/shell/osgi/pom.xml (from r816756, felix/trunk/karaf/gshell/gshell-osgi/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/pom.xml?p2=felix/trunk/karaf/shell/osgi/pom.xml&p1=felix/trunk/karaf/gshell/gshell-osgi/pom.xml&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/pom.xml (original)
+++ felix/trunk/karaf/shell/osgi/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.osgi</artifactId>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.osgi</artifactId>
<packaging>bundle</packaging>
<version>0.9.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: GShell OSGi Commands</name>
+ <name>Apache Felix Karaf :: Shell OSGi Commands</name>
<description>
- Provides the OSGi GShell commands
+ Provides the OSGi 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>
@@ -55,6 +55,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-extender</artifactId>
<optional>true</optional>
@@ -73,7 +78,7 @@
<Import-Package>
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.gshell.console,
+ org.apache.felix.karaf.shell.console,
org.springframework*;resolution:=optional,
*
</Import-Package>
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BlueprintListener.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BlueprintListener.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BlueprintListener.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BlueprintListener.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BlueprintListener.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleCommand.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleCommand.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleCommand.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Argument;
import org.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleLevel.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleLevel.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleLevel.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleLevel.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleStateListener.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleStateListener.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleStateListener.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleStateListener.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleStateListener.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleStateListener.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundleStateListener.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import org.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundlesCommand.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundlesCommand.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundlesCommand.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/BundlesCommand.java Fri Sep 18 20:14:54 2009
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.ArrayList;
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.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Headers.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Headers.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Headers.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Headers.java Fri Sep 18 20:14:54 2009
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.gshell.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.Dictionary;
import java.util.Enumeration;
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.Command;
import org.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/InstallBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/InstallBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/InstallBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/InstallBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.karaf.gshell.console.OsgiCommandSupport;
+import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListBundles.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListBundles.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListBundles.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListBundles.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
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.Option;
import org.apache.felix.gogo.commands.Command;
import org.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListServices.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListServices.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListServices.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ListServices.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
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/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RefreshBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RefreshBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RefreshBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RefreshBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
-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;
import org.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ResolveBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ResolveBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ResolveBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/ResolveBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RestartBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RestartBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RestartBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/RestartBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.List;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Shutdown.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Shutdown.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Shutdown.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Shutdown.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
-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.osgi.framework.Bundle;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/SpringStateListenerFactory.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringStateListenerFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/SpringStateListenerFactory.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/SpringStateListenerFactory.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringStateListenerFactory.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringStateListenerFactory.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/SpringStateListenerFactory.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.Map;
import java.util.Hashtable;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.List;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartLevel.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartLevel.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartLevel.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StartLevel.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
-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;
import org.osgi.framework.ServiceReference;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StopBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StopBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StopBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/StopBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.util.List;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UninstallBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UninstallBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UninstallBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UninstallBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import org.osgi.framework.Bundle;
import org.apache.felix.gogo.commands.Command;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UpdateBundle.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UpdateBundle.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UpdateBundle.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/UpdateBundle.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.io.InputStream;
import java.net.URL;
Copied: felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Util.java (from r816756, felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Util.java?p2=felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Util.java&p1=felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java&r1=816756&r2=816769&rev=816769&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java (original)
+++ felix/trunk/karaf/shell/osgi/src/main/java/org/apache/felix/karaf/shell/osgi/Util.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.osgi;
+package org.apache.felix.karaf.shell.osgi;
import java.io.IOException;