Use felix namespace packages and add mandatory attribute. (FELIX-2441)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@999071 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/gogo/shell/pom.xml b/gogo/shell/pom.xml
index 73f3ffe..f266a80 100644
--- a/gogo/shell/pom.xml
+++ b/gogo/shell/pom.xml
@@ -58,6 +58,7 @@
<Export-Package>
</Export-Package>
<Import-Package>
+ org.apache.felix.service.command; status="provisional",
*
</Import-Package>
<Private-Package>
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
index 280ea5d..af47f6b 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
@@ -23,9 +23,9 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
index f66a0ae..588baa2 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
@@ -42,8 +42,8 @@
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
/**
* gosh built-in commands.
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
index 324a2d5..953db7d 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
public class Console implements Runnable
{
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
index 55aa871..b76440a 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
@@ -30,8 +30,8 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
+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
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
index 389dca7..39b8005 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
@@ -30,7 +30,7 @@
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
/**
* Posix-like utilities.
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
index 9c03601..bb6e157 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
@@ -21,8 +21,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-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 class Procedural
{
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
index afc4966..3082a35 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
@@ -30,8 +30,8 @@
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-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 org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
index 1581d1e..c3acf6d 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
@@ -26,8 +26,8 @@
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-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;
/*
* a very simple Telnet server.