You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@felix.apache.org by Guillaume Sauthier <Gu...@objectweb.org> on 2010/06/23 11:45:11 UTC
Re: svn commit: r952918 - in /felix/trunk: gogo/commands/ gogo/commands/src/main/java/org/apache/felix/gogo/commands/
gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/
go...
Hi guys
Maybe I react after the battle but, I was quite happy with the commands
module in gogo :)
I thought it was really some kind of extension to the gogo framework,
not so closely related to karaf.
We're using it in a chameleon subproject [1] to provide commands/actions
as iPOJO components.
And we're definitely not depending on karaf, but on gogo.
Is it possible to move back that module into gogo or at least discuss
the issue ?
Cheers
--Guillaume
[1].
http://websvn.ow2.org/listing.php?repname=chameleon&path=%2Fsandboxes%2Fsauthieg%2Fgogo-shell%2F
Le 09/06/2010 11:17, gnodet@apache.org a écrit :
> Author: gnodet
> Date: Wed Jun 9 09:17:02 2010
> New Revision: 952918
>
> URL: http://svn.apache.org/viewvc?rev=952918&view=rev
> Log:
> FELIX-2341: the gogo-commands module should be moved back to karaf
>
> Added:
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
> felix/trunk/karaf/shell/console/src/test/
> felix/trunk/karaf/shell/console/src/test/java/
> felix/trunk/karaf/shell/console/src/test/java/org/
> felix/trunk/karaf/shell/console/src/test/java/org/apache/
> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/
> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/
> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/
> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
> - copied, changed from r952712, felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
> Removed:
> felix/trunk/gogo/commands/NOTICE
> felix/trunk/gogo/commands/pom.xml
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
> Modified:
> felix/trunk/karaf/shell/console/pom.xml
>
> Modified: felix/trunk/karaf/shell/console/pom.xml
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/pom.xml?rev=952918&r1=952917&r2=952918&view=diff
> ==============================================================================
> --- felix/trunk/karaf/shell/console/pom.xml (original)
> +++ felix/trunk/karaf/shell/console/pom.xml Wed Jun 9 09:17:02 2010
> @@ -67,10 +67,6 @@
> <groupId>org.apache.felix.gogo</groupId>
> <artifactId>org.apache.felix.gogo.runtime</artifactId>
> </dependency>
> -<dependency>
> -<groupId>org.apache.felix.gogo</groupId>
> -<artifactId>org.apache.felix.gogo.commands</artifactId>
> -</dependency>
> </dependencies>
>
> <build>
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java (from r952712, felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> (empty)
>
> Copied: felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java (from r952712, felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java?p2=felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java&p1=felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> --- felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java (original)
> +++ felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java Wed Jun 9 09:17:02 2010
> @@ -18,11 +18,11 @@
> */
> 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.CommandShellImpl;
> +import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
>
> -public class Context extends CommandProcessorImpl
> +public class Context extends CommandShellImpl
> {
> public static final String EMPTY = "";
> CommandSessionImpl session = (CommandSessionImpl) createSession(System.in, System.out, System.err);
> @@ -37,7 +37,7 @@ public class Context extends CommandProc
>
> public Context()
> {
> - super(threadio, null);
> + setThreadio(threadio);
> }
>
> public Object execute(CharSequence source) throws Exception
>
> Copied: felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java (from r952712, felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java)
> URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java?p2=felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java&p1=felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java&r1=952712&r2=952918&rev=952918&view=diff
> ==============================================================================
> --- felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java (original)
> +++ felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java Wed Jun 9 09:17:02 2010
> @@ -136,4 +136,4 @@ public class TestCommands extends TestCa
> return ids;
> }
> }
> -}
> +}
> \ No newline at end of file
>
>
>
>
>
Re: svn commit: r952918 - in /felix/trunk: gogo/commands/ gogo/commands/src/main/java/org/apache/felix/gogo/commands/
gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/
go...
Posted by "Richard S. Hall" <he...@ungoverned.org>.
On 6/23/10 5:45, Guillaume Sauthier wrote:
> Hi guys
>
> Maybe I react after the battle but, I was quite happy with the
> commands module in gogo :)
> I thought it was really some kind of extension to the gogo framework,
> not so closely related to karaf.
>
> We're using it in a chameleon subproject [1] to provide
> commands/actions as iPOJO components.
> And we're definitely not depending on karaf, but on gogo.
>
> Is it possible to move back that module into gogo or at least discuss
> the issue ?
Even if it is in Karaf, there is nothing that prevents you from using it
from there. I'm sure it will continue to be released as a separate
module, so it doesn't really matter if the groupId is org.apache.felix
or org.apache.karaf.
Ultimately, the commands module was ported from previous
Karaf/ServiceMix Kernel work and didn't completely fit the Gogo model,
which isn't about registering Function services as commands, but rather
ordinary Java objects. So, it doesn't seem fitting for Gogo to promote
an approach that isn't the intended approach.
The RFC behind Gogo is still changing too, so the impl will change to
reflect it. There is some effort to provide similar capabilities in the
core RFC as to what the commands module provided, e.g., annotations for
describing commands. Hopefully, as it progresses it will subsume the
capabilities of the commands module, but if not, nothing prevents you
from continuing to use the old version of the commands module (unless
there is some backwards incompatible change).
-> richard
>
> Cheers
> --Guillaume
>
> [1].
> http://websvn.ow2.org/listing.php?repname=chameleon&path=%2Fsandboxes%2Fsauthieg%2Fgogo-shell%2F
>
>
> Le 09/06/2010 11:17, gnodet@apache.org a écrit :
>> Author: gnodet
>> Date: Wed Jun 9 09:17:02 2010
>> New Revision: 952918
>>
>> URL: http://svn.apache.org/viewvc?rev=952918&view=rev
>> Log:
>> FELIX-2341: the gogo-commands module should be moved back to karaf
>>
>> Added:
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
>>
>>
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
>>
>> felix/trunk/karaf/shell/console/src/test/
>> felix/trunk/karaf/shell/console/src/test/java/
>> felix/trunk/karaf/shell/console/src/test/java/org/
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/
>>
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/
>>
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/
>>
>>
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
>>
>>
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
>>
>> - copied, changed from r952712,
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
>>
>> Removed:
>> felix/trunk/gogo/commands/NOTICE
>> felix/trunk/gogo/commands/pom.xml
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
>>
>>
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
>>
>>
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
>>
>>
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
>>
>> Modified:
>> felix/trunk/karaf/shell/console/pom.xml
>>
>> Modified: felix/trunk/karaf/shell/console/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/pom.xml?rev=952918&r1=952917&r2=952918&view=diff
>>
>> ==============================================================================
>>
>> --- felix/trunk/karaf/shell/console/pom.xml (original)
>> +++ felix/trunk/karaf/shell/console/pom.xml Wed Jun 9 09:17:02 2010
>> @@ -67,10 +67,6 @@
>> <groupId>org.apache.felix.gogo</groupId>
>> <artifactId>org.apache.felix.gogo.runtime</artifactId>
>> </dependency>
>> -<dependency>
>> -<groupId>org.apache.felix.gogo</groupId>
>> -<artifactId>org.apache.felix.gogo.commands</artifactId>
>> -</dependency>
>> </dependencies>
>>
>> <build>
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java?p2=felix/trunk/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java&p1=felix/trunk/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> (empty)
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java?p2=felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java&p1=felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> ---
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
>> (original)
>> +++
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
>> Wed Jun 9 09:17:02 2010
>> @@ -18,11 +18,11 @@
>> */
>> 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.CommandShellImpl;
>> +import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
>>
>> -public class Context extends CommandProcessorImpl
>> +public class Context extends CommandShellImpl
>> {
>> public static final String EMPTY = "";
>> CommandSessionImpl session = (CommandSessionImpl)
>> createSession(System.in, System.out, System.err);
>> @@ -37,7 +37,7 @@ public class Context extends CommandProc
>>
>> public Context()
>> {
>> - super(threadio, null);
>> + setThreadio(threadio);
>> }
>>
>> public Object execute(CharSequence source) throws Exception
>>
>> Copied:
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
>> (from r952712,
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java)
>>
>> URL:
>> http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java?p2=felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java&p1=felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java&r1=952712&r2=952918&rev=952918&view=diff
>>
>> ==============================================================================
>>
>> ---
>> felix/trunk/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
>> (original)
>> +++
>> felix/trunk/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
>> Wed Jun 9 09:17:02 2010
>> @@ -136,4 +136,4 @@ public class TestCommands extends TestCa
>> return ids;
>> }
>> }
>> -}
>> +}
>> \ No newline at end of file
>>
>>
>>
>>