Author: jdillon
Date: Wed Sep 17 02:54:07 2008
New Revision: 696223
URL: http://svn.apache.org/viewvc?rev=696223&view=rev
Log:
Rename CommandContainer* -> Command* (and related muck)
Added:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainer.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerAware.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerFactory.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerRegistry.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerResolver.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasContainerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerManager.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerRegisteredEvent.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerSupport.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java (contents, props changed)
- copied, changed from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupContainerImpl.java
Removed:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainer.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerAware.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerFactory.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerRegistry.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerResolver.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasContainerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerManager.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerRegisteredEvent.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerSupport.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupContainerImpl.java
Modified:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/CommandBundle.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java (from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainer.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainer.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainer.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java Wed Sep 17 02:54:07 2008
@@ -27,7 +27,7 @@
*
* @version $Rev$ $Date$
*/
-public interface CommandContainer
+public interface Command
{
/**
* Returns the configured identifier of the command.
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Command.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java (from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerAware.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerAware.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerAware.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java Wed Sep 17 02:54:07 2008
@@ -20,11 +20,11 @@
package org.apache.geronimo.gshell.command;
/**
- * Marks a component as aware of it's {@link CommandContainer}.
+ * Marks a component as aware of it's {@link Command}.
*
* @version $Rev$ $Date$
*/
-public interface CommandContainerAware
+public interface CommandAware
{
- void setCommandContainer(CommandContainer container);
+ void setCommand(Command command);
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAware.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java Wed Sep 17 02:54:07 2008
@@ -50,9 +50,9 @@
Variables getVariables();
/**
- * Provides access to the command container.
+ * Provides access to the command.
*
- * @return Command container; never null.
+ * @return Command; never null.
*/
- CommandContainer getContainer();
+ Command getCommand();
}
\ No newline at end of file
Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java (from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerFactory.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerFactory.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerFactory.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java Wed Sep 17 02:54:07 2008
@@ -20,19 +20,19 @@
package org.apache.geronimo.gshell.command;
/**
- * Provides access to {@link CommandContainer} instances.
+ * Provides access to {@link Command} instances.
*
* @version $Rev$ $Date$
*/
-public interface CommandContainerFactory
+public interface CommandFactory
{
/**
* Create a command instance for the given identifier.
*
- * @param id The identifier of the command container to create.
- * @return A new command container instance; never null.
+ * @param id The identifier of the command to create.
+ * @return A new command instance; never null.
*
- * @throws Exception Failed to create command container instance.
+ * @throws Exception Failed to create command instance.
*/
- CommandContainer create(String id) throws Exception;
+ Command create(String id) throws Exception;
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java (from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerRegistry.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerRegistry.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerRegistry.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java Wed Sep 17 02:54:07 2008
@@ -20,18 +20,18 @@
package org.apache.geronimo.gshell.command;
/**
- * Provides registration facilities for {@link CommandContainer} instances.
+ * Provides registration facilities for {@link Command} instances.
*
* @version $Rev$ $Date$
*/
-public interface CommandContainerRegistry
+public interface CommandRegistry
{
/**
- * Registers a command-container.
+ * Registers a command.
*
- * @param container The command-container to register; must not be null.
+ * @param command The command to register; must not be null.
*/
- void register(CommandContainer container);
+ void register(Command command);
//
// TODO: Expose registration details for help command support
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandRegistry.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java (from r696212, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerResolver.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerResolver.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContainerResolver.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java Wed Sep 17 02:54:07 2008
@@ -20,20 +20,20 @@
package org.apache.geronimo.gshell.command;
/**
- * Resolves {@link CommandContainer} instances for a given path.
+ * Resolves {@link Command} instances for a given path.
*
* @version $Rev$ $Date$
*/
-public interface CommandContainerResolver
+public interface CommandResolver
{
/**
- * Resolve the given path to a command container instance.
+ * Resolve the given path to a command instance.
*
* @param variables The current shell variables.
* @param path The path of the command to resolve.
- * @return The resolved command container instance; never null.
+ * @return The resolved command instance; never null.
*
- * @throws CommandException Failed to resolve command container.
+ * @throws CommandException Failed to resolve command.
*/
- CommandContainer resolve(Variables variables, String path) throws CommandException;
+ Command resolve(Variables variables, String path) throws CommandException;
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml Wed Sep 17 02:54:07 2008
@@ -30,7 +30,7 @@
<context:annotation-config/>
<!--
- <bean id="commandTemplate" abstract="true" class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean id="commandTemplate" abstract="true" class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="documenter">
<bean class="org.apache.geronimo.gshell.wisdom.command.CommandDocumenterImpl"/>
</property>
@@ -58,7 +58,7 @@
<property name="commands">
<list>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:clear"/>
<property name="action">
@@ -66,7 +66,7 @@
</property>
</bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:echo"/>
<property name="action">
@@ -74,7 +74,7 @@
</property>
</bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:exit"/>
<property name="action">
@@ -82,7 +82,7 @@
</property>
</bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:help"/>
<property name="action">
@@ -90,7 +90,7 @@
</property>
</bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:set"/>
<property name="action">
@@ -98,7 +98,7 @@
</property>
</bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:source"/>
<property name="action">
@@ -106,7 +106,7 @@
</property>
</bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.CommandContainerImpl">
+ <bean class="org.apache.geronimo.gshell.wisdom.command.CommandImpl">
<property name="id" value="gshell-builtins:unset"/>
<property name="action">
Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java (from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasContainerImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java&p1=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasContainerImpl.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasContainerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java Wed Sep 17 02:54:07 2008
@@ -32,8 +32,8 @@
*
* @version $Rev$ $Date$
*/
-public class AliasContainerImpl
- extends CommandContainerSupport
+public class AliasImpl
+ extends CommandSupport
{
private final Logger log = LoggerFactory.getLogger(getClass());
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterImpl.java?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandDocumenterImpl.java Wed Sep 17 02:54:07 2008
@@ -22,8 +22,8 @@
import org.apache.geronimo.gshell.clp.CommandLineProcessor;
import org.apache.geronimo.gshell.clp.Printer;
import org.apache.geronimo.gshell.command.CommandAction;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerAware;
+import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandAware;
import org.apache.geronimo.gshell.command.CommandDocumenter;
import org.apache.geronimo.gshell.i18n.PrefixingMessageSource;
import org.slf4j.Logger;
@@ -37,11 +37,11 @@
* @version $Rev$ $Date$
*/
public class CommandDocumenterImpl
- implements CommandDocumenter, CommandContainerAware
+ implements CommandDocumenter, CommandAware
{
private final Logger log = LoggerFactory.getLogger(getClass());
- private CommandContainer container;
+ private Command command;
private String name;
@@ -51,7 +51,7 @@
public String getName() {
if (name == null) {
- name = getContainer().getMessages().getMessage("command.name");
+ name = getCommand().getMessages().getMessage("command.name");
}
return name;
}
@@ -62,7 +62,7 @@
public String getDescription() {
if (description == null) {
- description = getContainer().getMessages().getMessage("command.description");
+ description = getCommand().getMessages().getMessage("command.description");
}
return description;
}
@@ -73,7 +73,7 @@
public String getManual() {
if (manual == null) {
- manual = getContainer().getMessages().getMessage("command.manual");
+ manual = getCommand().getMessages().getMessage("command.manual");
}
return manual;
}
@@ -83,19 +83,19 @@
}
//
- // CommandContainerAware
+ // CommandAware
//
- public void setCommandContainer(final CommandContainer container) {
- assert container != null;
+ public void setCommand(final Command command) {
+ assert command != null;
- this.container = container;
+ this.command = command;
}
- private CommandContainer getContainer() {
- assert container != null;
+ private Command getCommand() {
+ assert command != null;
- return container;
+ return command;
}
//
@@ -110,11 +110,11 @@
CommandLineProcessor clp = new CommandLineProcessor();
// Attach our helper to inject --help
- CommandContainerImpl.HelpSupport help = new CommandContainerImpl.HelpSupport();
+ CommandImpl.HelpSupport help = new CommandImpl.HelpSupport();
clp.addBean(help);
// And then the beans options
- CommandAction action = getContainer().getAction();
+ CommandAction action = getCommand().getAction();
clp.addBean(action);
// Render the help
@@ -122,7 +122,7 @@
out.println();
Printer printer = new Printer(clp);
- printer.setMessageSource(new PrefixingMessageSource(getContainer().getMessages(), "command."));
+ printer.setMessageSource(new PrefixingMessageSource(getCommand().getMessages(), "command."));
printer.printUsage(out, getName());
}
Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java (from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java&p1=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java Wed Sep 17 02:54:07 2008
@@ -23,7 +23,7 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.Arguments;
import org.apache.geronimo.gshell.command.CommandAction;
-import org.apache.geronimo.gshell.command.CommandContainer;
+import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.command.CommandDocumenter;
import org.apache.geronimo.gshell.command.CommandResult;
@@ -38,12 +38,12 @@
import javax.annotation.PostConstruct;
/**
- * The default {@link CommandContainer} component.
+ * The default {@link Command} component.
*
* @version $Rev$ $Date$
*/
-public class CommandContainerImpl
- extends CommandContainerSupport
+public class CommandImpl
+ extends CommandSupport
{
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -110,8 +110,8 @@
return variables;
}
- public CommandContainer getContainer() {
- return CommandContainerImpl.this;
+ public Command getCommand() {
+ return CommandImpl.this;
}
};
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java (from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java&p1=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerManager.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerManager.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java Wed Sep 17 02:54:07 2008
@@ -19,10 +19,10 @@
package org.apache.geronimo.gshell.wisdom.command;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerFactory;
-import org.apache.geronimo.gshell.command.CommandContainerRegistry;
-import org.apache.geronimo.gshell.command.CommandContainerResolver;
+import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandFactory;
+import org.apache.geronimo.gshell.command.CommandRegistry;
+import org.apache.geronimo.gshell.command.CommandResolver;
import org.apache.geronimo.gshell.command.CommandException;
import org.apache.geronimo.gshell.command.CommandNotFoundException;
import org.apache.geronimo.gshell.command.Variables;
@@ -35,68 +35,68 @@
import java.util.Map;
/**
- * Provides management of {@link CommandContainer} instances.
+ * Provides management of {@link Command} instances.
*
* @version $Rev$ $Date$
*/
-public class CommandContainerManager
- implements CommandContainerRegistry, CommandContainerFactory, CommandContainerResolver
+public class CommandManager
+ implements CommandRegistry, CommandFactory, CommandResolver
{
private final Logger log = LoggerFactory.getLogger(getClass());
@Autowired
private EventPublisher eventPublisher;
- private Map<String,CommandContainer> registrations = new HashMap<String,CommandContainer>();
+ private Map<String, Command> registrations = new HashMap<String, Command>();
//
- // CommandContainerRegistry
+ // CommandRegistry
//
- public void register(final CommandContainer container) {
- assert container != null;
+ public void register(final Command command) {
+ assert command != null;
- String id = container.getId();
+ String id = command.getId();
- log.debug("Registering command container: {}", id);
+ log.debug("Registering command: {}", id);
- registrations.put(id, container);
+ registrations.put(id, command);
- eventPublisher.publish(new CommandContainerRegisteredEvent(container));
+ eventPublisher.publish(new CommandRegisteredEvent(command));
}
//
- // CommandContainerFactory
+ // CommandFactory
//
- public CommandContainer create(final String id) throws Exception {
+ public Command create(final String id) throws Exception {
assert id != null;
- log.debug("Locating container for ID: {}", id);
+ log.debug("Locating command for ID: {}", id);
- CommandContainer container = registrations.get(id);
+ Command command = registrations.get(id);
- if (container == null) {
- throw new RuntimeException("No command container registered for id: " + id);
+ if (command == null) {
+ throw new RuntimeException("No command registered for id: " + id);
}
- return container;
+ return command;
}
//
- // CommandContainerResolver
+ // CommandResolver
//
- public CommandContainer resolve(final Variables variables, final String path) throws CommandException {
+ public Command resolve(final Variables variables, final String path) throws CommandException {
assert variables != null;
assert path != null;
- log.debug("Resolving container for path: {}", path);
+ log.debug("Resolving command for path: {}", path);
// HACK: For now, there is no nested muck, just use the name
- for (CommandContainer container : registrations.values()) {
- if (path.equals(container.getDocumenter().getName())) {
- return container;
+ for (Command command : registrations.values()) {
+ if (path.equals(command.getDocumenter().getName())) {
+ return command;
}
}
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java (from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerRegisteredEvent.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java&p1=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerRegisteredEvent.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerRegisteredEvent.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java Wed Sep 17 02:54:07 2008
@@ -19,26 +19,26 @@
package org.apache.geronimo.gshell.wisdom.command;
-import org.apache.geronimo.gshell.command.CommandContainer;
+import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.event.Event;
/**
- * Event fired once a command container has been registered.
+ * Event fired once a command has been registered.
*
* @version $Rev$ $Date$
*/
-public class CommandContainerRegisteredEvent
+public class CommandRegisteredEvent
implements Event
{
- private final CommandContainer container;
+ private final Command command;
- public CommandContainerRegisteredEvent(final CommandContainer container) {
- assert container != null;
+ public CommandRegisteredEvent(final Command command) {
+ assert command != null;
- this.container = container;
+ this.command = command;
}
- public CommandContainer getContainer() {
- return container;
+ public Command getCommand() {
+ return command;
}
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandRegisteredEvent.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java (from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerSupport.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java&p1=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerSupport.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandContainerSupport.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java Wed Sep 17 02:54:07 2008
@@ -19,36 +19,22 @@
package org.apache.geronimo.gshell.wisdom.command;
-import org.apache.geronimo.gshell.clp.CommandLineProcessor;
-import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.Arguments;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandCompleter;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerAware;
-import org.apache.geronimo.gshell.command.CommandContainerRegistry;
-import org.apache.geronimo.gshell.command.CommandContext;
+import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandAware;
import org.apache.geronimo.gshell.command.CommandDocumenter;
-import org.apache.geronimo.gshell.command.CommandResult;
-import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.i18n.MessageSource;
-import org.apache.geronimo.gshell.i18n.ResourceBundleMessageSource;
-import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.notification.Notification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.PostConstruct;
/**
- * Provides support for {@link CommandContainer} implementations.
+ * Provides support for {@link Command} implementations.
*
* @version $Rev$ $Date$
*/
-public abstract class CommandContainerSupport
- implements CommandContainer
+public abstract class CommandSupport
+ implements Command
{
protected final Logger log = LoggerFactory.getLogger(getClass());
@@ -79,7 +65,7 @@
public void setAction(final CommandAction action) {
assert action != null;
- handleCommandContainerAware(action);
+ handleCommandAware(action);
this.action = action;
}
@@ -91,7 +77,7 @@
public void setDocumenter(final CommandDocumenter documenter) {
assert documenter != null;
- handleCommandContainerAware(documenter);
+ handleCommandAware(documenter);
this.documenter = documenter;
}
@@ -103,7 +89,7 @@
public void setCompleter(final CommandCompleter completer) {
assert completer != null;
- handleCommandContainerAware(completer);
+ handleCommandAware(completer);
this.completer = completer;
}
@@ -115,16 +101,16 @@
public void setMessages(final MessageSource messages) {
assert messages != null;
- handleCommandContainerAware(messages);
+ handleCommandAware(messages);
this.messages = messages;
}
- protected void handleCommandContainerAware(final Object target) {
+ protected void handleCommandAware(final Object target) {
assert target != null;
- if (target instanceof CommandContainerAware) {
- ((CommandContainerAware)target).setCommandContainer(this);
+ if (target instanceof CommandAware) {
+ ((CommandAware)target).setCommand(this);
}
}
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java (from r696212, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupContainerImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java?p2=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java&p1=geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupContainerImpl.java&r1=696212&r2=696223&rev=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupContainerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java Wed Sep 17 02:54:07 2008
@@ -32,8 +32,8 @@
*
* @version $Rev$ $Date$
*/
-public class GroupContainerImpl
- extends CommandContainerSupport
+public class GroupImpl
+ extends CommandSupport
{
private final Logger log = LoggerFactory.getLogger(getClass());
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/CommandBundle.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/CommandBundle.java?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/CommandBundle.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/CommandBundle.java Wed Sep 17 02:54:07 2008
@@ -19,12 +19,12 @@
package org.apache.geronimo.gshell.wisdom.plugin;
-import org.apache.geronimo.gshell.command.CommandContainer;
+import org.apache.geronimo.gshell.command.Command;
import java.util.List;
/**
- * A bundle of {@link CommandContainer} instances.
+ * A bundle of {@link Command} instances.
*
* @version $Rev$ $Date$
*/
@@ -32,7 +32,7 @@
{
private String id;
- private List<CommandContainer> commands;
+ private List<Command> commands;
public String getId() {
return id;
@@ -44,11 +44,11 @@
this.id = id;
}
- public List<CommandContainer> getCommands() {
+ public List<Command> getCommands() {
return commands;
}
- public void setCommands(final List<CommandContainer> commands) {
+ public void setCommands(final List<Command> commands) {
assert commands != null;
this.commands = commands;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java Wed Sep 17 02:54:07 2008
@@ -21,8 +21,8 @@
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerRegistry;
+import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandRegistry;
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@
import java.util.Map;
/**
- * ???
+ * Default implementation of {@link Plugin}.
*
* @version $Rev$ $Date$
*/
@@ -41,7 +41,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
@Autowired
- private CommandContainerRegistry commandRegistry;
+ private CommandRegistry commandRegistry;
private BeanContainer container;
@@ -81,7 +81,7 @@
if (!bundle.isEmpty()) {
log.debug("Discovered {} commands in bundle {}", bundle.size(), bundle.getId());
- for (CommandContainer command : bundle.getCommands()) {
+ for (Command command : bundle.getCommands()) {
commandRegistry.register(command);
}
}
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java Wed Sep 17 02:54:07 2008
@@ -22,8 +22,8 @@
import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.chronos.StopWatch;
import org.apache.geronimo.gshell.command.Arguments;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerResolver;
+import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandResolver;
import org.apache.geronimo.gshell.command.CommandException;
import org.apache.geronimo.gshell.command.CommandResult;
import org.apache.geronimo.gshell.command.Variables;
@@ -63,7 +63,7 @@
private ApplicationManager applicationManager;
@Autowired
- private CommandContainerResolver commandContainerResolver;
+ private CommandResolver commandResolver;
@Autowired
private CommandLineBuilder commandLineBuilder;
@@ -197,7 +197,7 @@
Variables variables = applicationManager.getApplication().getVariables();
- CommandContainer container = commandContainerResolver.resolve(variables, path);
+ Command command = commandResolver.resolve(variables, path);
// Instances get their own namespace with defaults from the current
Variables vars = new Variables(variables);
@@ -210,7 +210,7 @@
CommandResult result;
try {
- result = container.execute(args, io, vars);
+ result = command.execute(args, io, vars);
log.debug("Command completed with result: {}, after: {}", result, watch);
}
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml?rev=696223&r1=696222&r2=696223&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml Wed Sep 17 02:54:07 2008
@@ -31,7 +31,7 @@
<bean id="pluginManager" class="org.apache.geronimo.gshell.wisdom.plugin.PluginManagerImpl"/>
- <bean id="commandContainerManager" class="org.apache.geronimo.gshell.wisdom.command.CommandContainerManager"/>
+ <bean id="commandManager" class="org.apache.geronimo.gshell.wisdom.command.CommandManager"/>
<bean id="commandLineBuilder" class="org.apache.geronimo.gshell.wisdom.shell.CommandLineBuilderImpl"/>
|