Author: gnodet
Date: Wed Jun 23 17:08:21 2010
New Revision: 957272
URL: http://svn.apache.org/viewvc?rev=957272&view=rev
Log:
FELIX-2441: Restore backward compatibility on gogo
Added:
felix/trunk/gogo/runtime/src/main/java/org/osgi/
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
- copied, changed from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
- copied, changed from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
- copied, changed from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
- copied, changed from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
- copied, changed from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
Removed:
felix/trunk/gogo/commands/
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/
Modified:
felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
felix/trunk/gogo/pom.xml
felix/trunk/gogo/runtime/pom.xml
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
Modified:
felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
(original)
+++
felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
Wed Jun 23 17:08:21 2010
@@ -23,7 +23,7 @@ import java.io.FileFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
import org.apache.felix.service.command.Descriptor;
import org.osgi.framework.BundleContext;
Modified: felix/trunk/gogo/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/pom.xml Wed Jun 23 17:08:21 2010
@@ -29,7 +29,7 @@
<name>Apache Felix Gogo</name>
<description>Apache Felix Gogo Subproject</description>
<artifactId>gogo-reactor</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<modules>
<module>gogo-parent</module>
Modified: felix/trunk/gogo/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Wed Jun 23 17:08:21 2010
@@ -57,7 +57,8 @@
<instructions>
<Export-Package>
org.apache.felix.service.command;
version=${project.version},
- org.apache.felix.service.threadio;
version=${project.version}
+ org.osgi.service.command;
version=${project.version},
+ org.osgi.service.threadio;
version=${project.version}
</Export-Package>
<Import-Package>
org.osgi.service.log*; resolution:=optional,
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
Wed Jun 23 17:08:21 2010
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.felix.gogo.runtime.Tokenizer.Type;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
public class Closure implements Function, Evaluate
{
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
Wed Jun 23 17:08:21 2010
@@ -30,11 +30,11 @@ import java.util.TreeSet;
import java.util.Map.Entry;
import org.osgi.framework.BundleContext;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.command.Function;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
+import org.osgi.service.command.Function;
+import org.osgi.service.threadio.ThreadIO;
public class CommandProcessorImpl implements CommandProcessor
{
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
Wed Jun 23 17:08:21 2010
@@ -20,8 +20,8 @@ package org.apache.felix.gogo.runtime;
import java.util.List;
-import org.apache.felix.service.command.Function;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.BundleContext;
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
Wed Jun 23 17:08:21 2010
@@ -21,9 +21,9 @@
// DWB10: add SCOPE support: https://www.osgi.org/bugzilla/show_bug.cgi?id=51
package org.apache.felix.gogo.runtime;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
+import org.osgi.service.threadio.ThreadIO;
import java.io.InputStream;
import java.io.PrintStream;
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
Wed Jun 23 17:08:21 2010
@@ -26,7 +26,7 @@ import java.io.PrintStream;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.Converter;
public class Pipe extends Thread
{
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
Wed Jun 23 17:08:21 2010
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
import org.apache.felix.service.command.Parameter;
public final class Reflective
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
Wed Jun 23 17:08:21 2010
@@ -30,10 +30,10 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.command.Function;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.Converter;
+import org.osgi.service.command.Function;
+import org.osgi.service.threadio.ThreadIO;
import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator
Modified:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
Wed Jun 23 17:08:21 2010
@@ -19,7 +19,7 @@
// DWB20: ThreadIO should check and reset IO if something (e.g. jetty)
overrides
package org.apache.felix.gogo.runtime.threadio;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.threadio.ThreadIO;
import java.io.InputStream;
import java.io.PrintStream;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
(from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java?p2=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java&r1=957253&r2=957272&rev=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
Wed Jun 23 17:08:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.service.command;
+package org.osgi.service.command;
import java.io.InputStream;
import java.io.PrintStream;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
(from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java?p2=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java&r1=957253&r2=957272&rev=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
Wed Jun 23 17:08:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.service.command;
+package org.osgi.service.command;
import java.io.InputStream;
import java.io.PrintStream;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
(from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java?p2=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java&r1=957253&r2=957272&rev=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
Wed Jun 23 17:08:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.service.command;
+package org.osgi.service.command;
/**
* A converter is a service that can help create specific object types from a
Copied:
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
(from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java?p2=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java&r1=957253&r2=957272&rev=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
Wed Jun 23 17:08:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.service.command;
+package org.osgi.service.command;
import java.util.List;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
(from r957253,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java?p2=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java&r1=957253&r2=957272&rev=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
Wed Jun 23 17:08:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.service.threadio;
+package org.osgi.service.threadio;
import java.io.InputStream;
import java.io.PrintStream;
Modified:
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
(original)
+++
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
Wed Jun 23 17:08:21 2010
@@ -19,7 +19,7 @@
package org.apache.felix.gogo.runtime;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
public class Context extends CommandProcessorImpl
{
Modified:
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
(original)
+++
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
Wed Jun 23 17:08:21 2010
@@ -22,8 +22,8 @@ import junit.framework.TestCase;
import org.apache.felix.gogo.runtime.Parser;
import org.apache.felix.gogo.runtime.Token;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
import java.io.BufferedReader;
import java.io.IOException;
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
Wed Jun 23 17:08:21 2010
@@ -23,9 +23,9 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
Wed Jun 23 17:08:21 2010
@@ -42,8 +42,8 @@ import java.util.Map.Entry;
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
/**
* gosh built-in commands.
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
Wed Jun 23 17:08:21 2010
@@ -21,8 +21,8 @@ package org.apache.felix.gogo.shell;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
public class Console implements Runnable
{
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
Wed Jun 23 17:08:21 2010
@@ -30,8 +30,8 @@ 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.command.Converter;
+import org.osgi.service.command.Function;
import org.osgi.service.startlevel.StartLevel;
public class Converters implements Converter
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
(original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
Wed Jun 23 17:08:21 2010
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
/**
* Posix-like utilities.
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
Wed Jun 23 17:08:21 2010
@@ -21,8 +21,8 @@ package org.apache.felix.gogo.shell;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
public class Procedural
{
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
(original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
Wed Jun 23 17:08:21 2010
@@ -30,8 +30,8 @@ import java.util.Set;
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java?rev=957272&r1=957271&r2=957272&view=diff
==============================================================================
---
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
(original)
+++
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
Wed Jun 23 17:08:21 2010
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.felix.gogo.options.Option;
import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
/*
* a very simple Telnet server.
