You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/09/23 11:12:53 UTC
svn commit: r1000367 - in /karaf/trunk: ./ admin/command/ admin/core/
admin/management/ archetypes/command/src/main/resources/archetype-resources/
features/command/ features/core/ features/management/
itests/tests/src/test/java/org/apache/karaf/shell/i...
Author: gnodet
Date: Thu Sep 23 09:12:51 2010
New Revision: 1000367
URL: http://svn.apache.org/viewvc?rev=1000367&view=rev
Log:
[KARAF-219] Upgrade to latest gogo
Added:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java
Modified:
karaf/trunk/admin/command/pom.xml
karaf/trunk/admin/core/pom.xml
karaf/trunk/admin/management/pom.xml
karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
karaf/trunk/features/command/pom.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/features/management/pom.xml
karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
karaf/trunk/pom.xml
karaf/trunk/shell/commands/pom.xml
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EachAction.java
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/IfAction.java
karaf/trunk/shell/config/pom.xml
karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java
karaf/trunk/shell/console/pom.xml
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/ArgumentCompleterTest.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/BooleanCompleterTest.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompleterValuesTest.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/DummyCommandSession.java
karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/FileCompleterTest.java
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/log/pom.xml
karaf/trunk/shell/obr/pom.xml
karaf/trunk/shell/osgi/pom.xml
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java
karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java
karaf/trunk/shell/packages/pom.xml
karaf/trunk/shell/ssh/pom.xml
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
karaf/trunk/shell/wrapper/pom.xml
karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml
Modified: karaf/trunk/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/admin/command/pom.xml (original)
+++ karaf/trunk/admin/command/pom.xml Thu Sep 23 09:12:51 2010
@@ -88,7 +88,7 @@
!org.apache.karaf.admin.internal,
javax.management,
javax.management.loading,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Thu Sep 23 09:12:51 2010
@@ -163,7 +163,7 @@
!org.apache.karaf.jpm,
javax.management,
javax.management.loading,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/admin/management/pom.xml (original)
+++ karaf/trunk/admin/management/pom.xml Thu Sep 23 09:12:51 2010
@@ -83,7 +83,7 @@
!${project.artifactId}*,
javax.management,
javax.management.loading,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/command/src/main/resources/archetype-resources/pom.xml Thu Sep 23 09:12:51 2010
@@ -78,7 +78,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${package}*;version=${project.version}</Export-Package>
<Import-Package>!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Thu Sep 23 09:12:51 2010
@@ -104,7 +104,7 @@
!${project.artifactId}*,
javax.management,
javax.management.loading,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Thu Sep 23 09:12:51 2010
@@ -104,7 +104,7 @@
!org.apache.karaf.features,
javax.management,
javax.management.loading,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/management/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/features/management/pom.xml (original)
+++ karaf/trunk/features/management/pom.xml Thu Sep 23 09:12:51 2010
@@ -111,7 +111,7 @@
!${project.artifactId}*,
javax.management,
javax.management.loading,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java (original)
+++ karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/CoreTest.java Thu Sep 23 09:12:51 2010
@@ -24,8 +24,8 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
Modified: karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java (original)
+++ karaf/trunk/itests/tests/src/test/java/org/apache/karaf/shell/itests/FeaturesTest.java Thu Sep 23 09:12:51 2010
@@ -24,8 +24,8 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.service.blueprint.container.BlueprintContainer;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.equinox;
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Sep 23 09:12:51 2010
@@ -119,7 +119,7 @@
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.fileinstall.version>3.0.2</felix.fileinstall.version>
<felix.framework.version>3.0.2</felix.framework.version>
- <felix.gogo.version>0.4.0</felix.gogo.version>
+ <felix.gogo.version>0.7.0-SNAPSHOT</felix.gogo.version>
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.1.0</felix.plugin.version>
<felix.utils.version>1.0.0</felix.utils.version>
@@ -747,12 +747,12 @@
<version>${aries.jmx.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
<version>${felix.gogo.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.commands</artifactId>
<version>${felix.gogo.version}</version>
</dependency>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Thu Sep 23 09:12:51 2010
@@ -46,7 +46,7 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
</dependency>
<dependency>
@@ -80,7 +80,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EachAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EachAction.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EachAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/EachAction.java Thu Sep 23 09:12:51 2010
@@ -21,9 +21,8 @@ import java.util.Collections;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.Function;
import org.apache.karaf.shell.console.AbstractAction;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.osgi.service.command.Function;
/**
* Execute a closure on a list of arguments.
Modified: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/IfAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/IfAction.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/IfAction.java (original)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/commands/IfAction.java Thu Sep 23 09:12:51 2010
@@ -18,9 +18,8 @@ package org.apache.karaf.shell.commands;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.Function;
import org.apache.karaf.shell.console.AbstractAction;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.osgi.service.command.Function;
/**
* Execute a closure on a list of arguments.
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Thu Sep 23 09:12:51 2010
@@ -79,7 +79,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java (original)
+++ karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java Thu Sep 23 09:12:51 2010
@@ -29,12 +29,12 @@ import java.util.Properties;
import junit.framework.TestCase;
+import org.apache.felix.service.command.CommandSession;
import org.easymock.EasyMock;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.command.CommandSession;
/**
* Test cases for {@link EditCommand}
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Thu Sep 23 09:12:51 2010
@@ -69,7 +69,7 @@
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
</dependency>
</dependencies>
@@ -115,9 +115,9 @@
*
</Import-Package>
<Export-Package>
- org.apache.felix.gogo.commands*;version=${felix.gogo.version},
- org.osgi.service.command;version=${felix.gogo.version},
- org.osgi.service.threadio;version=${felix.gogo.version},
+ org.apache.felix.gogo*;version=${felix.gogo.version},
+ org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
+ org.apache.felix.service.threadio;version=${felix.gogo.version};status=provisional;mandatory:=status,
org.apache.karaf.shell.console*;version=${project.version},
org.fusesource.jansi;version=${jansi.version},
jline*;version=${jline.version},
@@ -134,7 +134,7 @@
*
</Bundle-NativeCode>
<Bundle-Activator>
- org.apache.felix.gogo.runtime.Activator
+ org.apache.felix.gogo.runtime.activator.Activator
</Bundle-Activator>
<Main-Class>
org.apache.karaf.shell.console.Main
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java Thu Sep 23 09:12:51 2010
@@ -18,7 +18,8 @@
*/
package org.apache.felix.gogo.commands;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
+
public interface Action
{
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java Thu Sep 23 09:12:51 2010
@@ -23,8 +23,8 @@ import java.util.List;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
import org.apache.felix.gogo.commands.basic.ActionPreparator;
import org.apache.felix.gogo.commands.Action;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
public abstract class AbstractCommand implements Function {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java Thu Sep 23 09:12:51 2010
@@ -20,8 +20,8 @@ package org.apache.felix.gogo.commands.b
import java.util.List;
-import org.osgi.service.command.CommandSession;
import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.service.command.CommandSession;
public interface ActionPreparator {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java Thu Sep 23 09:12:51 2010
@@ -39,9 +39,9 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.converter.DefaultConverter;
import org.apache.felix.gogo.commands.converter.GenericType;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.NameScoping;
import org.fusesource.jansi.Ansi;
-import org.osgi.service.command.CommandSession;
public class DefaultActionPreparator implements ActionPreparator {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java Thu Sep 23 09:12:51 2010
@@ -20,9 +20,9 @@ package org.apache.felix.gogo.commands.b
import java.util.Hashtable;
+import org.apache.felix.service.command.Function;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.BundleContext;
-import org.osgi.service.command.Function;
import org.apache.felix.gogo.commands.Action;
import org.apache.felix.gogo.commands.Command;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java Thu Sep 23 09:12:51 2010
@@ -19,7 +19,7 @@
package org.apache.karaf.shell.console;
import org.apache.felix.gogo.commands.Action;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java Thu Sep 23 09:12:51 2010
@@ -20,7 +20,7 @@ package org.apache.karaf.shell.console;
import java.util.List;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.Function;
public interface CompletableFunction extends Function {
Added: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java?rev=1000367&view=auto
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java (added)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java Thu Sep 23 09:12:51 2010
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.karaf.shell.console;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.Formatter;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Function;
+import org.osgi.service.startlevel.StartLevel;
+
+public class Converters implements Converter
+{
+ private final BundleContext context;
+
+ public Converters(BundleContext context)
+ {
+ this.context = context;
+ }
+
+ private CharSequence print(Bundle bundle)
+ {
+ // [ ID ] [STATE ] [ SL ] symname
+ StartLevel sl = null;
+ ServiceReference ref = context.getServiceReference(StartLevel.class.getName());
+ if (ref != null)
+ {
+ sl = (StartLevel) context.getService(ref);
+ }
+
+ if (sl == null)
+ {
+ return String.format("%5d|%-11s|%s (%s)", bundle.getBundleId(),
+ getState(bundle), bundle.getSymbolicName(), bundle.getVersion());
+ }
+
+ int level = sl.getBundleStartLevel(bundle);
+ context.ungetService(ref);
+
+ return String.format("%5d|%-11s|%5d|%s (%s)", bundle.getBundleId(),
+ getState(bundle), level, bundle.getSymbolicName(), bundle.getVersion());
+ }
+
+ private CharSequence print(ServiceReference ref)
+ {
+ StringBuilder sb = new StringBuilder();
+ Formatter f = new Formatter(sb);
+
+ String spid = "";
+ Object pid = ref.getProperty("service.pid");
+ if (pid != null)
+ {
+ spid = pid.toString();
+ }
+
+ f.format("%06d %3s %-40s %s", ref.getProperty("service.id"),
+ ref.getBundle().getBundleId(),
+ getShortNames((String[]) ref.getProperty("objectclass")), spid);
+ return sb;
+ }
+
+ private CharSequence getShortNames(String[] list)
+ {
+ StringBuilder sb = new StringBuilder();
+ String del = "";
+ for (String s : list)
+ {
+ sb.append(del + getShortName(s));
+ del = " | ";
+ }
+ return sb;
+ }
+
+ private CharSequence getShortName(String name)
+ {
+ int n = name.lastIndexOf('.');
+ if (n < 0)
+ {
+ n = 0;
+ }
+ else
+ {
+ n++;
+ }
+ return name.subSequence(n, name.length());
+ }
+
+ private String getState(Bundle bundle)
+ {
+ switch (bundle.getState())
+ {
+ case Bundle.ACTIVE:
+ return "Active";
+
+ case Bundle.INSTALLED:
+ return "Installed";
+
+ case Bundle.RESOLVED:
+ return "Resolved";
+
+ case Bundle.STARTING:
+ return "Starting";
+
+ case Bundle.STOPPING:
+ return "Stopping";
+
+ case Bundle.UNINSTALLED:
+ return "Uninstalled ";
+ }
+ return null;
+ }
+
+ public Bundle bundle(Bundle i)
+ {
+ return i;
+ }
+
+ public Object convert(Class<?> desiredType, final Object in) throws Exception
+ {
+ if (desiredType == Bundle.class)
+ {
+ return convertBundle(in);
+ }
+
+ if (desiredType == ServiceReference.class)
+ {
+ return convertServiceReference(in);
+ }
+
+ if (desiredType == Class.class)
+ {
+ try
+ {
+ return Class.forName(in.toString());
+ }
+ catch (ClassNotFoundException e)
+ {
+ return null;
+ }
+ }
+
+ if (desiredType.isAssignableFrom(String.class) && in instanceof InputStream)
+ {
+ return read(((InputStream) in));
+ }
+
+ if (in instanceof Function && desiredType.isInterface()
+ && desiredType.getDeclaredMethods().length == 1)
+ {
+ return Proxy.newProxyInstance(desiredType.getClassLoader(),
+ new Class[] { desiredType }, new InvocationHandler()
+ {
+ Function command = ((Function) in);
+
+ public Object invoke(Object proxy, Method method, Object[] args)
+ throws Throwable
+ {
+ return command.execute(null, Arrays.asList(args));
+ }
+ });
+ }
+
+ return null;
+ }
+
+ private Object convertServiceReference(Object in) throws InvalidSyntaxException
+ {
+ String s = in.toString();
+ if (s.startsWith("(") && s.endsWith(")"))
+ {
+ ServiceReference refs[] = context.getServiceReferences(null, String.format(
+ "(|(service.id=%s)(service.pid=%s))", in, in));
+ if (refs != null && refs.length > 0)
+ {
+ return refs[0];
+ }
+ }
+
+ ServiceReference refs[] = context.getServiceReferences(null, String.format(
+ "(|(service.id=%s)(service.pid=%s))", in, in));
+ if (refs != null && refs.length > 0)
+ {
+ return refs[0];
+ }
+ return null;
+ }
+
+ private Object convertBundle(Object in)
+ {
+ String s = in.toString();
+ try
+ {
+ long id = Long.parseLong(s);
+ return context.getBundle(id);
+ }
+ catch (NumberFormatException nfe)
+ {
+ // Ignore
+ }
+
+ Bundle bundles[] = context.getBundles();
+ for (Bundle b : bundles)
+ {
+ if (b.getLocation().equals(s))
+ {
+ return b;
+ }
+
+ if (b.getSymbolicName().equals(s))
+ {
+ return b;
+ }
+ }
+
+ return null;
+ }
+
+ public CharSequence format(Object target, int level, Converter converter)
+ throws IOException
+ {
+ if (level == INSPECT && target instanceof InputStream)
+ {
+ return read(((InputStream) target));
+ }
+ if (level == LINE && target instanceof Bundle)
+ {
+ return print((Bundle) target);
+ }
+ if (level == LINE && target instanceof ServiceReference)
+ {
+ return print((ServiceReference) target);
+ }
+ if (level == PART && target instanceof Bundle)
+ {
+ return ((Bundle) target).getSymbolicName();
+ }
+ if (level == PART && target instanceof ServiceReference)
+ {
+ return getShortNames((String[]) ((ServiceReference) target).getProperty("objectclass"));
+ }
+ return null;
+ }
+
+ private CharSequence read(InputStream in) throws IOException
+ {
+ int c;
+ StringBuffer sb = new StringBuffer();
+ while ((c = in.read()) > 0)
+ {
+ if (c >= 32 && c <= 0x7F || c == '\n' || c == '\r')
+ {
+ sb.append((char) c);
+ }
+ else
+ {
+ String s = Integer.toHexString(c).toUpperCase();
+ sb.append("\\");
+ if (s.length() < 1)
+ {
+ sb.append(0);
+ }
+ sb.append(s);
+ }
+ }
+ return sb;
+ }
+
+}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/HelpAction.java Thu Sep 23 09:12:51 2010
@@ -31,10 +31,10 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.basic.AbstractCommand;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
+import org.apache.felix.service.command.Function;
import org.fusesource.jansi.Ansi;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.Function;
/**
* Displays help on the available commands
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java Thu Sep 23 09:12:51 2010
@@ -38,16 +38,15 @@ import org.apache.felix.gogo.commands.Ac
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.CommandException;
import org.apache.felix.gogo.commands.basic.AbstractCommand;
-import org.apache.felix.gogo.runtime.lang.Support;
-import org.apache.felix.gogo.runtime.shell.CommandShellImpl;
+import org.apache.felix.gogo.runtime.CommandProcessorImpl;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.threadio.ThreadIO;
import org.apache.karaf.shell.console.jline.Console;
import org.apache.karaf.shell.console.jline.TerminalFactory;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
-import org.osgi.service.threadio.ThreadIO;
public class Main {
private String application = System.getProperty("karaf.name", "root");
@@ -69,9 +68,7 @@ public class Main {
ThreadIOImpl threadio = new ThreadIOImpl();
threadio.start();
- CommandShellImpl commandProcessor = new CommandShellImpl();
- commandProcessor.setThreadio(threadio);
- commandProcessor.setConverter(new Support());
+ CommandProcessorImpl commandProcessor = new CommandProcessorImpl(threadio);
ClassLoader cl = Main.class.getClassLoader();
if (args.length > 0 && args[0].startsWith("--classpath=")) {
@@ -104,15 +101,13 @@ public class Main {
*/
public void run(CommandSession parent, String args[]) throws Exception {
- CommandShellImpl commandProcessor = new CommandShellImpl();
// TODO: find out what the down side of not using a real ThreadIO implementation is.
- commandProcessor.setThreadio(new ThreadIO(){
+ CommandProcessorImpl commandProcessor = new CommandProcessorImpl(new ThreadIO() {
public void setStreams(InputStream in, PrintStream out, PrintStream err) {
}
public void close() {
}
});
- commandProcessor.setConverter(new Support());
ClassLoader cl = Main.class.getClassLoader();
if (args.length > 0 && args[0].startsWith("--classpath=")) {
@@ -132,7 +127,7 @@ public class Main {
run(commandProcessor, args, in, out, err);
}
- private void run(final CommandShellImpl commandProcessor, String[] args, final InputStream in, final PrintStream out, final PrintStream err) throws Exception {
+ private void run(final CommandProcessorImpl commandProcessor, String[] args, final InputStream in, final PrintStream out, final PrintStream err) throws Exception {
TerminalFactory terminalFactory = new TerminalFactory();
Terminal terminal = terminalFactory.getTerminal();
Console console = createConsole(commandProcessor, in, out, err, terminal);
@@ -181,7 +176,7 @@ public class Main {
* @return
* @throws Exception
*/
- protected Console createConsole(CommandShellImpl commandProcessor, InputStream in, PrintStream out, PrintStream err, Terminal terminal) throws Exception {
+ protected Console createConsole(CommandProcessorImpl commandProcessor, InputStream in, PrintStream out, PrintStream err, Terminal terminal) throws Exception {
return new Console(commandProcessor, in, out, err, terminal, null);
}
@@ -195,7 +190,7 @@ public class Main {
return "META-INF/services/org/apache/karaf/shell/commands";
}
- private void discoverCommands(CommandShellImpl commandProcessor, ClassLoader cl) throws IOException, ClassNotFoundException {
+ private void discoverCommands(CommandProcessorImpl commandProcessor, ClassLoader cl) throws IOException, ClassNotFoundException {
Enumeration<URL> urls = cl.getResources(getDiscoveryResource());
while (urls.hasMoreElements()) {
URL url = urls.nextElement();
@@ -226,7 +221,7 @@ public class Main {
}
}
- protected void addCommand(Command cmd, Function function, CommandShellImpl commandProcessor) {
+ protected void addCommand(Command cmd, Function function, CommandProcessorImpl commandProcessor) {
try {
commandProcessor.addCommand(cmd.scope(), function, cmd.name());
} catch (Exception e) {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java Thu Sep 23 09:12:51 2010
@@ -17,7 +17,8 @@
*/
package org.apache.karaf.shell.console;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
+
/**
* A helper class for name scoping
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java Thu Sep 23 09:12:51 2010
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.service.command.CommandSession;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.CommandSession;
public abstract class OsgiCommandSupport extends AbstractAction implements Action, BundleContextAware {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java Thu Sep 23 09:12:51 2010
@@ -24,6 +24,7 @@ import org.apache.felix.gogo.commands.Ac
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.service.command.CommandSession;
import org.apache.karaf.shell.console.BlueprintContainerAware;
import org.apache.karaf.shell.console.BundleContextAware;
import org.apache.karaf.shell.console.CompletableFunction;
@@ -31,7 +32,6 @@ import org.apache.karaf.shell.console.Co
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.Converter;
-import org.osgi.service.command.CommandSession;
public class BlueprintCommand extends AbstractCommand implements CompletableFunction
{
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java Thu Sep 23 09:12:51 2010
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.HashSet;
import java.util.Set;
+import org.apache.felix.service.command.Function;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -46,7 +47,6 @@ import org.osgi.service.blueprint.reflec
import org.osgi.service.blueprint.reflect.NullMetadata;
import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.container.ComponentDefinitionException;
-import org.osgi.service.command.Function;
public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHandler {
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java Thu Sep 23 09:12:51 2010
@@ -43,10 +43,10 @@ import org.apache.felix.gogo.commands.Co
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.basic.AbstractCommand;
import org.apache.felix.gogo.commands.basic.DefaultActionPreparator;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.CompletableFunction;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.NameScoping;
-import org.osgi.service.command.CommandSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java Thu Sep 23 09:12:51 2010
@@ -26,14 +26,14 @@ import java.util.List;
import java.util.Set;
import org.apache.felix.gogo.commands.basic.AbstractCommand;
-import org.apache.felix.gogo.runtime.shell.CommandProxy;
-import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
+import org.apache.felix.gogo.runtime.CommandProxy;
+import org.apache.felix.gogo.runtime.CommandSessionImpl;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
import org.apache.karaf.shell.console.CompletableFunction;
import org.apache.karaf.shell.console.Completer;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
/**
* Like the {@link org.apache.karaf.shell.console.completer.CommandsCompleter} but does not use OSGi but is
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java Thu Sep 23 09:12:51 2010
@@ -18,10 +18,9 @@
package org.apache.karaf.shell.console.completer;
import jline.console.completer.FileNameCompleter;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.Completer;
-import org.osgi.service.command.CommandSession;
-import java.io.File;
import java.util.List;
/**
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java Thu Sep 23 09:12:51 2010
@@ -42,13 +42,13 @@ import jline.UnsupportedTerminal;
import jline.console.history.FileHistory;
import jline.console.history.PersistentHistory;
import org.apache.felix.gogo.commands.CommandException;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
import org.apache.karaf.shell.console.CloseShellException;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.CommandsCompleter;
import org.fusesource.jansi.Ansi;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/ConsoleFactory.java Thu Sep 23 09:12:51 2010
@@ -19,19 +19,15 @@
package org.apache.karaf.shell.console.jline;
import java.io.InputStream;
-import java.io.PrintStream;
import java.io.OutputStream;
+import java.io.PrintStream;
import java.lang.reflect.Method;
-import java.util.List;
-import java.util.concurrent.Callable;
-import org.apache.karaf.shell.console.Completer;
-import org.apache.karaf.shell.console.completer.AggregateCompleter;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.fusesource.jansi.AnsiConsole;
import jline.Terminal;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.fusesource.jansi.AnsiConsole;
+import org.osgi.framework.BundleContext;
public class ConsoleFactory {
Modified: karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml (original)
+++ karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/karaf-console.xml Thu Sep 23 09:12:51 2010
@@ -26,7 +26,7 @@
</ext:default-properties>
</ext:property-placeholder>
- <reference id="commandProcessor" interface="org.osgi.service.command.CommandProcessor">
+ <reference id="commandProcessor" interface="org.apache.felix.service.command.CommandProcessor">
<reference-listener ref="consoleFactory"
bind-method="registerCommandProcessor"
unbind-method="unregisterCommandProcessor"/>
@@ -38,12 +38,17 @@
<property name="terminalFactory" ref="terminalFactory"/>
</bean>
+ <bean id="converters" class="org.apache.karaf.shell.console.Converters">
+ <argument ref="blueprintBundleContext"/>
+ </bean>
+ <service ref="converters" interface="org.apache.felix.service.command.Converter"/>
+
<bean id="terminalFactory" class="org.apache.karaf.shell.console.jline.TerminalFactory"
destroy-method="destroy"/>
<service>
<interfaces>
- <value>org.osgi.service.command.Function</value>
+ <value>org.apache.felix.service.command.Function</value>
<value>org.apache.karaf.shell.console.CompletableFunction</value>
</interfaces>
<service-properties>
Modified: karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java Thu Sep 23 09:12:51 2010
@@ -18,28 +18,32 @@
*/
package org.apache.felix.gogo.commands;
+import org.apache.felix.gogo.runtime.CommandProcessorImpl;
+import org.apache.felix.gogo.runtime.CommandSessionImpl;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.apache.felix.gogo.runtime.shell.CommandShellImpl;
-import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
-public class Context extends CommandShellImpl
+public class Context extends CommandProcessorImpl
{
public static final String EMPTY = "";
- CommandSessionImpl session = (CommandSessionImpl) createSession(System.in, System.out, System.err);
+ CommandSessionImpl session;
static ThreadIOImpl threadio;
static
{
threadio = new ThreadIOImpl();
threadio.start();
-
}
public Context()
{
- setThreadio(threadio);
+ super(threadio);
+ addCommand("osgi", this, "addCommand");
+ addCommand("osgi", this, "removeCommand");
+ addCommand("osgi", this, "eval");
+ session = (CommandSessionImpl) createSession(System.in, System.out, System.err);
}
+
public Object execute(CharSequence source) throws Exception
{
return session.execute(source);
Modified: karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java Thu Sep 23 09:12:51 2010
@@ -26,8 +26,8 @@ import java.io.BufferedReader;
import java.io.InputStreamReader;
import junit.framework.TestCase;
-import org.osgi.service.command.CommandSession;
import org.apache.felix.gogo.commands.basic.SimpleCommand;
+import org.apache.felix.service.command.CommandSession;
public class TestCommands extends TestCase {
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/ExampleSubclassMain.java Thu Sep 23 09:12:51 2010
@@ -17,7 +17,7 @@
package org.apache.karaf.shell.console;
import jline.Terminal;
-import org.apache.felix.gogo.runtime.shell.CommandShellImpl;
+import org.apache.felix.gogo.runtime.CommandProcessorImpl;
import org.apache.karaf.shell.console.jline.Console;
import java.io.InputStream;
@@ -46,7 +46,7 @@ public class ExampleSubclassMain extends
}
@Override
- protected Console createConsole(CommandShellImpl commandProcessor, InputStream in, PrintStream out, PrintStream err, Terminal terminal) throws Exception {
+ protected Console createConsole(CommandProcessorImpl commandProcessor, InputStream in, PrintStream out, PrintStream err, Terminal terminal) throws Exception {
return new Console(commandProcessor, in, out, err, terminal, null) {
/**
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/ArgumentCompleterTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/ArgumentCompleterTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/ArgumentCompleterTest.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/ArgumentCompleterTest.java Thu Sep 23 09:12:51 2010
@@ -23,10 +23,10 @@ import java.util.List;
import org.apache.felix.gogo.commands.Action;
import org.apache.felix.gogo.commands.Option;
import org.apache.felix.gogo.commands.basic.SimpleCommand;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.CompletableFunction;
import org.apache.karaf.shell.console.Completer;
import org.junit.Test;
-import org.osgi.service.command.CommandSession;
import static org.junit.Assert.*;
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/BooleanCompleterTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/BooleanCompleterTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/BooleanCompleterTest.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/BooleanCompleterTest.java Thu Sep 23 09:12:51 2010
@@ -21,9 +21,9 @@ import org.apache.felix.gogo.commands.Ac
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.CompleterValues;
import org.apache.felix.gogo.commands.basic.SimpleCommand;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.Completer;
import org.junit.Test;
-import org.osgi.service.command.CommandSession;
import java.io.File;
import java.util.Arrays;
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompleterValuesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompleterValuesTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompleterValuesTest.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompleterValuesTest.java Thu Sep 23 09:12:51 2010
@@ -21,9 +21,9 @@ import org.apache.felix.gogo.commands.Ac
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.CompleterValues;
import org.apache.felix.gogo.commands.basic.SimpleCommand;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.Completer;
import org.junit.Test;
-import org.osgi.service.command.CommandSession;
import java.util.Arrays;
import java.util.List;
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/DummyCommandSession.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/DummyCommandSession.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/DummyCommandSession.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/DummyCommandSession.java Thu Sep 23 09:12:51 2010
@@ -17,11 +17,11 @@
*/
package org.apache.karaf.shell.console.completer;
-import org.osgi.service.command.CommandSession;
-
import java.io.InputStream;
import java.io.PrintStream;
+import org.apache.felix.service.command.CommandSession;
+
public class DummyCommandSession implements CommandSession {
public Object convert(Class<?> type, Object instance) {
return null;
Modified: karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/FileCompleterTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/FileCompleterTest.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/FileCompleterTest.java (original)
+++ karaf/trunk/shell/console/src/test/java/org/apache/karaf/shell/console/completer/FileCompleterTest.java Thu Sep 23 09:12:51 2010
@@ -17,17 +17,15 @@
*/
package org.apache.karaf.shell.console.completer;
+import java.io.File;
+import java.util.Arrays;
+
import org.apache.felix.gogo.commands.Action;
import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.CompleterValues;
import org.apache.felix.gogo.commands.basic.SimpleCommand;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.Completer;
import org.junit.Test;
-import org.osgi.service.command.CommandSession;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
import static org.junit.Assert.assertEquals;
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Thu Sep 23 09:12:51 2010
@@ -76,7 +76,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/log/pom.xml (original)
+++ karaf/trunk/shell/log/pom.xml Thu Sep 23 09:12:51 2010
@@ -82,7 +82,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Thu Sep 23 09:12:51 2010
@@ -86,7 +86,7 @@
</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Thu Sep 23 09:12:51 2010
@@ -85,7 +85,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
org.springframework*;resolution:=optional,
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/ListServices.java Thu Sep 23 09:12:51 2010
@@ -18,13 +18,13 @@ package org.apache.karaf.shell.osgi;
import java.util.List;
+import org.apache.felix.service.command.Function;
import org.apache.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;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.Function;
@Command(scope = "osgi", name = "ls", description = "Lists OSGi services")
public class ListServices extends OsgiCommandSupport {
Modified: karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java (original)
+++ karaf/trunk/shell/osgi/src/main/java/org/apache/karaf/shell/osgi/Util.java Thu Sep 23 09:12:51 2010
@@ -20,12 +20,12 @@ package org.apache.karaf.shell.osgi;
import java.io.IOException;
+import org.apache.felix.service.command.CommandSession;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.startlevel.StartLevel;
-import org.osgi.service.command.CommandSession;
public class Util
{
Modified: karaf/trunk/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/packages/pom.xml (original)
+++ karaf/trunk/shell/packages/pom.xml Thu Sep 23 09:12:51 2010
@@ -70,7 +70,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Thu Sep 23 09:12:51 2010
@@ -89,7 +89,7 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
!${project.artifactId}*,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
org.apache.sshd.server.keyprovider,
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommandFactory.java Thu Sep 23 09:12:51 2010
@@ -24,12 +24,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.Environment;
import org.apache.sshd.server.ExitCallback;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
public class ShellCommandFactory implements CommandFactory {
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java Thu Sep 23 09:12:51 2010
@@ -31,6 +31,8 @@ import java.util.Properties;
import java.util.concurrent.Callable;
import jline.Terminal;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.AggregateCompleter;
import org.apache.karaf.shell.console.jline.Console;
@@ -41,8 +43,6 @@ import org.apache.sshd.server.ExitCallba
import org.apache.sshd.server.Signal;
import org.apache.sshd.server.SignalListener;
import org.osgi.service.blueprint.container.ReifiedType;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
/**
* SSHD {@link org.apache.sshd.server.Command} factory which provides access to Shell.
Modified: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (original)
+++ karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Thu Sep 23 09:12:51 2010
@@ -92,7 +92,7 @@
<property name="start" value="$[karaf.startRemoteShell]"/>
</bean>
- <reference id="commandProcessor" interface="org.osgi.service.command.CommandProcessor">
+ <reference id="commandProcessor" interface="org.apache.felix.service.command.CommandProcessor">
</reference>
</blueprint>
Modified: karaf/trunk/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/pom.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/pom.xml (original)
+++ karaf/trunk/shell/wrapper/pom.xml Thu Sep 23 09:12:51 2010
@@ -95,7 +95,7 @@
!${project.artifactId}*,
!org.apache.karaf.main,
!org.tanukisoftware.wrapper,
- org.osgi.service.command,
+ org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java (original)
+++ karaf/trunk/tooling/cmdhelp-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java Thu Sep 23 09:12:51 2010
@@ -48,7 +48,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.xbean.finder.ClassFinder;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
/**
* Generates docbook for Karaf commands
Modified: karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java (original)
+++ karaf/trunk/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java Thu Sep 23 09:12:51 2010
@@ -42,13 +42,11 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.karaf.shell.console.Completer;
-import org.apache.karaf.shell.console.completer.AggregateCompleter;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.console.jline.Console;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.osgi.framework.BundleContext;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
/**
* The <code>GogoPlugin</code>
Modified: karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml?rev=1000367&r1=1000366&r2=1000367&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml (original)
+++ karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml Thu Sep 23 09:12:51 2010
@@ -20,7 +20,7 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
- <reference id="commandProcessor" interface="org.osgi.service.command.CommandProcessor" />
+ <reference id="commandProcessor" interface="org.apache.felix.service.command.CommandProcessor" />
<bean id="gogoPlugin" class="org.apache.karaf.webconsole.gogo.GogoPlugin" init-method="start" destroy-method="stop">
<property name="commandProcessor" ref="commandProcessor" />