You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/06/23 00:24:14 UTC
svn commit: r787426 - in /felix/trunk/gogo: ./ src/main/java/aQute/cpeg/
src/main/java/aQute/osgi/launcher/ src/main/java/aQute/shell/console/
src/main/java/aQute/shell/equinox/ src/main/java/aQute/shell/lang/
src/main/java/aQute/shell/osgi/ src/main/j...
Author: gnodet
Date: Mon Jun 22 22:24:12 2009
New Revision: 787426
URL: http://svn.apache.org/viewvc?rev=787426&view=rev
Log:
FELIX-1267: Rename gogo package from aQute.* to org.apache.felix.gogo.*
Added:
felix/trunk/gogo/src/main/java/org/apache/
felix/trunk/gogo/src/main/java/org/apache/felix/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/cpeg/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/cpeg/Procedural.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/cpeg/Procedural.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/launcher/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/launcher/Launcher.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/osgi/launcher/Launcher.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/console/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/console/Console.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/console/Console.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/equinox/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/equinox/Equinox.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/equinox/Equinox.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/lang/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/lang/Support.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/lang/Support.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiCommands.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiShell.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiShell.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/ServiceCommand.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Closure.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Closure.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Command.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Command.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandSessionImpl.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandShellImpl.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Parser.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Parser.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Pipe.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Pipe.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Reflective.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Reflective.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/stdio/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/stdio/StdioConsole.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/stdio/StdioConsole.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/Handler.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/telnet/Handler.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/TelnetShell.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/shell/telnet/TelnetShell.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/Marker.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/Marker.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadIOImpl.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/ThreadIOImpl.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadInputStream.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/ThreadInputStream.java
felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadPrintStream.java
- copied, changed from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/ThreadPrintStream.java
felix/trunk/gogo/src/test/java/org/
felix/trunk/gogo/src/test/java/org/apache/
felix/trunk/gogo/src/test/java/org/apache/felix/
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/Context.java
- copied, changed from r787421, felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/Context.java
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/TestParser.java
- copied, changed from r787421, felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/TestParser.java
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/threadio/
felix/trunk/gogo/src/test/java/org/apache/felix/gogo/threadio/TestThreadIO.java
- copied, changed from r787421, felix/trunk/gogo/src/test/java/test/aQute/threadio/TestThreadIO.java
Removed:
felix/trunk/gogo/src/main/java/aQute/cpeg/Procedural.java
felix/trunk/gogo/src/main/java/aQute/osgi/launcher/Launcher.java
felix/trunk/gogo/src/main/java/aQute/shell/console/Console.java
felix/trunk/gogo/src/main/java/aQute/shell/equinox/Equinox.java
felix/trunk/gogo/src/main/java/aQute/shell/lang/Support.java
felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java
felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiShell.java
felix/trunk/gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/Closure.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/Command.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/Parser.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/Pipe.java
felix/trunk/gogo/src/main/java/aQute/shell/runtime/Reflective.java
felix/trunk/gogo/src/main/java/aQute/shell/stdio/StdioConsole.java
felix/trunk/gogo/src/main/java/aQute/shell/telnet/Handler.java
felix/trunk/gogo/src/main/java/aQute/shell/telnet/TelnetShell.java
felix/trunk/gogo/src/main/java/aQute/threadio/Marker.java
felix/trunk/gogo/src/main/java/aQute/threadio/ThreadIOImpl.java
felix/trunk/gogo/src/main/java/aQute/threadio/ThreadInputStream.java
felix/trunk/gogo/src/main/java/aQute/threadio/ThreadPrintStream.java
felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/Context.java
felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/TestParser.java
felix/trunk/gogo/src/test/java/test/aQute/threadio/TestThreadIO.java
Modified:
felix/trunk/gogo/aQute.osgi.launcher.bnd
felix/trunk/gogo/aQute.shell.equinox.bnd
felix/trunk/gogo/aQute.shell.runtime.bnd
felix/trunk/gogo/aQute.shell.stdio.bnd
felix/trunk/gogo/aQute.shell.support.bnd
felix/trunk/gogo/aQute.shell.telnet.bnd
felix/trunk/gogo/aQute.threadio.bnd
felix/trunk/gogo/pom.xml
felix/trunk/gogo/proc.bnd
Modified: felix/trunk/gogo/aQute.osgi.launcher.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.osgi.launcher.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.osgi.launcher.bnd (original)
+++ felix/trunk/gogo/aQute.osgi.launcher.bnd Mon Jun 22 22:24:12 2009
@@ -1,4 +1,4 @@
-Private-Package: aQute.osgi.launcher, aQute.shell.runtime, aQute.shell.osgi, aQute.threadio, \
- org.osgi.service.shell, org.osgi.service.threadio, aQute.shell.console, org.osgi.framework
-Main-Class: aQute.osgi.launcher.Launcher
+Private-Package: org.apache.felix.gogo.launcher, org.apache.felix.gogo.shell.runtime, org.apache.felix.gogo.shell.osgi, org.apache.felix.gogo.threadio, \
+ org.osgi.service.shell, org.osgi.service.threadio, org.apache.felix.gogo.shell.console, org.osgi.framework
+Main-Class: org.apache.felix.gogo.launcher.Launcher
Modified: felix/trunk/gogo/aQute.shell.equinox.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.shell.equinox.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.shell.equinox.bnd (original)
+++ felix/trunk/gogo/aQute.shell.equinox.bnd Mon Jun 22 22:24:12 2009
@@ -1,6 +1,6 @@
-include: ~default.bnd
-Service-Component: aQute.shell.equinox.Equinox; \
+Service-Component: org.apache.felix.gogo.shell.equinox.Equinox; \
pka=org.osgi.service.packageadmin.PackageAdmin?; \
lrs=org.osgi.service.log.LogReaderService?; \
sls=org.osgi.service.startlevel.StartLevel?
-Private-Package: aQute.shell.equinox
+Private-Package: org.apache.felix.gogo.shell.equinox
Modified: felix/trunk/gogo/aQute.shell.runtime.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.shell.runtime.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.shell.runtime.bnd (original)
+++ felix/trunk/gogo/aQute.shell.runtime.bnd Mon Jun 22 22:24:12 2009
@@ -1,9 +1,9 @@
-include: ~default.bnd
Bundle-Name: Command Shell Service
Bundle-Description: Provides a shell service
-Private-Package: aQute.shell.osgi, aQute.shell.runtime
+Private-Package: org.apache.felix.gogo.shell.osgi, org.apache.felix.gogo.shell.runtime
Export-Package: org.osgi.service.command
-Service-Component: aQute.shell.osgi.OSGiShell; \
+Service-Component: org.apache.felix.gogo.shell.osgi.OSGiShell; \
provide:=org.osgi.service.command.CommandProcessor; \
threadio=org.osgi.service.threadio.ThreadIO; \
converter=org.osgi.service.command.Converter*
Modified: felix/trunk/gogo/aQute.shell.stdio.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.shell.stdio.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.shell.stdio.bnd (original)
+++ felix/trunk/gogo/aQute.shell.stdio.bnd Mon Jun 22 22:24:12 2009
@@ -1,4 +1,4 @@
-include: ~default.bnd
-Service-Component: aQute.shell.stdio.StdioConsole; \
+Service-Component: org.apache.felix.gogo.shell.stdio.StdioConsole; \
processor=org.osgi.service.command.CommandProcessor
-Private-Package: aQute.shell.stdio,aQute.shell.console
+Private-Package: org.apache.felix.gogo.shell.stdio,org.apache.felix.gogo.shell.console
Modified: felix/trunk/gogo/aQute.shell.support.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.shell.support.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.shell.support.bnd (original)
+++ felix/trunk/gogo/aQute.shell.support.bnd Mon Jun 22 22:24:12 2009
@@ -1,6 +1,6 @@
-include: ~default.bnd
Bundle-Name: aQute Shell Support
Bundle-Description: Commands for the shell that turn it into a programming language
-Private-Package: aQute.shell.lang
-Service-Component: aQute.shell.lang.Support; \
+Private-Package: org.apache.felix.gogo.shell.lang
+Service-Component: org.apache.felix.gogo.shell.lang.Support; \
provide:=org.osgi.service.command.Converter
\ No newline at end of file
Modified: felix/trunk/gogo/aQute.shell.telnet.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.shell.telnet.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.shell.telnet.bnd (original)
+++ felix/trunk/gogo/aQute.shell.telnet.bnd Mon Jun 22 22:24:12 2009
@@ -1,7 +1,7 @@
-include: ~default.bnd
Bundle-Name: Telnet Shell Service
-Bundle-Description: Listens to port 2019 (unless overridden with configuration "port" for pid=aQute.shell.telnet.TelnetShell)
-Private-Package: aQute.shell.telnet, aQute.shell.console
-Service-Component: aQute.shell.telnet.TelnetShell; \
+Bundle-Description: Listens to port 2019 (unless overridden with configuration "port" for pid=org.apache.felix.gogo.shell.telnet.TelnetShell)
+Private-Package: org.apache.felix.gogo.shell.telnet, org.apache.felix.gogo.shell.console
+Service-Component: org.apache.felix.gogo.shell.telnet.TelnetShell; \
processor=org.osgi.service.command.CommandProcessor
Modified: felix/trunk/gogo/aQute.threadio.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/aQute.threadio.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/aQute.threadio.bnd (original)
+++ felix/trunk/gogo/aQute.threadio.bnd Mon Jun 22 22:24:12 2009
@@ -2,7 +2,7 @@
Bundle-Name: Thread IO
Bundle-Description: Multiplexes input/output/error streams based on the thread.
-Private-Package: aQute.threadio
+Private-Package: org.apache.felix.gogo.threadio
Export-Package: org.osgi.service.threadio
-Service-Component: aQute.threadio.ThreadIOImpl;\
+Service-Component: org.apache.felix.gogo.threadio.ThreadIOImpl;\
provide:=org.osgi.service.threadio.ThreadIO
Modified: felix/trunk/gogo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/pom.xml Mon Jun 22 22:24:12 2009
@@ -58,7 +58,7 @@
<configuration>
<instructions>
<Export-Package>org.osgi.service.command; version=1.0.0</Export-Package>
- <Private-Package>aQute.*</Private-Package>
+ <Private-Package>org.apache.felix.gogo.*</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
</instructions>
Modified: felix/trunk/gogo/proc.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/proc.bnd?rev=787426&r1=787425&r2=787426&view=diff
==============================================================================
--- felix/trunk/gogo/proc.bnd (original)
+++ felix/trunk/gogo/proc.bnd Mon Jun 22 22:24:12 2009
@@ -1,5 +1,5 @@
-output: work
-Private-Package: aQute.cpeg
-Service-Component: aQute.cpeg.Procedural; \
- provide:=aQute.cpeg.Procedural; \
+Private-Package: org.apache.felix.gogo.cpeg
+Service-Component: org.apache.felix.gogo.cpeg.Procedural; \
+ provide:=org.apache.felix.gogo.cpeg.Procedural; \
properties:="osgi.command.scope=proc,osgi.command.function=new"
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/cpeg/Procedural.java (from r787421, felix/trunk/gogo/src/main/java/aQute/cpeg/Procedural.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/cpeg/Procedural.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/cpeg/Procedural.java&p1=felix/trunk/gogo/src/main/java/aQute/cpeg/Procedural.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/cpeg/Procedural.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/cpeg/Procedural.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.cpeg;
+package org.apache.felix.gogo.cpeg;
import org.osgi.framework.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/launcher/Launcher.java (from r787421, felix/trunk/gogo/src/main/java/aQute/osgi/launcher/Launcher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/launcher/Launcher.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/launcher/Launcher.java&p1=felix/trunk/gogo/src/main/java/aQute/osgi/launcher/Launcher.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/osgi/launcher/Launcher.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/launcher/Launcher.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.osgi.launcher;
+package org.apache.felix.gogo.launcher;
import java.io.*;
import java.lang.reflect.*;
@@ -26,9 +26,9 @@
import org.osgi.framework.*;
import org.osgi.service.command.*;
-import aQute.shell.console.*;
-import aQute.shell.osgi.*;
-import aQute.threadio.*;
+import org.apache.felix.gogo.shell.console.*;
+import org.apache.felix.gogo.shell.osgi.*;
+import org.apache.felix.gogo.threadio.*;
public class Launcher {
static List<URL> classpath = new ArrayList<URL>();
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/console/Console.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/console/Console.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/console/Console.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/console/Console.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/console/Console.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/console/Console.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/console/Console.java Mon Jun 22 22:24:12 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package aQute.shell.console;
+package org.apache.felix.gogo.shell.console;
import java.io.*;
import java.lang.reflect.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/equinox/Equinox.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/equinox/Equinox.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/equinox/Equinox.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/equinox/Equinox.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/equinox/Equinox.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/equinox/Equinox.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/equinox/Equinox.java Mon Jun 22 22:24:12 2009
@@ -1,4 +1,4 @@
-package aQute.shell.equinox;
+package org.apache.felix.gogo.shell.equinox;
import java.io.*;
import java.net.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/lang/Support.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/lang/Support.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/lang/Support.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/lang/Support.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/lang/Support.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/lang/Support.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/lang/Support.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.shell.lang;
+package org.apache.felix.gogo.shell.lang;
import java.lang.reflect.*;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiCommands.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiCommands.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiCommands.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiCommands.java Mon Jun 22 22:24:12 2009
@@ -18,7 +18,7 @@
*/
// DWB1: osgi:each too verbose (formats reults to System.out)
// DWB2: ClassNotFoundException should be caught in convert() method
-package aQute.shell.osgi;
+package org.apache.felix.gogo.shell.osgi;
import java.io.*;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiShell.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiShell.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiShell.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiShell.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiShell.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/osgi/OSGiShell.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/OSGiShell.java Mon Jun 22 22:24:12 2009
@@ -18,7 +18,7 @@
*/
// DWB3: dynamically load optional framework components to reduce dependencies
// DWB4: get() with trailing colon causes org.osgi.framework.InvalidSyntaxException
-package aQute.shell.osgi;
+package org.apache.felix.gogo.shell.osgi;
import org.osgi.framework.*;
import org.osgi.service.command.*;
@@ -26,7 +26,7 @@
import org.osgi.service.packageadmin.*;
import org.osgi.service.threadio.*;
-import aQute.shell.runtime.*;
+import org.apache.felix.gogo.shell.runtime.*;
public class OSGiShell extends CommandShellImpl {
Bundle bundle;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/ServiceCommand.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/ServiceCommand.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/ServiceCommand.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/osgi/ServiceCommand.java Mon Jun 22 22:24:12 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.shell.osgi;
+package org.apache.felix.gogo.shell.osgi;
import java.util.*;
import org.osgi.framework.*;
import org.osgi.service.command.*;
-import aQute.shell.runtime.*;
+import org.apache.felix.gogo.shell.runtime.*;
public class ServiceCommand extends Reflective implements Function {
ServiceReference ref;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Closure.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Closure.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Closure.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Closure.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/Closure.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/Closure.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Closure.java Mon Jun 22 22:24:12 2009
@@ -19,7 +19,7 @@
// DWB5: session.err is not redirected when creating pipeline
// DWB6: add 'set -x' trace feature if echo is set
// DWB7: removing variable via 'execute("name=") throws OutOfBoundsException
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Command.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Command.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Command.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Command.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/Command.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/Command.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Command.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandSessionImpl.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandSessionImpl.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandSessionImpl.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandSessionImpl.java Mon Jun 22 22:24:12 2009
@@ -19,7 +19,7 @@
// DWB8: throw IllegatlStateException if session used after closed (as per rfc132)
// DWB9: there is no API to list all variables: https://www.osgi.org/bugzilla/show_bug.cgi?id=49
// DWB10: add SCOPE support: https://www.osgi.org/bugzilla/show_bug.cgi?id=51
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.io.*;
import java.lang.reflect.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandShellImpl.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandShellImpl.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandShellImpl.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/CommandShellImpl.java Mon Jun 22 22:24:12 2009
@@ -19,7 +19,7 @@
// DWB11: add removeCommand: https://www.osgi.org/bugzilla/show_bug.cgi?id=49
// DWB12: there is no API to list commands: https://www.osgi.org/bugzilla/show_bug.cgi?id=49
// DWB13: addCommand() fails to add static methods (if target is Class)
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.io.*;
import java.lang.reflect.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Parser.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Parser.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Parser.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Parser.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/Parser.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/Parser.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Parser.java Mon Jun 22 22:24:12 2009
@@ -18,7 +18,7 @@
*/
// DWB14: parser loops if // comment at start of program
// DWB15: allow program to have trailing ';'
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Pipe.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Pipe.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Pipe.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Pipe.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/Pipe.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/Pipe.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Pipe.java Mon Jun 22 22:24:12 2009
@@ -17,7 +17,7 @@
* under the License.
*/
// DWB16: redirect System.err when creating pipe
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.io.*;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Reflective.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/runtime/Reflective.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Reflective.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Reflective.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/runtime/Reflective.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/runtime/Reflective.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/runtime/Reflective.java Mon Jun 22 22:24:12 2009
@@ -20,7 +20,7 @@
// DWB17: coerce() doesn't support static void main(String[]) in rfc132
// DWB18: coerce() doesn't extract cause from InvocationTargetException
// DWB19: coerce() won't add empty array to satisfy Object[] argument
-package aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.lang.reflect.*;
import java.util.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/stdio/StdioConsole.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/stdio/StdioConsole.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/stdio/StdioConsole.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/stdio/StdioConsole.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/stdio/StdioConsole.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/stdio/StdioConsole.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/stdio/StdioConsole.java Mon Jun 22 22:24:12 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.shell.stdio;
+package org.apache.felix.gogo.shell.stdio;
import org.osgi.service.command.*;
import org.osgi.service.component.*;
-import aQute.shell.console.*;
+import org.apache.felix.gogo.shell.console.*;
public class StdioConsole extends Thread {
final Console console = new Console();
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/Handler.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/telnet/Handler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/Handler.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/Handler.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/telnet/Handler.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/telnet/Handler.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/Handler.java Mon Jun 22 22:24:12 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.shell.telnet;
+package org.apache.felix.gogo.shell.telnet;
import java.io.*;
import java.net.*;
import org.osgi.service.command.*;
-import aQute.shell.console.*;
+import org.apache.felix.gogo.shell.console.*;
public class Handler extends Thread {
TelnetShell master;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/TelnetShell.java (from r787421, felix/trunk/gogo/src/main/java/aQute/shell/telnet/TelnetShell.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/TelnetShell.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/TelnetShell.java&p1=felix/trunk/gogo/src/main/java/aQute/shell/telnet/TelnetShell.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/shell/telnet/TelnetShell.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/shell/telnet/TelnetShell.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.shell.telnet;
+package org.apache.felix.gogo.shell.telnet;
import java.io.*;
import java.net.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/Marker.java (from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/Marker.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/Marker.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/Marker.java&p1=felix/trunk/gogo/src/main/java/aQute/threadio/Marker.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/threadio/Marker.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/Marker.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.threadio;
+package org.apache.felix.gogo.threadio;
import java.io.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadIOImpl.java (from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/ThreadIOImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadIOImpl.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadIOImpl.java&p1=felix/trunk/gogo/src/main/java/aQute/threadio/ThreadIOImpl.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/threadio/ThreadIOImpl.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadIOImpl.java Mon Jun 22 22:24:12 2009
@@ -17,7 +17,7 @@
* under the License.
*/
// DWB20: ThreadIO should check and reset IO if something (e.g. jetty) overrides
-package aQute.threadio;
+package org.apache.felix.gogo.threadio;
import java.io.*;
import java.util.logging.Logger;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadInputStream.java (from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/ThreadInputStream.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadInputStream.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadInputStream.java&p1=felix/trunk/gogo/src/main/java/aQute/threadio/ThreadInputStream.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/threadio/ThreadInputStream.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadInputStream.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.threadio;
+package org.apache.felix.gogo.threadio;
import java.io.*;
Copied: felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadPrintStream.java (from r787421, felix/trunk/gogo/src/main/java/aQute/threadio/ThreadPrintStream.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadPrintStream.java?p2=felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadPrintStream.java&p1=felix/trunk/gogo/src/main/java/aQute/threadio/ThreadPrintStream.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/main/java/aQute/threadio/ThreadPrintStream.java (original)
+++ felix/trunk/gogo/src/main/java/org/apache/felix/gogo/threadio/ThreadPrintStream.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package aQute.threadio;
+package org.apache.felix.gogo.threadio;
import java.io.*;
Copied: felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/Context.java (from r787421, felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/Context.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/Context.java?p2=felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/Context.java&p1=felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/Context.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/Context.java (original)
+++ felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/Context.java Mon Jun 22 22:24:12 2009
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package test.aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
-import aQute.shell.runtime.*;
-import aQute.threadio.*;
+import org.apache.felix.gogo.threadio.*;
public class Context extends CommandShellImpl {
public static final String EMPTY = "";
Copied: felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/TestParser.java (from r787421, felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/TestParser.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/TestParser.java?p2=felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/TestParser.java&p1=felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/TestParser.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/test/java/test/aQute/shell/runtime/TestParser.java (original)
+++ felix/trunk/gogo/src/test/java/org/apache/felix/gogo/shell/runtime/TestParser.java Mon Jun 22 22:24:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package test.aQute.shell.runtime;
+package org.apache.felix.gogo.shell.runtime;
import java.io.*;
import java.util.*;
@@ -26,8 +26,6 @@
import org.osgi.service.command.*;
-import aQute.shell.runtime.*;
-
public class TestParser extends TestCase {
int beentheredonethat = 0;
Copied: felix/trunk/gogo/src/test/java/org/apache/felix/gogo/threadio/TestThreadIO.java (from r787421, felix/trunk/gogo/src/test/java/test/aQute/threadio/TestThreadIO.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/src/test/java/org/apache/felix/gogo/threadio/TestThreadIO.java?p2=felix/trunk/gogo/src/test/java/org/apache/felix/gogo/threadio/TestThreadIO.java&p1=felix/trunk/gogo/src/test/java/test/aQute/threadio/TestThreadIO.java&r1=787421&r2=787426&rev=787426&view=diff
==============================================================================
--- felix/trunk/gogo/src/test/java/test/aQute/threadio/TestThreadIO.java (original)
+++ felix/trunk/gogo/src/test/java/org/apache/felix/gogo/threadio/TestThreadIO.java Mon Jun 22 22:24:12 2009
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package test.aQute.threadio;
+package org.apache.felix.gogo.threadio;
import java.io.*;
import java.util.*;
import junit.framework.*;
-import aQute.threadio.*;
public class TestThreadIO extends TestCase {