Author: rickhall
Date: Mon Sep 20 19:25:21 2010
New Revision: 999071
URL: http://svn.apache.org/viewvc?rev=999071&view=rev
Log:
Use felix namespace packages and add mandatory attribute. (FELIX-2441)
Modified:
felix/trunk/gogo/shell/pom.xml
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/shell/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=999071&r1=999070&r2=999071&view=diff
==============================================================================
--- felix/trunk/gogo/shell/pom.xml (original)
+++ felix/trunk/gogo/shell/pom.xml Mon Sep 20 19:25:21 2010
@@ -58,6 +58,7 @@
<Export-Package>
</Export-Package>
<Import-Package>
+ org.apache.felix.service.command;
status="provisional",
*
</Import-Package>
<Private-Package>
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25:21 2010
@@ -23,9 +23,9 @@ import java.util.HashSet;
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;
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.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.
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.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
{
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.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
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.osgi.service.command.CommandSession;
+import org.apache.felix.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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.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
{
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.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;
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=999071&r1=999070&r2=999071&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
Mon Sep 20 19:25: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.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.
