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/10/19 17:36:18 UTC
svn commit: r706033 [1/2] - in /geronimo/gshell/trunk:
gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/
gshell-commands/gshell-admin/src/main/resources/META-INF/spring/
gshell-commands/gshell-bsf/src/main/java/org/a...
Author: jdillon
Date: Sun Oct 19 08:36:15 2008
New Revision: 706033
URL: http://svn.apache.org/viewvc?rev=706033&view=rev
Log:
Removed use of @Autowire annotation, its too costly, wire up everything manually
Removed:
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/org/
Modified:
geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java
geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.java
geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/BSFManagerFactoryBean.java
geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java
geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/java/org/apache/geronimo/gshell/commands/log4j/ConfigureAction.java
geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CatAction.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FindAction.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/GrepAction.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VfsActionSupport.java
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ConnectHandler.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/LoginHandler.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/LocalFileProvider.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileNameParser.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataInstaller.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurer.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileObjectNameCompleter.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileSystemAccessImpl.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ConfigurableFileSystemManager.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileOperationProviderConfigurer.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileProviderConfigurer.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurer.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurerSupport.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerFactoryBean.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/java/org/apache/geronimo/gshell/xstore/XStoreImpl.java
geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationFactoryBean.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ApplicationScope.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ShellScope.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/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/AliasCommand.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatefulCommand.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatelessCommand.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/AliasNameCompleter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandNameCompleter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandsCompleter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/VariableNameCompleter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/meta/RuntimeContent.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.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/plugin/PluginLoadedEvent.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginMetaMapper.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/bundle/CommandBundle.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasMetaMapper.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasRegistryImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandMetaMapper.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.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/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java Sun Oct 19 08:36:15 2008
@@ -19,15 +19,14 @@
package org.apache.geronimo.gshell.commands.admin;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.application.model.Artifact;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Install a GShell plugin.
@@ -39,8 +38,7 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private PluginManager pluginManager;
+ private final PluginManager pluginManager;
@Option(name="-g", aliases={"--groupId"}, argumentRequired=true, required=true)
private String groupId;
@@ -50,6 +48,11 @@
@Option(name="-v", aliases={"--version"}, argumentRequired=true, required=true)
private String version;
+
+ public InstallPluginAction(final PluginManager pluginManager) {
+ assert pluginManager != null;
+ this.pluginManager = pluginManager;
+ }
public Object execute(final CommandContext context) throws Exception {
assert context != null;
@@ -61,8 +64,7 @@
artifact.setVersion(version);
io.info("Loading plugin: {}", artifact.getId());
-
- assert pluginManager != null;
+
log.debug("Plugin manager: {}", pluginManager);
try {
Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/ListPluginsAction.java Sun Oct 19 08:36:15 2008
@@ -19,14 +19,13 @@
package org.apache.geronimo.gshell.commands.admin;
+import org.apache.geronimo.gshell.application.plugin.Plugin;
+import org.apache.geronimo.gshell.application.plugin.PluginManager;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.application.plugin.PluginManager;
-import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.io.IO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Set;
@@ -40,14 +39,17 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private PluginManager pluginManager;
+ private final PluginManager pluginManager;
+
+ public ListPluginsAction(final PluginManager pluginManager) {
+ assert pluginManager != null;
+ this.pluginManager = pluginManager;
+ }
public Object execute(final CommandContext context) throws Exception {
assert context != null;
IO io = context.getIo();
- assert pluginManager != null;
log.debug("Plugin manager: {}", pluginManager);
Set<Plugin> plugins = pluginManager.getPlugins();
Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -30,11 +30,15 @@
<gshell:plugin name="gshell-admin">
<gshell:command-bundle name="default">
<gshell:command name="admin/list-plugins" type="stateless">
- <gshell:action class="org.apache.geronimo.gshell.commands.admin.ListPluginsAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.admin.ListPluginsAction">
+ <constructor-arg ref="pluginManager"/>
+ </gshell:action>
</gshell:command>
<gshell:command name="admin/install-plugin">
- <gshell:action class="org.apache.geronimo.gshell.commands.admin.InstallPluginAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.admin.InstallPluginAction">
+ <constructor-arg ref="pluginManager"/>
+ </gshell:action>
</gshell:command>
</gshell:command-bundle>
</gshell:plugin>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/BSFManagerFactoryBean.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/BSFManagerFactoryBean.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/BSFManagerFactoryBean.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/BSFManagerFactoryBean.java Sun Oct 19 08:36:15 2008
@@ -19,10 +19,10 @@
package org.apache.geronimo.gshell.commands.bsf;
-import org.springframework.beans.factory.FactoryBean;
+import org.apache.bsf.BSFManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.bsf.BSFManager;
+import org.springframework.beans.factory.FactoryBean;
import java.util.Map;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptAction.java Sun Oct 19 08:36:15 2008
@@ -23,7 +23,6 @@
import org.apache.bsf.BSFException;
import org.apache.bsf.BSFManager;
import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileType;
import org.apache.commons.vfs.FileUtil;
import org.apache.geronimo.gshell.ansi.Code;
import org.apache.geronimo.gshell.ansi.Renderer;
@@ -39,7 +38,6 @@
import org.apache.geronimo.gshell.vfs.FileSystemAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Provides generic scripting language integration via <a href="http://http://jakarta.apache.org/bsf">BSF</a>.
@@ -51,11 +49,9 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private BSFManager manager;
+ private final BSFManager manager;
- @Autowired
- private FileSystemAccess fileSystemAccess;
+ private final FileSystemAccess fileSystemAccess;
private BeanContainer container;
@@ -78,6 +74,13 @@
@Argument
private String path;
+ public ScriptAction(final BSFManager manager, final FileSystemAccess fileSystemAccess) {
+ assert manager != null;
+ this.manager = manager;
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
+
public void setBeanContainer(final BeanContainer container) {
assert container != null;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -30,7 +30,10 @@
<gshell:plugin name="gshell-bsf">
<gshell:command-bundle name="default">
<gshell:command name="bsf/script">
- <gshell:action class="org.apache.geronimo.gshell.commands.bsf.ScriptAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.bsf.ScriptAction">
+ <constructor-arg ref="bsfManager"/>
+ <constructor-arg ref="fileSystemAccess"/>
+ </gshell:action>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java Sun Oct 19 08:36:15 2008
@@ -21,12 +21,11 @@
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ApplicationManager;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.Branding;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.application.model.ApplicationModel;
-import org.apache.geronimo.gshell.application.model.Branding;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Display information about the current GShell application.
@@ -36,14 +35,17 @@
public class AboutAction
implements CommandAction
{
- @Autowired
- private ApplicationManager applicationManager;
-
+ private final ApplicationManager applicationManager;
+
+ public AboutAction(final ApplicationManager applicationManager) {
+ assert applicationManager != null;
+ this.applicationManager = applicationManager;
+ }
+
public Object execute(CommandContext context) throws Exception {
assert context != null;
IO io = context.getIo();
- assert applicationManager != null;
Application app = applicationManager.getApplication();
ApplicationModel model = app.getModel();
Branding branding = app.getModel().getBranding();
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java Sun Oct 19 08:36:15 2008
@@ -29,7 +29,6 @@
import org.apache.geronimo.gshell.registry.AliasRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
@@ -43,8 +42,7 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private AliasRegistry aliasRegistry;
+ private final AliasRegistry aliasRegistry;
@Argument(index=0)
private String name;
@@ -52,6 +50,11 @@
@Argument(index=1)
private String target;
+ public AliasAction(final AliasRegistry aliasRegistry) {
+ assert aliasRegistry != null;
+ this.aliasRegistry = aliasRegistry;
+ }
+
public Object execute(final CommandContext context) throws Exception {
assert context != null;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java Sun Oct 19 08:36:15 2008
@@ -25,8 +25,8 @@
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
* A simple command to print all arguments to the commands standard output.
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java Sun Oct 19 08:36:15 2008
@@ -30,7 +30,6 @@
import org.apache.geronimo.gshell.registry.CommandResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
@@ -44,12 +43,16 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private CommandResolver commandResolver;
+ private final CommandResolver commandResolver;
@Argument
private String commandName;
+ public HelpAction(final CommandResolver commandResolver) {
+ assert commandResolver != null;
+ this.commandResolver = commandResolver;
+ }
+
public Object execute(final CommandContext context) throws Exception {
assert context != null;
IO io = context.getIo();
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java Sun Oct 19 08:36:15 2008
@@ -30,7 +30,6 @@
import org.apache.geronimo.gshell.vfs.FileSystemAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -45,15 +44,20 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private CommandLineExecutor executor;
+ private final CommandLineExecutor executor;
- @Autowired
- private FileSystemAccess fileSystemAccess;
+ private final FileSystemAccess fileSystemAccess;
@Argument(required=true)
private String path;
+ public SourceAction(final CommandLineExecutor executor, final FileSystemAccess fileSystemAccess) {
+ assert executor != null;
+ this.executor = executor;
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
+
public Object execute(final CommandContext context) throws Exception {
assert context != null;
IO io = context.getIo();
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java Sun Oct 19 08:36:15 2008
@@ -27,7 +27,6 @@
import org.apache.geronimo.gshell.registry.NoSuchAliasException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Undefine an alias.
@@ -39,12 +38,16 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private AliasRegistry aliasRegistry;
+ private final AliasRegistry aliasRegistry;
@Argument(index=0, required=true)
private String name;
+ public UnaliasAction(final AliasRegistry aliasRegistry) {
+ assert aliasRegistry != null;
+ this.aliasRegistry = aliasRegistry;
+ }
+
public Object execute(final CommandContext context) {
assert context != null;
IO io = context.getIo();
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=706033&r1=706032&r2=706033&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 Sun Oct 19 08:36:15 2008
@@ -30,11 +30,15 @@
<gshell:plugin name="gshell-builtins">
<gshell:command-bundle name="default">
<gshell:command name="about">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AboutAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AboutAction">
+ <constructor-arg ref="applicationManager"/>
+ </gshell:action>
</gshell:command>
<gshell:command name="help">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.HelpAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtins.HelpAction">
+ <constructor-arg ref="commandResolver"/>
+ </gshell:action>
<gshell:completers>
<bean class="org.apache.geronimo.gshell.console.completer.AggregateCompleter">
<constructor-arg>
@@ -69,7 +73,10 @@
</gshell:command>
<gshell:command name="source">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.SourceAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtins.SourceAction">
+ <constructor-arg ref="commandLineExecutor"/>
+ <constructor-arg ref="fileSystemAccess"/>
+ </gshell:action>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -83,17 +90,21 @@
<gshell:command name="unset">
<gshell:action class="org.apache.geronimo.gshell.commands.builtins.UnsetAction"/>
<gshell:completers>
- <bean class="org.apache.geronimo.gshell.wisdom.completer.VariableNameCompleter"/>
+ <ref bean="variableNameCompleter"/>
<null/>
</gshell:completers>
</gshell:command>
<gshell:command name="alias">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AliasAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AliasAction">
+ <constructor-arg ref="aliasRegistry"/>
+ </gshell:action>
</gshell:command>
<gshell:command name="unalias">
- <gshell:action class="org.apache.geronimo.gshell.commands.builtins.UnaliasAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.builtins.UnaliasAction">
+ <constructor-arg ref="aliasRegistry"/>
+ </gshell:action>
<gshell:completers>
<ref bean="aliasNameCompleter"/>
<null/>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/java/org/apache/geronimo/gshell/commands/log4j/ConfigureAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/java/org/apache/geronimo/gshell/commands/log4j/ConfigureAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/java/org/apache/geronimo/gshell/commands/log4j/ConfigureAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/java/org/apache/geronimo/gshell/commands/log4j/ConfigureAction.java Sun Oct 19 08:36:15 2008
@@ -34,7 +34,6 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.File;
@@ -49,12 +48,16 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private FileSystemAccess fileSystemAccess;
+ private final FileSystemAccess fileSystemAccess;
@Argument
private String path;
+ public ConfigureAction(final FileSystemAccess fileSystemAccess) {
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
+
public Object execute(final CommandContext context) throws Exception {
assert context != null;
IO io = context.getIo();
Modified: geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -46,7 +46,9 @@
</gshell:command>
<gshell:command name="log4j/configure">
- <gshell:action class="org.apache.geronimo.gshell.commands.log4j.ConfigureAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.log4j.ConfigureAction">
+ <constructor-arg ref="fileSystemAccess"/>
+ </gshell:action>
</gshell:command>
</gshell:command-bundle>
</gshell:plugin>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CatAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CatAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CatAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CatAction.java Sun Oct 19 08:36:15 2008
@@ -25,8 +25,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.Closer;
+import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.vfs.FileObjects;
import java.io.BufferedReader;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java Sun Oct 19 08:36:15 2008
@@ -19,20 +19,20 @@
package org.apache.geronimo.gshell.commands.vfs;
-import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.vfs.FileObjects;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileType;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileContentInfo;
+import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileType;
+import org.apache.geronimo.gshell.clp.Argument;
+import org.apache.geronimo.gshell.command.CommandContext;
+import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.vfs.FileObjects;
+import java.security.cert.Certificate;
import java.text.DateFormat;
import java.util.Date;
import java.util.Map;
-import java.security.cert.Certificate;
/**
* Display information about a file.
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FindAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FindAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FindAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FindAction.java Sun Oct 19 08:36:15 2008
@@ -28,8 +28,8 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.vfs.selector.AggregateFileSelector;
import org.apache.geronimo.gshell.vfs.FileObjects;
+import org.apache.geronimo.gshell.vfs.selector.AggregateFileSelector;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/GrepAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/GrepAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/GrepAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/GrepAction.java Sun Oct 19 08:36:15 2008
@@ -23,8 +23,8 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.Closer;
+import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.vfs.FileObjects;
import org.apache.oro.text.MatchAction;
import org.apache.oro.text.MatchActionInfo;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/ListDirectoryAction.java Sun Oct 19 08:36:15 2008
@@ -22,10 +22,10 @@
import jline.ConsoleReader;
import org.apache.commons.vfs.FileFilter;
import org.apache.commons.vfs.FileFilterSelector;
+import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSelectInfo;
import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileName;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandContext;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VfsActionSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VfsActionSupport.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VfsActionSupport.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/VfsActionSupport.java Sun Oct 19 08:36:15 2008
@@ -23,12 +23,12 @@
import org.apache.commons.vfs.FileSystemException;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.vfs.FileSystemAccess;
-import org.apache.geronimo.gshell.vfs.FileObjects;
import org.apache.geronimo.gshell.notification.FailureNotification;
+import org.apache.geronimo.gshell.vfs.FileObjects;
+import org.apache.geronimo.gshell.vfs.FileSystemAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
/**
* Support for VFS command actions.
@@ -40,9 +40,14 @@
{
protected final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
private FileSystemAccess fileSystemAccess;
+ @Required
+ public void setFileSystemAccess(final FileSystemAccess fileSystemAccess) {
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
+
protected FileSystemAccess getFileSystemAccess() {
assert fileSystemAccess != null;
return fileSystemAccess;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -27,10 +27,14 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://gshell.org/schema/wisdom-gshell http://gshell.org/schema/wisdom-gshell/wisdom-gshell.xsd">
+ <bean id="vfsCommandActionTemplate" abstract="true">
+ <property name="fileSystemAccess" ref="fileSystemAccess"/>
+ </bean>
+
<gshell:plugin name="gshell-vfs">
<gshell:command-bundle name="default">
<gshell:command name="cd">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ChangeDirectoryAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ChangeDirectoryAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -38,11 +42,11 @@
</gshell:command>
<gshell:command name="pwd" type="stateless">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CurrentDirectoryAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CurrentDirectoryAction" parent="vfsCommandActionTemplate"/>
</gshell:command>
<gshell:command name="ls">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ListDirectoryAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ListDirectoryAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -52,7 +56,7 @@
<gshell:link name="dir" target="ls"/>
<gshell:command name="cp">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CopyAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CopyAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<ref bean="fileObjectNameCompleter"/>
@@ -63,7 +67,7 @@
<gshell:link name="copy" target="cp"/>
<gshell:command name="rm">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.RemoveAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.RemoveAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -73,7 +77,7 @@
<gshell:link name="del" target="rm"/>
<gshell:command name="cat">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CatAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CatAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -81,7 +85,7 @@
</gshell:command>
<gshell:command name="edit">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.EditAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.EditAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -89,7 +93,7 @@
</gshell:command>
<gshell:command name="touch">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.TouchAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.TouchAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -97,7 +101,7 @@
</gshell:command>
<gshell:command name="fileinfo">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FileInfoAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FileInfoAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -105,7 +109,7 @@
</gshell:command>
<gshell:command name="find">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FindAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FindAction" parent="vfsCommandActionTemplate"/>
<gshell:completers>
<ref bean="fileObjectNameCompleter"/>
<null/>
@@ -113,7 +117,7 @@
</gshell:command>
<gshell:command name="grep">
- <gshell:action class="org.apache.geronimo.gshell.commands.vfs.GrepAction"/>
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.GrepAction" parent="vfsCommandActionTemplate"/>
</gshell:command>
</gshell:command-bundle>
</gshell:plugin>
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java Sun Oct 19 08:36:15 2008
@@ -21,13 +21,13 @@
import org.apache.geronimo.gshell.remote.client.handler.ClientMessageHandler;
import org.apache.geronimo.gshell.remote.client.handler.ClientSessionContext;
-import org.apache.geronimo.gshell.security.crypto.CryptoContext;
import org.apache.geronimo.gshell.remote.message.CloseShellMessage;
import org.apache.geronimo.gshell.remote.message.ConnectMessage;
import org.apache.geronimo.gshell.remote.message.EchoMessage;
import org.apache.geronimo.gshell.remote.message.ExecuteMessage;
import org.apache.geronimo.gshell.remote.message.LoginMessage;
import org.apache.geronimo.gshell.remote.message.OpenShellMessage;
+import org.apache.geronimo.gshell.security.crypto.CryptoContext;
import org.apache.geronimo.gshell.whisper.message.Message;
import org.apache.geronimo.gshell.whisper.message.MessageHandler;
import org.apache.geronimo.gshell.whisper.transport.Session;
@@ -38,7 +38,6 @@
import org.apache.mina.handler.demux.DemuxingIoHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.security.auth.login.LoginException;
import java.io.InputStream;
@@ -55,24 +54,16 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private CryptoContext crypto;
+ private final CryptoContext crypto;
- @Autowired
- private TransportFactoryLocator locator;
+ private final TransportFactoryLocator locator;
- private List<ClientMessageHandler> handlers;
+ private final List<ClientMessageHandler> handlers;
private Transport transport;
private Session session;
- public RshClient(final List<ClientMessageHandler> handlers) {
- assert handlers != null;
-
- this.handlers = handlers;
- }
-
public RshClient(final CryptoContext crypto, final TransportFactoryLocator locator, final List<ClientMessageHandler> handlers) {
assert crypto != null;
assert locator != null;
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -26,6 +26,8 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.geronimo.gshell.remote.client.RshClient" scope="prototype">
+ <constructor-arg ref="cryptoContext"/>
+ <constructor-arg ref="transportFactoryLocatory"/>
<constructor-arg>
<list>
<bean class="org.apache.geronimo.gshell.remote.client.handler.EchoHandler"/>
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java Sun Oct 19 08:36:15 2008
@@ -20,11 +20,10 @@
package org.apache.geronimo.gshell.remote.server;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
-import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.shell.ShellContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Provides the server-side encapsulation of the basic shell bits to allow remote clients to invoke commands.
@@ -36,12 +35,14 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private CommandLineExecutor executor;
+ private final CommandLineExecutor executor;
private boolean opened = true;
- public RemoteShellImpl() {}
+ public RemoteShellImpl(final CommandLineExecutor executor) {
+ assert executor != null;
+ this.executor = executor;
+ }
private void ensureOpened() {
if (!opened) {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java Sun Oct 19 08:36:15 2008
@@ -32,7 +32,6 @@
import org.apache.mina.handler.demux.DemuxingIoHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.net.URI;
import java.util.List;
@@ -47,19 +46,20 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private TimeoutManager timeoutManager;
+ private final TimeoutManager timeoutManager;
- @Autowired
- private TransportFactoryLocator locator;
+ private final TransportFactoryLocator locator;
- private List<ServerMessageHandler> handlers;
+ private final List<ServerMessageHandler> handlers;
private TransportServer server;
- public RshServer(final List<ServerMessageHandler> handlers) {
+ public RshServer(final TimeoutManager timeoutManager, final TransportFactoryLocator locator, final List<ServerMessageHandler> handlers) {
+ assert timeoutManager != null;
+ this.timeoutManager = timeoutManager;
+ assert locator != null;
+ this.locator = locator;
assert handlers != null;
-
this.handlers = handlers;
}
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ConnectHandler.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ConnectHandler.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ConnectHandler.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ConnectHandler.java Sun Oct 19 08:36:15 2008
@@ -19,12 +19,11 @@
package org.apache.geronimo.gshell.remote.server.handler;
-import org.apache.geronimo.gshell.security.crypto.CryptoContext;
import org.apache.geronimo.gshell.remote.message.ConnectMessage;
import org.apache.geronimo.gshell.remote.server.RshServer;
import org.apache.geronimo.gshell.remote.server.timeout.TimeoutManager;
+import org.apache.geronimo.gshell.security.crypto.CryptoContext;
import org.apache.geronimo.gshell.whisper.transport.Session;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Server handler for {@link ConnectMessage} messages.
@@ -34,14 +33,16 @@
public class ConnectHandler
extends ServerMessageHandlerSupport<ConnectMessage>
{
- @Autowired
- private CryptoContext crypto;
+ private final CryptoContext crypto;
- @Autowired
- private TimeoutManager timeoutManager;
+ private final TimeoutManager timeoutManager;
- public ConnectHandler() {
+ public ConnectHandler(final CryptoContext crypto, final TimeoutManager timeoutManager) {
super(ConnectMessage.class);
+ assert crypto != null;
+ this.crypto = crypto;
+ assert timeoutManager != null;
+ this.timeoutManager = timeoutManager;
}
public void handle(final Session session, final ServerSessionContext context, final ConnectMessage message) throws Exception {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/LoginHandler.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/LoginHandler.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/LoginHandler.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/LoginHandler.java Sun Oct 19 08:36:15 2008
@@ -22,7 +22,6 @@
import org.apache.geronimo.gshell.remote.message.LoginMessage;
import org.apache.geronimo.gshell.remote.server.timeout.TimeoutManager;
import org.apache.geronimo.gshell.whisper.transport.Session;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.UUID;
@@ -34,11 +33,12 @@
public class LoginHandler
extends ServerMessageHandlerSupport<LoginMessage>
{
- @Autowired
- private TimeoutManager timeoutManager;
+ private final TimeoutManager timeoutManager;
- public LoginHandler() {
+ public LoginHandler(final TimeoutManager timeoutManager) {
super(LoginMessage.class);
+ assert timeoutManager != null;
+ this.timeoutManager = timeoutManager;
}
public void handle(final Session session, final ServerSessionContext context, final LoginMessage message) throws Exception {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -28,10 +28,17 @@
<bean id="timeoutManager" class="org.apache.geronimo.gshell.remote.server.timeout.TimeoutManagerImpl" lazy-init="true"/>
<bean id="rshServer" class="org.apache.geronimo.gshell.remote.server.RshServer" scope="prototype">
+ <constructor-arg ref="timeoutManager"/>
+ <constructor-arg ref="transportFactoryLocator"/>
<constructor-arg>
<list>
- <bean class="org.apache.geronimo.gshell.remote.server.handler.ConnectHandler"/>
- <bean class="org.apache.geronimo.gshell.remote.server.handler.LoginHandler"/>
+ <bean class="org.apache.geronimo.gshell.remote.server.handler.ConnectHandler">
+ <constructor-arg ref="cryptoContext"/>
+ <constructor-arg ref="timeoutManager"/>
+ </bean>
+ <bean class="org.apache.geronimo.gshell.remote.server.handler.LoginHandler">
+ <constructor-arg ref="timeoutManager"/>
+ </bean>
<bean class="org.apache.geronimo.gshell.remote.server.handler.OpenShellHandler"/>
<bean class="org.apache.geronimo.gshell.remote.server.handler.ExecuteHandler"/>
<bean class="org.apache.geronimo.gshell.remote.server.handler.CloseShellHandler"/>
@@ -40,6 +47,8 @@
</constructor-arg>
</bean>
- <bean id="remoteShell" class="org.apache.geronimo.gshell.remote.server.RemoteShellImpl" scope="prototype"/>
+ <bean id="remoteShell" class="org.apache.geronimo.gshell.remote.server.RemoteShellImpl" scope="prototype">
+ <constructor-arg ref="commandLineExecutor"/>
+ </bean>
</beans>
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java Sun Oct 19 08:36:15 2008
@@ -26,7 +26,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
import java.net.URL;
import java.util.Arrays;
@@ -69,7 +68,8 @@
context.addBeanPostProcessor(new BeanContainerAwareProcessor(this));
// Hook up annotation processing
- context.addBeanPostProcessor(new AutowiredAnnotationBeanPostProcessor());
+ // context.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
+ // context.addBeanPostProcessor(new AutowiredAnnotationBeanPostProcessor());
context.addBeanPostProcessor(new LifecycleProcessor());
// Add automatic trace logging of loaded beans
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/LocalFileProvider.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/LocalFileProvider.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/LocalFileProvider.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/LocalFileProvider.java Sun Oct 19 08:36:15 2008
@@ -19,11 +19,11 @@
package org.apache.geronimo.gshell.vfs.provider.local;
-import org.apache.commons.vfs.provider.local.LocalFileName;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileSystem;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemOptions;
+import org.apache.commons.vfs.provider.local.LocalFileName;
/**
* Custom VFS local file provider.
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -25,6 +25,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="file"/>
<property name="provider">
<bean class="org.apache.geronimo.gshell.vfs.provider.local.LocalFileProvider"/>
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileNameParser.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileNameParser.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileNameParser.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileNameParser.java Sun Oct 19 08:36:15 2008
@@ -20,8 +20,8 @@
package org.apache.geronimo.gshell.vfs.provider.meta;
import org.apache.commons.vfs.FileName;
-import org.apache.commons.vfs.FileType;
import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileType;
import org.apache.commons.vfs.provider.AbstractFileNameParser;
import org.apache.commons.vfs.provider.UriParser;
import org.apache.commons.vfs.provider.VfsComponentContext;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java Sun Oct 19 08:36:15 2008
@@ -19,16 +19,14 @@
package org.apache.geronimo.gshell.vfs.provider.meta;
+import org.apache.commons.vfs.FileContentInfoFactory;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileType;
-import org.apache.commons.vfs.FileContent;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileContentInfoFactory;
import org.apache.commons.vfs.provider.AbstractFileObject;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
-import java.io.InputStream;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.util.Map;
/**
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java Sun Oct 19 08:36:15 2008
@@ -28,7 +28,6 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Arrays;
import java.util.Collection;
@@ -54,10 +53,11 @@
Capability.URI
));
- @Autowired
- private MetaDataRegistry registry;
+ private final MetaDataRegistry registry;
- public MetaFileProvider() {
+ public MetaFileProvider(final MetaDataRegistry registry) {
+ assert registry != null;
+ this.registry = registry;
setFileNameParser(new MetaFileNameParser());
}
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java Sun Oct 19 08:36:15 2008
@@ -19,12 +19,12 @@
package org.apache.geronimo.gshell.vfs.provider.meta;
+import org.apache.commons.vfs.FileContentInfoFactory;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemOptions;
import org.apache.commons.vfs.FileType;
-import org.apache.commons.vfs.FileContentInfoFactory;
import org.apache.commons.vfs.provider.AbstractFileSystem;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataInstaller.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataInstaller.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataInstaller.java Sun Oct 19 08:36:15 2008
@@ -19,10 +19,9 @@
package org.apache.geronimo.gshell.vfs.provider.meta.data.support;
-import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataContent;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import javax.annotation.PostConstruct;
import java.util.Map;
@@ -34,11 +33,15 @@
*/
public class MetaDataInstaller
{
- @Autowired
- private MetaDataRegistry metaRegistry;
+ private final MetaDataRegistry metaRegistry;
private Map<String,MetaDataContent> contentNodes;
+ public MetaDataInstaller(final MetaDataRegistry metaRegistry) {
+ assert metaRegistry != null;
+ this.metaRegistry = metaRegistry;
+ }
+
public void setContentNodes(final Map<String, MetaDataContent> nodes) {
this.contentNodes = nodes;
}
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurer.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurer.java Sun Oct 19 08:36:15 2008
@@ -23,9 +23,9 @@
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileType;
import org.apache.geronimo.gshell.vfs.provider.meta.MetaFileNameParser;
-import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataContent;
+import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -27,9 +27,12 @@
<bean id="metaDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistryImpl"/>
<bean id="metaFileProviderConfigurer" class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="meta"/>
<property name="provider">
- <bean class="org.apache.geronimo.gshell.vfs.provider.meta.MetaFileProvider"/>
+ <bean class="org.apache.geronimo.gshell.vfs.provider.meta.MetaFileProvider">
+ <constructor-arg ref="metaDataRegistry"/>
+ </bean>
</property>
</bean>
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -32,6 +32,7 @@
<!-- ZIP -->
<bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="zip"/>
<property name="provider">
<bean class="org.apache.geronimo.gshell.vfs.provider.truezip.TruezipFileProvider"/>
@@ -39,11 +40,13 @@
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.ExtensionMapConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="extension" value="zip"/>
<property name="scheme" value="zip"/>
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.MimeTypeMapConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="mimeType" value="application/zip"/>
<property name="scheme" value="zip"/>
</bean>
@@ -51,6 +54,7 @@
<!-- TAR -->
<bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="tar"/>
<property name="provider">
<bean class="org.apache.geronimo.gshell.vfs.provider.truezip.TruezipFileProvider"/>
@@ -58,11 +62,13 @@
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.ExtensionMapConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="extension" value="tar"/>
<property name="scheme" value="tar"/>
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.MimeTypeMapConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="mimeType" value="application/x-tar"/>
<property name="scheme" value="tar"/>
</bean>
@@ -70,6 +76,7 @@
<!-- JAR -->
<bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="jar"/>
<property name="provider">
<bean class="org.apache.geronimo.gshell.vfs.provider.truezip.TruezipFileProvider"/>
@@ -77,11 +84,13 @@
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.ExtensionMapConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="extension" value="jar"/>
<property name="scheme" value="jar"/>
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.MimeTypeMapConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="mimeType" value="application/jar"/>
<property name="scheme" value="jar"/>
</bean>
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileObjectNameCompleter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileObjectNameCompleter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileObjectNameCompleter.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileObjectNameCompleter.java Sun Oct 19 08:36:15 2008
@@ -29,7 +29,6 @@
import org.apache.commons.vfs.FileType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collections;
import java.util.List;
@@ -46,8 +45,12 @@
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private FileSystemAccess fileSystemAccess;
+ private final FileSystemAccess fileSystemAccess;
+
+ public FileObjectNameCompleter(final FileSystemAccess fileSystemAccess) {
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
public int complete(final String buffer, final int cursor, final List candidates) {
// buffer may be null
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileSystemAccessImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileSystemAccessImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileSystemAccessImpl.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/FileSystemAccessImpl.java Sun Oct 19 08:36:15 2008
@@ -26,7 +26,6 @@
import org.apache.geronimo.gshell.command.Variables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* {@link FileSystemAccess} component.
@@ -38,11 +37,16 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private ApplicationManager applicationManager;
+ private final ApplicationManager applicationManager;
- @Autowired
- private FileSystemManager fileSystemManager;
+ private final FileSystemManager fileSystemManager;
+
+ public FileSystemAccessImpl(final ApplicationManager applicationManager, final FileSystemManager fileSystemManager) {
+ assert applicationManager != null;
+ this.applicationManager = applicationManager;
+ assert fileSystemManager != null;
+ this.fileSystemManager = fileSystemManager;
+ }
public FileSystemManager getManager() {
assert fileSystemManager != null;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ConfigurableFileSystemManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ConfigurableFileSystemManager.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ConfigurableFileSystemManager.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ConfigurableFileSystemManager.java Sun Oct 19 08:36:15 2008
@@ -19,9 +19,9 @@
package org.apache.geronimo.gshell.vfs.config;
-import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.NameScope;
import org.apache.commons.vfs.impl.DefaultFileSystemManager;
import org.slf4j.Logger;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileOperationProviderConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileOperationProviderConfigurer.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileOperationProviderConfigurer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileOperationProviderConfigurer.java Sun Oct 19 08:36:15 2008
@@ -23,8 +23,8 @@
import org.apache.commons.vfs.operations.FileOperationProvider;
import javax.annotation.PostConstruct;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* Configures a {@link FileOperationProvider}.
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileProviderConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileProviderConfigurer.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileProviderConfigurer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileProviderConfigurer.java Sun Oct 19 08:36:15 2008
@@ -23,8 +23,8 @@
import org.apache.commons.vfs.provider.FileProvider;
import javax.annotation.PostConstruct;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* Configures a {@link FileProvider}.