felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r949206 - in /felix/trunk/gogo: command/src/main/java/org/apache/felix/gogo/command/ runtime/ runtime/src/main/java/org/apache/felix/gogo/runtime/ runtime/src/main/java/org/apache/felix/gogo/runtime/activator/ runtime/src/main/java/org/apac...
Date Fri, 28 May 2010 15:39:07 GMT
Author: rickhall
Date: Fri May 28 15:39:06 2010
New Revision: 949206

URL: http://svn.apache.org/viewvc?rev=949206&view=rev
Log:
Use org.apache.felix package namespace instead of org.osgi. (FELIX-2367)

Added:
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
      - copied, changed from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
Removed:
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
Modified:
    felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java
    felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
    felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
    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/EOFError.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.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/SyntaxError.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.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/Basic.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java (original)
+++ felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/Basic.java Fri May
28 15:39:06 2010
@@ -37,6 +37,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import org.apache.felix.service.command.Descriptor;
+import org.apache.felix.service.command.Parameter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -44,8 +46,6 @@ import org.osgi.framework.BundleReferenc
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.command.Descriptor;
-import org.osgi.service.command.Parameter;
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.log.LogService;

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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 2010
@@ -23,9 +23,9 @@ 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.apache.felix.service.command.Descriptor;
 import org.osgi.framework.BundleContext;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Descriptor;
 
 public class Files
 {

Modified: felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java (original)
+++ felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/OBR.java Fri May
28 15:39:06 2010
@@ -29,9 +29,9 @@ import org.apache.felix.bundlerepository
 import org.apache.felix.bundlerepository.Requirement;
 import org.apache.felix.bundlerepository.Resolver;
 import org.apache.felix.bundlerepository.Resource;
+import org.apache.felix.service.command.Descriptor;
+import org.apache.felix.service.command.Parameter;
 import org.osgi.framework.*;
-import org.osgi.service.command.Descriptor;
-import org.osgi.service.command.Parameter;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class OBR

Modified: felix/trunk/gogo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Fri May 28 15:39:06 2010
@@ -55,8 +55,8 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.osgi.service.command; version=${project.version},
-                            org.osgi.service.threadio; version=${project.version}
+                            org.apache.felix.service.command; version=${project.version},
+                            org.apache.felix.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=949206&r1=949205&r2=949206&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 Fri
May 28 15:39:06 2010
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.felix.gogo.runtime.Tokenizer.Type;
-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 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=949206&r1=949205&r2=949206&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
Fri May 28 15:39:06 2010
@@ -30,11 +30,11 @@ import java.util.TreeSet;
 import java.util.Map.Entry;
 
 import org.osgi.framework.BundleContext;
-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;
+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;
 
 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=949206&r1=949205&r2=949206&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
Fri May 28 15:39:06 2010
@@ -20,8 +20,8 @@ package org.apache.felix.gogo.runtime;
 
 import java.util.List;
 
-import org.osgi.service.command.Function;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
 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=949206&r1=949205&r2=949206&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
Fri May 28 15:39:06 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.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java Fri
May 28 15:39:06 2010
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 public class EOFError extends SyntaxError

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java Fri
May 28 15:39:06 2010
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 public interface Evaluate

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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 2010
@@ -25,7 +25,7 @@ import java.io.PipedOutputStream;
 import java.io.PrintStream;
 import java.util.List;
 
-import org.osgi.service.command.Converter;
+import org.apache.felix.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=949206&r1=949205&r2=949206&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 Fri
May 28 15:39:06 2010
@@ -29,8 +29,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Parameter;
+import org.apache.felix.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/SyntaxError.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 public class SyntaxError extends RuntimeException

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java Fri May
28 15:39:06 2010
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 import org.apache.felix.gogo.runtime.Tokenizer.Type;

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java?rev=949206&r1=949205&r2=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java Fri
May 28 15:39:06 2010
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.felix.gogo.runtime;
 
 

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=949206&r1=949205&r2=949206&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
Fri May 28 15:39:06 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.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
-import org.osgi.service.threadio.ThreadIO;
+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.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=949206&r1=949205&r2=949206&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
Fri May 28 15:39:06 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.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.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/apache/felix/service/command/Descriptor.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Descriptor.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Descriptor.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.util.List;
 

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Parameter.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Parameter.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
(from r949194, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java&r1=949194&r2=949206&rev=949206&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
Fri May 28 15:39:06 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.threadio;
+package org.apache.felix.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=949206&r1=949205&r2=949206&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 Fri
May 28 15:39:06 2010
@@ -18,10 +18,8 @@
  */
 package org.apache.felix.gogo.runtime;
 
-import org.apache.felix.gogo.runtime.CommandProcessorImpl;
-import org.apache.felix.gogo.runtime.CommandSessionImpl;
 import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.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=949206&r1=949205&r2=949206&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 Fri
May 28 15:39:06 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.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 2010
@@ -23,14 +23,13 @@ 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.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator, Runnable

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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 2010
@@ -21,9 +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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 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=949206&r1=949205&r2=949206&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 Fri May 28
15:39:06 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=949206&r1=949205&r2=949206&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 Fri May
28 15:39:06 2010
@@ -21,9 +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=949206&r1=949205&r2=949206&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 Fri May 28
15:39:06 2010
@@ -30,10 +30,10 @@ 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.framework.BundleContext;
 import org.osgi.framework.BundleException;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
 
 public class Shell
 {

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=949206&r1=949205&r2=949206&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 Fri May 28
15:39:06 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.



Mime
View raw message