You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/06/21 16:55:49 UTC
svn commit: r670207 [1/2] - in /geronimo/gshell/trunk: ./
gshell-api/src/main/java/org/apache/geronimo/gshell/command/
gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ gshell-assembly/
gshell-assembly/src/main/underlay/etc/ gshell-cli/ gshell...
Author: jdillon
Date: Sat Jun 21 07:55:47 2008
New Revision: 670207
URL: http://svn.apache.org/viewvc?rev=670207&view=rev
Log:
Move the plexus specifics from gshell-plugin to gshell-rapture
Added:
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/
- copied from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsConfiguration.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsConfiguration.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsLocator.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsLocator.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsManager.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsManager.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandCompleter.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainer.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java (contents, props changed)
- copied, changed from r670194, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainerFactory.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java (contents, props changed)
- copied, changed from r670191, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandDocumenter.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandInfo.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java (contents, props changed)
- copied, changed from r670187, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandResolver.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/
- copied from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandActionDescriptor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandCompleterDescriptor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandContainerDescriptor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandDocumenterDescriptor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/ComponentDescriptorSupport.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java
- copied, changed from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/PluginDescriptor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginDiscoverer.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineBuilder.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandLineBuilder.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java (contents, props changed)
- copied, changed from r670187, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandLineExecutor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultHistory.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultHistory.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultLayoutManager.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultLayoutManager.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShell.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultShell.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultShellContext.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellInfo.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultShellInfo.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/ExecutingVisitor.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/ExecutingVisitor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/FileHistory.java
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/FileHistory.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/LoggingVisitor.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/LoggingVisitor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/shell/VariableInterpolator.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/VariableInterpolator.java
geronimo/gshell/trunk/gshell-rapture/src/test/
geronimo/gshell/trunk/gshell-rapture/src/test/java/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/gshell/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/gshell/rapture/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/gshell/rapture/builder/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilderTest.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/builder/ShellBuilderTest.java
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/gshell/rapture/command/
geronimo/gshell/trunk/gshell-rapture/src/test/java/org/apache/geronimo/gshell/rapture/command/DefaultVariablesTest.java (contents, props changed)
- copied, changed from r670155, geronimo/gshell/trunk/gshell-plugin/src/test/java/org/apache/geronimo/gshell/application/DefaultVariablesTest.java
geronimo/gshell/trunk/gshell-rapture/src/test/resources/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/geronimo/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/geronimo/gshell/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/geronimo/gshell/rapture/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/geronimo/gshell/rapture/builder/
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/geronimo/gshell/rapture/builder/application1.xml (props changed)
- copied unchanged from r670155, geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/application1.xml
geronimo/gshell/trunk/gshell-rapture/src/test/resources/org/apache/geronimo/gshell/rapture/builder/settings1.xml (props changed)
- copied unchanged from r670155, geronimo/gshell/trunk/gshell-plugin/src/test/resources/org/apache/geronimo/gshell/builder/settings1.xml
Removed:
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultShellContext.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/DefaultSettingsManager.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/
geronimo/gshell/trunk/gshell-plugin/src/test/
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandCompleter.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainer.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainerFactory.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandDocumenter.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandInfo.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandLineBuilder.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandLineExecutor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandResolver.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultHistory.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultLayoutManager.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultShell.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultShellInfo.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/ExecutingVisitor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/FileHistory.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/LoggingVisitor.java
geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/VariableInterpolator.java
Modified:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellContext.java
geronimo/gshell/trunk/gshell-assembly/pom.xml
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
geronimo/gshell/trunk/gshell-cli/pom.xml
geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
geronimo/gshell/trunk/gshell-plugin/pom.xml
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
geronimo/gshell/trunk/gshell-rapture/pom.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java
geronimo/gshell/trunk/pom.xml
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=670207&r1=670206&r2=670207&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 Sat Jun 21 07:55:47 2008
@@ -20,7 +20,6 @@
package org.apache.geronimo.gshell.command;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.shell.ShellContext;
/**
* Provides commands with the context of its execution.
@@ -56,6 +55,4 @@
* @return Command runtime information; never null.
*/
CommandInfo getInfo();
-
- ShellContext getShellContext();
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResolver.java Sat Jun 21 07:55:47 2008
@@ -19,8 +19,6 @@
package org.apache.geronimo.gshell.command;
-import org.apache.geronimo.gshell.shell.ShellContext;
-
/**
* Provides support to resolve a path-name to a command instance.
*
@@ -31,11 +29,11 @@
/**
* Resolve the given path to a command instance.
*
- * @param context The current shell context.
- * @param path The path of the command to resolve.
- * @return The resolved command instance; never null.
+ * @param variables The current shell variables.
+ * @param path The path of the command to resolve.
+ * @return The resolved command instance; never null.
*
* @throws CommandException Failed to resolve command.
*/
- Command resolve(ShellContext context, String path) throws CommandException;
+ Command resolve(Variables variables, String path) throws CommandException;
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java Sat Jun 21 07:55:47 2008
@@ -19,6 +19,7 @@
package org.apache.geronimo.gshell.shell;
+import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
/**
@@ -29,6 +30,8 @@
public interface Shell
extends CommandLineExecutor
{
+ Variables getVariables();
+
/**
* Get the runtime configuration details of the shell.
*
@@ -37,13 +40,6 @@
ShellInfo getInfo();
/**
- * Get the execution details of the shell.
- *
- * @return The execution details of the shell.
- */
- ShellContext getContext();
-
- /**
* Check if the shell can be run interactivly.
*
* @return True if the shell is interactive.
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellContext.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellContext.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellContext.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellContext.java Sat Jun 21 07:55:47 2008
@@ -27,6 +27,7 @@
*
* @version $Rev$ $Date$
*/
+@Deprecated
public interface ShellContext
{
/**
Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/pom.xml Sat Jun 21 07:55:47 2008
@@ -48,7 +48,12 @@
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-cli</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-rapture</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Sat Jun 21 07:55:47 2008
@@ -45,6 +45,7 @@
</remoteRepositories>
<dependencyGroups>
+ <!--
<dependencyGroup>
<groupId>org.apache.geronimo.gshell</groupId>
<version>1.0-alpha-2-SNAPSHOT</version>
@@ -53,7 +54,8 @@
<artifactId>gshell-rapture</artifactId>
</dependency>
</dependencyGroup>
-
+ -->
+
<dependencyGroup>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<version>1.0-alpha-2-SNAPSHOT</version>
Modified: geronimo/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/pom.xml?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-cli/pom.xml Sat Jun 21 07:55:47 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-plugin</artifactId>
+ <artifactId>gshell-rapture</artifactId>
</dependency>
<dependency>
Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Sat Jun 21 07:55:47 2008
@@ -20,7 +20,6 @@
package org.apache.geronimo.gshell.cli;
import org.apache.geronimo.gshell.notification.ExitNotification;
-import org.apache.geronimo.gshell.builder.ShellBuilder;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.ansi.ANSI;
import org.apache.geronimo.gshell.application.ApplicationLocator;
@@ -31,7 +30,8 @@
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.Application;
import org.apache.geronimo.gshell.model.settings.Settings;
-import org.apache.geronimo.gshell.settings.SettingsLocator;
+import org.apache.geronimo.gshell.application.settings.SettingsLocator;
+import org.apache.geronimo.gshell.rapture.builder.ShellBuilder;
import org.codehaus.plexus.classworlds.ClassWorld;
import java.util.ArrayList;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java Sat Jun 21 07:55:47 2008
@@ -23,15 +23,7 @@
import org.apache.geronimo.gshell.ansi.Renderer;
import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.CommandAction;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerFactory;
-import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.command.CommandResolver;
-import org.apache.geronimo.gshell.command.Command;
-import org.apache.geronimo.gshell.command.CommandException;
-import org.apache.geronimo.gshell.command.CommandDocumenter;
-import org.apache.geronimo.gshell.command.CommandInfo;
+import org.apache.geronimo.gshell.command.*;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.command.annotation.Requirement;
import org.apache.geronimo.gshell.io.IO;
@@ -40,7 +32,6 @@
import org.apache.geronimo.gshell.model.layout.CommandNode;
import org.apache.geronimo.gshell.model.layout.GroupNode;
import org.apache.geronimo.gshell.model.layout.Node;
-import org.apache.geronimo.gshell.shell.ShellContext;
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +81,7 @@
displayAvailableCommands(context);
}
else {
- displayCommandManual(command, context.getShellContext());
+ displayCommandManual(context.getIo(), command, context.getVariables());
}
return Result.SUCCESS;
@@ -185,13 +176,11 @@
}
}
- private void displayCommandManual(final String path, final ShellContext context) throws CommandException {
+ private void displayCommandManual(final IO io, final String path, final Variables variables) throws CommandException {
assert path != null;
- assert context != null;
-
- IO io = context.getIo();
+ assert variables != null;
- Command command = commandResolver.resolve(context, path);
+ Command command = commandResolver.resolve(variables, path);
CommandDocumenter documenter = command.getContainer().getDocumenter();
CommandInfo info = command.getInfo();
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java Sat Jun 21 07:55:47 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.commands.builtins;
-import org.apache.geronimo.gshell.application.DefaultVariables;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandAction;
@@ -161,18 +160,10 @@
return nv;
}
- private void ensureIsIdentifier(final String name) {
- if (!DefaultVariables.isIdentifier(name)) {
- throw new RuntimeException("Invalid identifer name: " + name);
- }
- }
-
private void setProperty(final String namevalue) {
NameValue nv = parse(namevalue);
- // log.info("Setting system property: {}={}", nv.name, nv.value);
-
- ensureIsIdentifier(nv.name);
+ log.info("Setting system property: {}={}", nv.name, nv.value);
System.setProperty(nv.name, nv.value);
}
@@ -182,8 +173,6 @@
log.info("Setting variable: {}={}", nv.name, nv.value);
- ensureIsIdentifier(nv.name);
-
// Command vars always has a parent, set only makes sence when setting in parent's scope
vars.parent().set(nv.name, nv.value);
}
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java Sat Jun 21 07:55:47 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.commands.builtins;
-import org.apache.geronimo.gshell.application.DefaultVariables;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandAction;
@@ -77,25 +76,15 @@
return Result.SUCCESS;
}
- private void ensureIsIdentifier(final String name) {
- if (!DefaultVariables.isIdentifier(name)) {
- throw new RuntimeException("Invalid identifer name: " + name);
- }
- }
-
private void unsetProperty(final String name) {
log.info("Unsetting system property: {}", name);
- ensureIsIdentifier(name);
-
System.getProperties().remove(name);
}
private void unsetVariable(final Variables vars, final String name) {
log.info("Unsetting variable: {}", name);
- ensureIsIdentifier(name);
-
// Command vars always has a parent, set only makes sence when setting in parent's scope
vars.parent().unset(name);
}
Modified: geronimo/gshell/trunk/gshell-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/pom.xml?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-plugin/pom.xml Sat Jun 21 07:55:47 2008
@@ -39,16 +39,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-plexus</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-artifact</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-api</artifactId>
</dependency>
Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java Sat Jun 21 07:55:47 2008
@@ -23,7 +23,7 @@
import org.apache.geronimo.gshell.yarn.ToStringStyle;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.Application;
-import org.apache.geronimo.gshell.shell.ShellContext;
+import org.apache.geronimo.gshell.command.Variables;
/**
* Container for application configuration.
@@ -34,18 +34,11 @@
{
private IO io;
- private ShellContext context;
+ private Variables variables;
private Application application;
- private IO createIo() {
- return new IO();
- }
-
public IO getIo() {
- if (io == null) {
- io = createIo();
- }
return io;
}
@@ -53,20 +46,12 @@
this.io = io;
}
- private ShellContext createEnvironment() {
- return new DefaultShellContext(getIo());
- }
-
- public ShellContext getEnvironment() {
- if (context == null) {
- context = createEnvironment();
- }
-
- return context;
+ public Variables getVariables() {
+ return variables;
}
- public void setEnvironment(final ShellContext context) {
- this.context = context;
+ public void setVariables(final Variables variables) {
+ this.variables = variables;
}
public Application getApplication() {
Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java Sat Jun 21 07:55:47 2008
@@ -22,6 +22,7 @@
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.Application;
import org.apache.geronimo.gshell.shell.ShellContext;
+import org.apache.geronimo.gshell.command.Variables;
/**
* Encapsulates the context for an application.
@@ -32,9 +33,7 @@
{
IO getIo();
- ShellContext getEnvironment();
+ Variables getVariables();
Application getApplication();
-
- // getContainer();
}
\ No newline at end of file
Copied: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsConfiguration.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsConfiguration.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsConfiguration.java?p2=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsConfiguration.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsConfiguration.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsConfiguration.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsConfiguration.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.settings;
+package org.apache.geronimo.gshell.application.settings;
import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder;
import org.apache.geronimo.gshell.yarn.ToStringStyle;
Copied: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsLocator.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsLocator.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsLocator.java?p2=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsLocator.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsLocator.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsLocator.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsLocator.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.settings;
+package org.apache.geronimo.gshell.application.settings;
import org.apache.geronimo.gshell.model.settings.Settings;
import org.apache.geronimo.gshell.model.settings.SettingsMarshaller;
Copied: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsManager.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsManager.java?p2=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsManager.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsManager.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/SettingsManager.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/settings/SettingsManager.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.settings;
+package org.apache.geronimo.gshell.application.settings;
import org.apache.geronimo.gshell.model.settings.Settings;
Modified: geronimo/gshell/trunk/gshell-rapture/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/pom.xml?rev=670207&r1=670206&r2=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-rapture/pom.xml Sat Jun 21 07:55:47 2008
@@ -50,6 +50,11 @@
<dependency>
<groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-artifact</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
<artifactId>gshell-console</artifactId>
</dependency>
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java (from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java Sat Jun 21 07:55:47 2008
@@ -17,9 +17,14 @@
* under the License.
*/
-package org.apache.geronimo.gshell.application;
+package org.apache.geronimo.gshell.rapture.application;
+import org.apache.geronimo.gshell.application.ApplicationConfiguration;
+import org.apache.geronimo.gshell.application.ApplicationContext;
+import org.apache.geronimo.gshell.application.ApplicationManager;
+import org.apache.geronimo.gshell.application.ApplicationSecurityManager;
import org.apache.geronimo.gshell.artifact.ArtifactManager;
+import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.Application;
import org.apache.geronimo.gshell.model.common.Dependency;
@@ -29,10 +34,9 @@
import org.apache.geronimo.gshell.model.interpolate.InterpolatorSupport;
import org.apache.geronimo.gshell.model.settings.Settings;
import org.apache.geronimo.gshell.plexus.GShellPlexusContainer;
-import org.apache.geronimo.gshell.plugin.PluginCollector;
-import org.apache.geronimo.gshell.plugin.PluginDiscoverer;
-import org.apache.geronimo.gshell.settings.SettingsManager;
-import org.apache.geronimo.gshell.shell.ShellContext;
+import org.apache.geronimo.gshell.rapture.plugin.PluginCollector;
+import org.apache.geronimo.gshell.rapture.plugin.PluginDiscoverer;
+import org.apache.geronimo.gshell.application.settings.SettingsManager;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -66,11 +70,11 @@
import java.util.Set;
/**
- * Default implementation of the {@link ApplicationManager} component.
+ * Default implementation of the {@link org.apache.geronimo.gshell.application.ApplicationManager} component.
*
* @version $Rev$ $Date$
*/
-@Component(role=ApplicationManager.class)
+@Component(role= ApplicationManager.class)
public class DefaultApplicationManager
implements ApplicationManager, Contextualizable
{
@@ -124,8 +128,8 @@
return config.getIo();
}
- public ShellContext getEnvironment() {
- return config.getEnvironment();
+ public Variables getVariables() {
+ return config.getVariables();
}
public Application getApplication() {
@@ -255,21 +259,26 @@
ExclusionSetFilter filter = new ExclusionSetFilter(new String[] {
"aspectjrt",
- "plexus-classworlds",
+ "commons-jexl",
"gshell-ansi",
+ "gshell-api",
"gshell-artifact",
+ "gshell-chronos",
"gshell-cli",
"gshell-clp",
- "gshell-api",
- "log4j",
+ "gshell-console",
"gshell-i18n",
"gshell-io",
- "gshell-plugin",
+ "gshell-layout",
"gshell-model",
+ "gshell-parser",
"gshell-plexus",
+ "gshell-plugin",
+ "gshell-rapture",
"gshell-yarn",
"jcl104-over-slf4j",
"jline",
+ "log4j",
"maven-artifact",
"maven-model",
"maven-profile",
@@ -279,14 +288,16 @@
"plexus-container-default",
"plexus-interpolation",
"plexus-utils",
+ "plexus-classworlds",
"slf4j-api",
"slf4j-log4j12",
"wagon-file",
"wagon-http-lightweight",
"wagon-http-shared",
"wagon-provider-api",
+ "xbean-reflect",
"xpp3_min",
- "xstream"
+ "xstream-",
});
if (resolvedArtifacts != null && !resolvedArtifacts.isEmpty()) {
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java (from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java Sat Jun 21 07:55:47 2008
@@ -17,13 +17,15 @@
* under the License.
*/
-package org.apache.geronimo.gshell.settings;
+package org.apache.geronimo.gshell.rapture.application;
import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.model.common.RemoteRepository;
import org.apache.geronimo.gshell.model.interpolate.Interpolator;
import org.apache.geronimo.gshell.model.interpolate.InterpolatorSupport;
import org.apache.geronimo.gshell.model.settings.Settings;
+import org.apache.geronimo.gshell.application.settings.SettingsManager;
+import org.apache.geronimo.gshell.application.settings.SettingsConfiguration;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
@@ -31,11 +33,11 @@
import org.slf4j.LoggerFactory;
/**
- * Default implementation of the {@link SettingsManager} component.
+ * Default implementation of the {@link org.apache.geronimo.gshell.application.settings.SettingsManager} component.
*
* @version $Rev$ $Date$
*/
-@Component(role=SettingsManager.class)
+@Component(role= SettingsManager.class)
public class DefaultSettingsManager
implements SettingsManager
{
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java (from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java Sat Jun 21 07:55:47 2008
@@ -17,23 +17,24 @@
* under the License.
*/
-package org.apache.geronimo.gshell.builder;
+package org.apache.geronimo.gshell.rapture.builder;
import org.apache.geronimo.gshell.application.ApplicationConfiguration;
import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.artifact.monitor.ProgressSpinnerMonitor;
+import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.io.SystemOutputHijacker;
import org.apache.geronimo.gshell.model.application.Application;
import org.apache.geronimo.gshell.model.settings.Settings;
import org.apache.geronimo.gshell.plexus.GShellPlexusContainer;
import org.apache.geronimo.gshell.plexus.Slf4jLoggingManager;
-import org.apache.geronimo.gshell.settings.SettingsConfiguration;
-import org.apache.geronimo.gshell.settings.SettingsManager;
-import org.apache.geronimo.gshell.shell.ShellContext;
+import org.apache.geronimo.gshell.application.settings.SettingsConfiguration;
+import org.apache.geronimo.gshell.application.settings.SettingsManager;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.shell.ShellFactory;
-import org.apache.geronimo.gshell.io.SystemOutputHijacker;
+import org.apache.geronimo.gshell.rapture.command.DefaultVariables;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.PlexusContainerException;
@@ -120,12 +121,12 @@
applicationConfig.setIo(io);
}
- public ShellContext getEnvironment() {
- return applicationConfig.getEnvironment();
+ public Variables getVariables() {
+ return applicationConfig.getVariables();
}
- public void setEnvironment(final ShellContext context) {
- applicationConfig.setEnvironment(context);
+ public void setVariables(final Variables variables) {
+ applicationConfig.setVariables(variables);
}
public Settings getSettings() {
@@ -196,6 +197,14 @@
public Shell create() throws Exception {
log.debug("Building");
+ // Set some defaults
+ if (applicationConfig.getIo() == null) {
+ applicationConfig.setIo(new IO());
+ }
+ if (applicationConfig.getVariables() == null) {
+ applicationConfig.setVariables(new DefaultVariables());
+ }
+
// Hijack the system output streams
if (!SystemOutputHijacker.isInstalled()) {
SystemOutputHijacker.install();
@@ -207,6 +216,7 @@
// Initialize the container
getContainer();
+ log.debug("Container: {}", container);
//
// TODO: Allow someway to configure a non-interactive monitor
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java (from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandCompleter.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java&p1=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandCompleter.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandCompleter.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.rapture;
+package org.apache.geronimo.gshell.rapture.command;
import jline.Completor;
import org.apache.geronimo.gshell.command.CommandCompleter;
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandCompleter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java (from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainer.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java&p1=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainer.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainer.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.rapture;
+package org.apache.geronimo.gshell.rapture.command;
import org.apache.geronimo.gshell.clp.CommandLineProcessor;
import org.apache.geronimo.gshell.clp.Option;
@@ -48,7 +48,7 @@
*
* @version $Rev$ $Date$
*/
-@Component(role=Command.class)
+@Component(role=CommandContainer.class)
public class DefaultCommandContainer
implements CommandContainer, Contextualizable
{
@@ -56,7 +56,7 @@
private GShellPlexusContainer container;
- @Configuration("") // Just to mark what this is used for, since we have to configure a default value
+ @Configuration("")
private String commandId;
// Contextualizable
@@ -76,37 +76,28 @@
return commandId;
}
- public CommandAction getAction() {
+ private <T> T lookupComponent(final Class<T> role) {
+ assert role != null;
assert container != null;
try {
- return container.lookupComponent(CommandAction.class, commandId);
+ return container.lookupComponent(role, commandId);
}
catch (ComponentLookupException e) {
throw new RuntimeException(e);
}
}
- public CommandDocumenter getDocumenter() {
- assert container != null;
+ public CommandAction getAction() {
+ return lookupComponent(CommandAction.class);
+ }
- try {
- return container.lookupComponent(CommandDocumenter.class, commandId);
- }
- catch (ComponentLookupException e) {
- throw new RuntimeException(e);
- }
+ public CommandDocumenter getDocumenter() {
+ return lookupComponent(CommandDocumenter.class);
}
public CommandCompleter getCompleter() {
- assert container != null;
-
- try {
- return container.lookupComponent(CommandCompleter.class, commandId);
- }
- catch (ComponentLookupException e) {
- throw new RuntimeException(e);
- }
+ return lookupComponent(CommandCompleter.class);
}
public CommandResult execute(final CommandContext context) {
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java (from r670194, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainerFactory.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java&p1=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainerFactory.java&r1=670194&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandContainerFactory.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.rapture;
+package org.apache.geronimo.gshell.rapture.command;
import org.apache.geronimo.gshell.command.CommandContainer;
import org.apache.geronimo.gshell.command.CommandContainerFactory;
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java (from r670191, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandDocumenter.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java&p1=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandDocumenter.java&r1=670191&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandDocumenter.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.rapture;
+package org.apache.geronimo.gshell.rapture.command;
import org.apache.geronimo.gshell.clp.CommandLineProcessor;
import org.apache.geronimo.gshell.clp.Printer;
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandDocumenter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java (from r670155, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandInfo.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java&p1=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandInfo.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandInfo.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.rapture;
+package org.apache.geronimo.gshell.rapture.command;
import org.apache.geronimo.gshell.command.CommandInfo;
import org.apache.geronimo.gshell.model.layout.AliasNode;
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandInfo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java (from r670187, geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandResolver.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java&p1=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandResolver.java&r1=670187&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/DefaultCommandResolver.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java Sat Jun 21 07:55:47 2008
@@ -17,22 +17,14 @@
* under the License.
*/
-package org.apache.geronimo.gshell.rapture;
+package org.apache.geronimo.gshell.rapture.command;
-import org.apache.geronimo.gshell.command.Command;
-import org.apache.geronimo.gshell.command.CommandContainer;
-import org.apache.geronimo.gshell.command.CommandContainerFactory;
-import org.apache.geronimo.gshell.command.CommandInfo;
-import org.apache.geronimo.gshell.command.CommandNotFoundException;
-import org.apache.geronimo.gshell.command.CommandResolver;
-import org.apache.geronimo.gshell.command.CommandResult;
-import org.apache.geronimo.gshell.command.CommandContext;
+import org.apache.geronimo.gshell.command.*;
import org.apache.geronimo.gshell.layout.LayoutManager;
import org.apache.geronimo.gshell.layout.NotFoundException;
import org.apache.geronimo.gshell.model.layout.AliasNode;
import org.apache.geronimo.gshell.model.layout.CommandNode;
import org.apache.geronimo.gshell.model.layout.Node;
-import org.apache.geronimo.gshell.shell.ShellContext;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.slf4j.Logger;
@@ -65,15 +57,15 @@
this.containerFactory = containerFactory;
}
- public Command resolve(final ShellContext context, final String path) throws CommandNotFoundException {
- assert context != null;
+ public Command resolve(final Variables variables, final String path) throws CommandNotFoundException {
+ assert variables != null;
assert path != null;
assert layoutManager != null;
log.debug("Resolving command for path: {}", path);
- String searchPath = (String) context.getVariables().get(LayoutManager.COMMAND_PATH);
+ String searchPath = (String) variables.get(LayoutManager.COMMAND_PATH);
final Node node;
try {
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java (from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultVariables.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.application;
+package org.apache.geronimo.gshell.rapture.command;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder;
@@ -194,33 +194,4 @@
public Variables parent() {
return parent;
}
-
- //
- // FIXME: Move to some other class...
- //
-
- public static boolean isIdentifier(final String name) {
- if (name == null || name.length() == 0) {
- return false;
- }
-
- char[] chars = name.toCharArray();
-
- if (!Character.isJavaIdentifierStart(chars[0])) {
- return false;
- }
-
- /*
- FIXME: This fails for stuff like 'gshell.prompt' which we should allow
- Eventually need to get this fixed, for now just skip part checking
-
- for (int i=1; i<chars.length; i++) {
- if (!Character.isJavaIdentifierPart(chars[i])) {
- return false;
- }
- }
- */
-
- return true;
- }
}
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandActionDescriptor.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandActionDescriptor.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandActionDescriptor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin.descriptor;
+package org.apache.geronimo.gshell.rapture.descriptor;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.model.command.CommandModel;
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandCompleterDescriptor.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandCompleterDescriptor.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandCompleterDescriptor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java Sat Jun 21 07:55:47 2008
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin.descriptor;
+package org.apache.geronimo.gshell.rapture.descriptor;
import org.apache.geronimo.gshell.command.CommandCompleter;
import org.apache.geronimo.gshell.model.command.CommandModel;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.apache.geronimo.gshell.rapture.command.DefaultCommandCompleter;
/**
* Descriptor for a {@link CommandCompleter} Plexus component.
@@ -40,7 +40,7 @@
setRole(CommandCompleter.class);
setRoleHint(model.getId());
- setImplementation("org.apache.geronimo.gshell.rapture.DefaultCommandCompleter");
+ setImplementation(DefaultCommandCompleter.class);
setVersion(model.getVersion());
setIsolatedRealm(false);
setInstantiationStrategy("singleton");
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandContainerDescriptor.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandContainerDescriptor.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandContainerDescriptor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java Sat Jun 21 07:55:47 2008
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin.descriptor;
+package org.apache.geronimo.gshell.rapture.descriptor;
import org.apache.geronimo.gshell.model.command.CommandModel;
import org.apache.geronimo.gshell.command.CommandContainer;
+import org.apache.geronimo.gshell.rapture.command.DefaultCommandContainer;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
/**
@@ -40,7 +41,7 @@
setRole(CommandContainer.class);
setRoleHint(model.getId());
- setImplementation("org.apache.geronimo.gshell.rapture.DefaultCommandContainer");
+ setImplementation(DefaultCommandContainer.class);
setVersion(model.getVersion());
setIsolatedRealm(false);
setInstantiationStrategy("singleton");
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandDocumenterDescriptor.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandDocumenterDescriptor.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/CommandDocumenterDescriptor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java Sat Jun 21 07:55:47 2008
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin.descriptor;
+package org.apache.geronimo.gshell.rapture.descriptor;
import org.apache.geronimo.gshell.command.CommandDocumenter;
import org.apache.geronimo.gshell.model.command.CommandModel;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.apache.geronimo.gshell.rapture.command.DefaultCommandDocumenter;
/**
* Descriptor for a {@link CommandDocumenter} Plexus component.
@@ -40,7 +40,7 @@
setRole(CommandDocumenter.class);
setRoleHint(model.getId());
- setImplementation("org.apache.geronimo.gshell.rapture.DefaultCommandDocumenter");
+ setImplementation(DefaultCommandDocumenter.class);
setVersion(model.getVersion());
setIsolatedRealm(false);
setInstantiationStrategy("singleton");
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/ComponentDescriptorSupport.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/ComponentDescriptorSupport.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/ComponentDescriptorSupport.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin.descriptor;
+package org.apache.geronimo.gshell.rapture.descriptor;
import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder;
import org.apache.geronimo.gshell.yarn.ToStringStyle;
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java (from r670206, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/PluginDescriptor.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/PluginDescriptor.java&r1=670206&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/descriptor/PluginDescriptor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java Sat Jun 21 07:55:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin.descriptor;
+package org.apache.geronimo.gshell.rapture.descriptor;
import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder;
import org.apache.geronimo.gshell.yarn.ToStringStyle;
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java (from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java Sat Jun 21 07:55:47 2008
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin;
+package org.apache.geronimo.gshell.rapture.plugin;
import org.apache.geronimo.gshell.model.command.CommandModel;
import org.apache.geronimo.gshell.model.plugin.Plugin;
-import org.apache.geronimo.gshell.plugin.descriptor.PluginDescriptor;
+import org.apache.geronimo.gshell.rapture.descriptor.PluginDescriptor;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener;
@@ -57,9 +57,9 @@
assert event != null;
ComponentSetDescriptor descriptor = event.getComponentSetDescriptor();
-
+
log.trace("Discovered: {}", descriptor);
-
+
if (descriptor instanceof PluginDescriptor) {
collect((PluginDescriptor)descriptor);
}
@@ -75,7 +75,7 @@
for (CommandModel model : plugin.getCommands()) {
log.debug("Found command: {}", model.getId());
log.trace("Command model: {}", model);
-
+
commands.put(model.getId(), model);
}
Copied: geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java (from r670155, geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginDiscoverer.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java?p2=geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java&p1=geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginDiscoverer.java&r1=670155&r2=670207&rev=670207&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/plugin/PluginDiscoverer.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java Sat Jun 21 07:55:47 2008
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.geronimo.gshell.plugin;
+package org.apache.geronimo.gshell.rapture.plugin;
import org.apache.geronimo.gshell.model.plugin.Plugin;
import org.apache.geronimo.gshell.model.plugin.PluginMarshaller;
-import org.apache.geronimo.gshell.plugin.descriptor.PluginDescriptor;
+import org.apache.geronimo.gshell.rapture.descriptor.PluginDescriptor;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.discovery.AbstractComponentDiscoverer;
import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
@@ -62,10 +62,10 @@
log.debug("Discovered plugin: {}", plugin.getId());
log.trace("Plugin model: {}", plugin);
-
+
PluginDescriptor descriptor = new PluginDescriptor(plugin);
descriptor.setSource(source);
-
+
return descriptor;
}
}
\ No newline at end of file