Author: dbaum
Date: Fri May 14 14:43:34 2010
New Revision: 944297
URL: http://svn.apache.org/viewvc?rev=944297&view=rev
Log:
moved gogo.runtime.shell sub-package in Runtime bundle up into gogo.runtime
package to avoid possible confusion with the gogo.shell package in the new
Shell bundle (FELIX-2328).
Added:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProcessorImpl.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProxy.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/EOFError.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Evaluate.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Parser.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/SyntaxError.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Token.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Tokenizer.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/Context.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser2.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser2.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java
- copied, changed from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestTokenizer.java
Removed:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/
Modified:
felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
felix/trunk/gogo/runtime/pom.xml
Modified:
felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java?rev=944297&r1=944296&r2=944297&view=diff
==============================================================================
---
felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
(original)
+++
felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
Fri May 14 14:43:34 2010
@@ -18,9 +18,9 @@
*/
package org.apache.felix.gogo.commands;
+import org.apache.felix.gogo.runtime.CommandProcessorImpl;
+import org.apache.felix.gogo.runtime.CommandSessionImpl;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.apache.felix.gogo.runtime.shell.CommandProcessorImpl;
-import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
public class Context extends CommandProcessorImpl
{
Modified: felix/trunk/gogo/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=944297&r1=944296&r2=944297&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Fri May 14 14:43:34 2010
@@ -62,10 +62,10 @@
org.osgi.service.startlevel*; resolution:=optional,
*
</Import-Package>
-
<Private-Package>org.apache.felix.gogo.*</Private-Package>
+
<Private-Package>org.apache.felix.gogo.runtime*</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software
Foundation</Bundle-Vendor>
-
<Bundle-Activator>org.apache.felix.gogo.runtime.Activator</Bundle-Activator>
+
<Bundle-Activator>org.apache.felix.gogo.runtime.activator.Activator</Bundle-Activator>
<Include-Resource>{maven-resources},META-INF/NOTICE=NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
Fri May 14 14:43:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.io.EOFException;
import java.util.AbstractList;
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.felix.gogo.runtime.shell.Tokenizer.Type;
+import org.apache.felix.gogo.runtime.Tokenizer.Type;
import org.osgi.service.command.CommandSession;
import org.osgi.service.command.Function;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProcessorImpl.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProcessorImpl.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProcessorImpl.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
Fri May 14 14:43:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.io.InputStream;
import java.io.PrintStream;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProxy.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProxy.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandProxy.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
Fri May 14 14:43:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.util.List;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
Fri May 14 14:43:34 2010
@@ -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 org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import org.osgi.service.command.CommandSession;
import org.osgi.service.command.Converter;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/EOFError.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/EOFError.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/EOFError.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/EOFError.java
Fri May 14 14:43:34 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
public class EOFError extends SyntaxError
{
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Evaluate.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Evaluate.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Evaluate.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Evaluate.java
Fri May 14 14:43:34 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
public interface Evaluate
{
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Parser.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Parser.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Parser.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Parser.java
Fri May 14 14:43:34 2010
@@ -18,13 +18,13 @@
*/
// DWB14: parser loops if // comment at start of program
// DWB15: allow program to have trailing ';'
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.felix.gogo.runtime.shell.Tokenizer.Type;
+import org.apache.felix.gogo.runtime.Tokenizer.Type;
public class Parser
{
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
Fri May 14 14:43:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.io.IOException;
import java.io.InputStream;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
Fri May 14 14:43:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.lang.annotation.*;
import java.lang.reflect.*;
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/SyntaxError.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/SyntaxError.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/SyntaxError.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/SyntaxError.java
Fri May 14 14:43:34 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
public class SyntaxError extends RuntimeException
{
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Token.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Token.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Token.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Token.java
Fri May 14 14:43:34 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
-import org.apache.felix.gogo.runtime.shell.Tokenizer.Type;
+import org.apache.felix.gogo.runtime.Tokenizer.Type;
public class Token implements CharSequence
{
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Tokenizer.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Tokenizer.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Tokenizer.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Tokenizer.java
Fri May 14 14:43:34 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
/**
Copied:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
(from r944232,
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java
(original)
+++
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
Fri May 14 14:43:34 2010
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime;
+package org.apache.felix.gogo.runtime.activator;
import java.util.ArrayList;
import java.util.List;
-import org.apache.felix.gogo.runtime.shell.CommandProcessorImpl;
-import org.apache.felix.gogo.runtime.shell.CommandProxy;
+import org.apache.felix.gogo.runtime.CommandProcessorImpl;
+import org.apache.felix.gogo.runtime.CommandProxy;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Copied:
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
(from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/Context.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java?p2=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java&p1=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/Context.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/Context.java
(original)
+++
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
Fri May 14 14:43:34 2010
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+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;
Copied:
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
(from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java?p2=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java&p1=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java
(original)
+++
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
Fri May 14 14:43:34 2010
@@ -16,9 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
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;
Copied:
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser2.java
(from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser2.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser2.java?p2=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser2.java&p1=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser2.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser2.java
(original)
+++
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser2.java
Fri May 14 14:43:34 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.io.EOFException;
Copied:
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java
(from r944232,
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestTokenizer.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java?p2=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java&p1=felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestTokenizer.java&r1=944232&r2=944297&rev=944297&view=diff
==============================================================================
---
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestTokenizer.java
(original)
+++
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java
Fri May 14 14:43:34 2010
@@ -16,14 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.runtime.shell;
+package org.apache.felix.gogo.runtime;
import java.io.File;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
-import org.apache.felix.gogo.runtime.shell.Tokenizer.Type;
+import org.apache.felix.gogo.runtime.Evaluate;
+import org.apache.felix.gogo.runtime.Parser;
+import org.apache.felix.gogo.runtime.SyntaxError;
+import org.apache.felix.gogo.runtime.Token;
+import org.apache.felix.gogo.runtime.Tokenizer;
+import org.apache.felix.gogo.runtime.Tokenizer.Type;
import junit.framework.TestCase;
