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 [2/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...
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurer.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/FileSystemManagerConfigurer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurer.java Sun Oct 19 08:36:15 2008
@@ -22,7 +22,6 @@
import org.apache.commons.vfs.FileSystemManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
@@ -35,8 +34,7 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private ConfigurableFileSystemManager fileSystemManager;
+ private final ConfigurableFileSystemManager fileSystemManager;
// TODO: Maybe add a provider configurer, which will support mapping extentions, mime-tyeps for a single provider?
@@ -48,6 +46,11 @@
// mime-types
+ public FileSystemManagerConfigurer(final ConfigurableFileSystemManager fileSystemManager) {
+ assert fileSystemManager != null;
+ this.fileSystemManager = fileSystemManager;
+ }
+
@PostConstruct
public void init() {
assert fileSystemManager != null;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurerSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurerSupport.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/FileSystemManagerConfigurerSupport.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerConfigurerSupport.java Sun Oct 19 08:36:15 2008
@@ -22,7 +22,7 @@
import org.apache.commons.vfs.FileSystemManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
/**
* Support for configuration of a {@link FileSystemManager}.
@@ -33,9 +33,14 @@
{
protected final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
private ConfigurableFileSystemManager fileSystemManager;
+ @Required
+ public void setFileSystemManager(final ConfigurableFileSystemManager fileSystemManager) {
+ assert fileSystemManager != null;
+ this.fileSystemManager = fileSystemManager;
+ }
+
public ConfigurableFileSystemManager getFileSystemManager() {
assert fileSystemManager != null;
return fileSystemManager;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerFactoryBean.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerFactoryBean.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/FileSystemManagerFactoryBean.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/FileSystemManagerFactoryBean.java Sun Oct 19 08:36:15 2008
@@ -27,9 +27,9 @@
import org.apache.commons.vfs.impl.DefaultFileReplicator;
import org.apache.commons.vfs.impl.FileContentInfoFilenameFactory;
import org.apache.commons.vfs.impl.PrivilegedFileReplicator;
+import org.apache.commons.vfs.provider.FileProvider;
import org.apache.commons.vfs.provider.FileReplicator;
import org.apache.commons.vfs.provider.TemporaryFileStore;
-import org.apache.commons.vfs.provider.FileProvider;
import org.apache.commons.vfs.provider.url.UrlFileProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -69,6 +69,7 @@
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="tmp"/>
<property name="provider">
<bean class="org.apache.commons.vfs.provider.temp.TemporaryFileProvider"/>
@@ -76,6 +77,7 @@
</bean>
<bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="ram"/>
<property name="provider">
<bean class="org.apache.commons.vfs.provider.ram.RamFileProvider"/>
@@ -121,8 +123,13 @@
</bean>
-->
- <bean id="fileSystemAccess" class="org.apache.geronimo.gshell.vfs.FileSystemAccessImpl"/>
-
- <bean id="fileObjectNameCompleter" class="org.apache.geronimo.gshell.vfs.FileObjectNameCompleter"/>
+ <bean id="fileSystemAccess" class="org.apache.geronimo.gshell.vfs.FileSystemAccessImpl">
+ <constructor-arg ref="applicationManager"/>
+ <constructor-arg ref="fileSystemManager"/>
+ </bean>
+
+ <bean id="fileObjectNameCompleter" class="org.apache.geronimo.gshell.vfs.FileObjectNameCompleter">
+ <constructor-arg ref="fileSystemAccess"/>
+ </bean>
</beans>
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/java/org/apache/geronimo/gshell/xstore/XStoreImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/java/org/apache/geronimo/gshell/xstore/XStoreImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/java/org/apache/geronimo/gshell/xstore/XStoreImpl.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/java/org/apache/geronimo/gshell/xstore/XStoreImpl.java Sun Oct 19 08:36:15 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.xstore;
-import org.springframework.beans.factory.annotation.Autowired;
import org.apache.geronimo.gshell.vfs.FileSystemAccess;
import org.apache.commons.vfs.FileSystem;
import org.apache.commons.vfs.FileSystemException;
@@ -37,13 +36,17 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private FileSystemAccess fileSystemAccess;
+ private final FileSystemAccess fileSystemAccess;
private String rootUri;
private FileSystem fileSystem;
+ public XStoreImpl(final FileSystemAccess fileSystemAccess) {
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
+
public String getRootUri() {
if (rootUri == null) {
throw new IllegalStateException("Missing property: rootUri");
Modified: geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -27,6 +27,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="xstore" class="org.apache.geronimo.gshell.xstore.XStoreImpl">
+ <constructor-arg ref="fileSystemAccess"/>
<property name="rootUri" value="file:${gshell.home}/var/xstore"/>
</bean>
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java Sun Oct 19 08:36:15 2008
@@ -19,12 +19,12 @@
package org.apache.geronimo.gshell.wisdom.application;
-import org.apache.ivy.util.filter.Filter;
import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.util.filter.Filter;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
/**
* Artifact filter for applications.
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationFactoryBean.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationFactoryBean.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationFactoryBean.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationFactoryBean.java Sun Oct 19 08:36:15 2008
@@ -24,7 +24,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* Provides access to the {@link Application} instance.
@@ -36,8 +35,12 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private ApplicationManager applicationManager;
+ private final ApplicationManager applicationManager;
+
+ public ApplicationFactoryBean(final ApplicationManager applicationManager) {
+ assert applicationManager != null;
+ this.applicationManager = applicationManager;
+ }
public Object getObject() throws Exception {
assert applicationManager != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java Sun Oct 19 08:36:15 2008
@@ -22,9 +22,9 @@
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ApplicationConfiguration;
import org.apache.geronimo.gshell.application.ClassPath;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java Sun Oct 19 08:36:15 2008
@@ -44,7 +44,6 @@
import org.apache.ivy.core.resolve.ResolveOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -72,18 +71,23 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private EventPublisher eventPublisher;
+ private final EventPublisher eventPublisher;
- @Autowired
- private Ivy ivy;
+ private final Ivy ivy;
private BeanContainer container;
private BeanContainer applicationContainer;
private Application application;
-
+
+ public ApplicationManagerImpl(final EventPublisher eventPublisher, final Ivy ivy) {
+ assert eventPublisher != null;
+ this.eventPublisher = eventPublisher;
+ assert ivy != null;
+ this.ivy = ivy;
+ }
+
public void setBeanContainer(final BeanContainer container) {
assert container != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java Sun Oct 19 08:36:15 2008
@@ -21,11 +21,11 @@
import org.apache.geronimo.gshell.application.ApplicationConfiguration;
import org.apache.geronimo.gshell.application.ApplicationManager;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.apache.geronimo.gshell.chronos.StopWatch;
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.application.model.ApplicationModel;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerImpl;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ApplicationScope.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ApplicationScope.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ApplicationScope.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ApplicationScope.java Sun Oct 19 08:36:15 2008
@@ -19,8 +19,8 @@
package org.apache.geronimo.gshell.wisdom.scope;
-import org.springframework.beans.factory.config.Scope;
import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.Scope;
/**
* ???
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ShellScope.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ShellScope.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ShellScope.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/scope/ShellScope.java Sun Oct 19 08:36:15 2008
@@ -19,8 +19,8 @@
package org.apache.geronimo.gshell.wisdom.scope;
-import org.springframework.beans.factory.config.Scope;
import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.Scope;
/**
* ???
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -25,8 +25,13 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="applicationManager" class="org.apache.geronimo.gshell.wisdom.application.ApplicationManagerImpl"/>
+ <bean id="applicationManager" class="org.apache.geronimo.gshell.wisdom.application.ApplicationManagerImpl">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="ivy"/>
+ </bean>
- <bean id="application" class="org.apache.geronimo.gshell.wisdom.application.ApplicationFactoryBean"/>
+ <bean id="application" class="org.apache.geronimo.gshell.wisdom.application.ApplicationFactoryBean">
+ <constructor-arg ref="applicationManager"/>
+ </bean>
</beans>
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/AliasCommand.java Sun Oct 19 08:36:15 2008
@@ -23,14 +23,12 @@
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.command.Variables;
-import org.apache.geronimo.gshell.command.CommandLocation;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
import org.apache.geronimo.gshell.i18n.MessageSource;
import org.apache.geronimo.gshell.i18n.ResourceBundleMessageSource;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.wisdom.registry.CommandLocationImpl;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Iterator;
import java.util.List;
@@ -43,29 +41,22 @@
public class AliasCommand
extends CommandSupport
{
- @Autowired
- private CommandLineExecutor executor;
+ private final CommandLineExecutor executor;
private String name;
private String alias;
- public AliasCommand(final String name, final String alias) {
- // name could be null
- // alias could be null
+ public AliasCommand(final CommandLineExecutor executor) {
+ assert executor != null;
- this.alias = alias;
+ this.executor = executor;
- setName(name);
setAction(new AliasCommandAction());
setDocumenter(new AliasCommandDocumenter());
setCompleter(new NullCommandCompleter());
setMessages(new AliasCommandMessageSource());
}
-
- public AliasCommand() {
- this(null, null);
- }
public String getName() {
if (name == null) {
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java Sun Oct 19 08:36:15 2008
@@ -27,15 +27,15 @@
import org.apache.geronimo.gshell.command.CommandCompleter;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.command.CommandDocumenter;
+import org.apache.geronimo.gshell.command.CommandLocation;
import org.apache.geronimo.gshell.command.CommandResult;
import org.apache.geronimo.gshell.command.Variables;
-import org.apache.geronimo.gshell.command.CommandLocation;
import org.apache.geronimo.gshell.i18n.MessageSource;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.notification.Notification;
import org.apache.geronimo.gshell.notification.FailureNotification;
-import org.apache.geronimo.gshell.notification.SuccessNotification;
+import org.apache.geronimo.gshell.notification.Notification;
import org.apache.geronimo.gshell.notification.ResultNotification;
+import org.apache.geronimo.gshell.notification.SuccessNotification;
import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/GroupCommand.java Sun Oct 19 08:36:15 2008
@@ -22,7 +22,6 @@
import org.apache.commons.vfs.FileObject;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.command.CommandLocation;
import org.apache.geronimo.gshell.i18n.MessageSource;
import org.apache.geronimo.gshell.i18n.ResourceBundleMessageSource;
import org.apache.geronimo.gshell.registry.CommandResolver;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/LinkCommand.java Sun Oct 19 08:36:15 2008
@@ -26,7 +26,6 @@
import org.apache.geronimo.gshell.i18n.MessageSource;
import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.registry.NoSuchCommandException;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.PrintWriter;
@@ -40,16 +39,16 @@
public class LinkCommand
extends CommandSupport
{
- @Autowired
- private CommandRegistry commandRegistry;
+ private final CommandRegistry commandRegistry;
private String target;
private Command command;
- public LinkCommand(final String target) {
+ public LinkCommand(final CommandRegistry commandRegistry, final String target) {
+ assert commandRegistry != null;
+ this.commandRegistry = commandRegistry;
assert target != null;
-
this.target = target;
}
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatefulCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatefulCommand.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatefulCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatefulCommand.java Sun Oct 19 08:36:15 2008
@@ -19,13 +19,13 @@
package org.apache.geronimo.gshell.wisdom.command;
+import org.apache.geronimo.gshell.chronos.StopWatch;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandCompleter;
import org.apache.geronimo.gshell.command.CommandDocumenter;
import org.apache.geronimo.gshell.command.CommandResult;
import org.apache.geronimo.gshell.i18n.MessageSource;
import org.apache.geronimo.gshell.shell.ShellContext;
-import org.apache.geronimo.gshell.chronos.StopWatch;
/**
* Stateful {@link org.apache.geronimo.gshell.command.Command} component.
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatelessCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatelessCommand.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatelessCommand.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/StatelessCommand.java Sun Oct 19 08:36:15 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.gshell.command.CommandCompleter;
import org.apache.geronimo.gshell.command.CommandDocumenter;
import org.apache.geronimo.gshell.i18n.MessageSource;
-import org.apache.geronimo.gshell.spring.BeanContainerAware;
/**
* Stateless {@link org.apache.geronimo.gshell.command.Command} component.
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/AliasNameCompleter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/AliasNameCompleter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/AliasNameCompleter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/AliasNameCompleter.java Sun Oct 19 08:36:15 2008
@@ -19,6 +19,7 @@
package org.apache.geronimo.gshell.wisdom.completer;
+import jline.Completor;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
import org.apache.geronimo.gshell.event.Event;
import org.apache.geronimo.gshell.event.EventListener;
@@ -26,16 +27,11 @@
import org.apache.geronimo.gshell.registry.AliasRegistry;
import org.apache.geronimo.gshell.wisdom.registry.AliasRegisteredEvent;
import org.apache.geronimo.gshell.wisdom.registry.AliasRemovedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
-import jline.Completor;
-
/**
* {@link Completor} for alias names.
*
@@ -46,16 +42,19 @@
public class AliasNameCompleter
implements Completor
{
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private final EventManager eventManager;
- @Autowired
- private EventManager eventManager;
-
- @Autowired
- private AliasRegistry aliasRegistry;
+ private final AliasRegistry aliasRegistry;
private final StringsCompleter delegate = new StringsCompleter();
+ public AliasNameCompleter(final EventManager eventManager, final AliasRegistry aliasRegistry) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert aliasRegistry != null;
+ this.aliasRegistry = aliasRegistry;
+ }
+
@PostConstruct
public void init() {
// Populate the initial list of alias names
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandNameCompleter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandNameCompleter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandNameCompleter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandNameCompleter.java Sun Oct 19 08:36:15 2008
@@ -19,6 +19,7 @@
package org.apache.geronimo.gshell.wisdom.completer;
+import jline.Completor;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
import org.apache.geronimo.gshell.event.Event;
import org.apache.geronimo.gshell.event.EventListener;
@@ -26,16 +27,11 @@
import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.wisdom.registry.CommandRegisteredEvent;
import org.apache.geronimo.gshell.wisdom.registry.CommandRemovedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
-import jline.Completor;
-
/**
* {@link Completor} for command names.
*
@@ -46,16 +42,19 @@
public class CommandNameCompleter
implements Completor
{
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private final EventManager eventManager;
- @Autowired
- private EventManager eventManager;
-
- @Autowired
- private CommandRegistry commandRegistry;
+ private final CommandRegistry commandRegistry;
private final StringsCompleter delegate = new StringsCompleter();
+ public CommandNameCompleter(final EventManager eventManager, final CommandRegistry commandRegistry) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert commandRegistry != null;
+ this.commandRegistry = commandRegistry;
+ }
+
@PostConstruct
public void init() {
// Populate the initial list of command names
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandsCompleter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandsCompleter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandsCompleter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/CommandsCompleter.java Sun Oct 19 08:36:15 2008
@@ -31,9 +31,6 @@
import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.wisdom.registry.CommandRegisteredEvent;
import org.apache.geronimo.gshell.wisdom.registry.CommandRemovedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
@@ -52,18 +49,21 @@
public class CommandsCompleter
implements Completor
{
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private final EventManager eventManager;
- @Autowired
- private EventManager eventManager;
-
- @Autowired
- private CommandRegistry commandRegistry;
+ private final CommandRegistry commandRegistry;
private final Map<String,Completor> completors = new HashMap<String,Completor>();
private final AggregateCompleter delegate = new AggregateCompleter();
+ public CommandsCompleter(final EventManager eventManager, final CommandRegistry commandRegistry) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert commandRegistry != null;
+ this.commandRegistry = commandRegistry;
+ }
+
@PostConstruct
public void init() throws Exception {
// Populate the initial list of completers from the currently registered commands
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/VariableNameCompleter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/VariableNameCompleter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/VariableNameCompleter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/completer/VariableNameCompleter.java Sun Oct 19 08:36:15 2008
@@ -24,7 +24,6 @@
import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
import java.util.Iterator;
@@ -38,8 +37,12 @@
public class VariableNameCompleter
implements Completor
{
- @Autowired
- private ApplicationManager applicationManager;
+ private final ApplicationManager applicationManager;
+
+ public VariableNameCompleter(final ApplicationManager applicationManager) {
+ assert applicationManager != null;
+ this.applicationManager = applicationManager;
+ }
public int complete(final String buffer, final int cursor, final List candidates) {
assert applicationManager != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/config/PluginParser.java Sun Oct 19 08:36:15 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.gshell.wisdom.command.LinkCommand;
import org.apache.geronimo.gshell.wisdom.plugin.bundle.CommandBundle;
import org.apache.geronimo.gshell.wisdom.registry.CommandLocationImpl;
-import org.apache.geronimo.gshell.command.CommandLocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanDefinitionStoreException;
@@ -32,9 +31,9 @@
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
import org.springframework.beans.factory.xml.ParserContext;
@@ -42,10 +41,10 @@
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
/**
* Parser for the <gshell:plugin/> element.
@@ -340,6 +339,8 @@
log.trace("Parse command bundle; element; {}", element);
BeanDefinitionBuilder bundle = BeanDefinitionBuilder.rootBeanDefinition(CommandBundle.class);
+ bundle.addConstructorArgReference("commandRegistry");
+ bundle.addConstructorArgReference("aliasRegistry");
bundle.addConstructorArgValue(element.getAttribute(NAME));
bundle.setLazyInit(true);
parseAndApplyDescription(element, bundle);
@@ -507,6 +508,7 @@
for (Element child : children) {
BeanDefinitionBuilder link = BeanDefinitionBuilder.rootBeanDefinition(LinkCommand.class);
+ link.addConstructorArgReference("commandRegistry");
link.addConstructorArgValue(child.getAttribute(TARGET));
String name = child.getAttribute(NAME);
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/meta/RuntimeContent.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/meta/RuntimeContent.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/meta/RuntimeContent.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/meta/RuntimeContent.java Sun Oct 19 08:36:15 2008
@@ -22,8 +22,8 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataContent;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MapMetaDataContentSupport;
-import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.Map;
/**
* {@link MetaDataContent} to return details about {@link Runtime}.
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java Sun Oct 19 08:36:15 2008
@@ -23,8 +23,8 @@
import org.apache.geronimo.gshell.wisdom.application.ApplicationArtifactFilter;
import org.apache.ivy.core.module.descriptor.Artifact;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
/**
* Artifact filter for plugins.
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java Sun Oct 19 08:36:15 2008
@@ -19,9 +19,9 @@
package org.apache.geronimo.gshell.wisdom.plugin;
-import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.application.ClassPath;
import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.wisdom.plugin.activation.ActivationContext;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java Sun Oct 19 08:36:15 2008
@@ -19,9 +19,9 @@
package org.apache.geronimo.gshell.wisdom.plugin;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.event.Event;
-import org.apache.geronimo.gshell.application.model.Artifact;
/**
* Event fired once a plugin has been loaded.
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java Sun Oct 19 08:36:15 2008
@@ -22,6 +22,7 @@
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.application.ClassPath;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
import org.apache.geronimo.gshell.chronos.StopWatch;
@@ -29,7 +30,6 @@
import org.apache.geronimo.gshell.event.EventListener;
import org.apache.geronimo.gshell.event.EventManager;
import org.apache.geronimo.gshell.event.EventPublisher;
-import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.wisdom.application.ApplicationConfiguredEvent;
@@ -47,7 +47,6 @@
import org.apache.ivy.core.resolve.ResolveOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
import java.net.URL;
@@ -65,25 +64,33 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private ApplicationManager applicationManager;
+ private final ApplicationManager applicationManager;
- @Autowired
- private EventManager eventManager;
+ private final EventManager eventManager;
- @Autowired
- private EventPublisher eventPublisher;
+ private final EventPublisher eventPublisher;
- @Autowired
- private XStore xstore;
+ private final XStore xstore;
- @Autowired
- private Ivy ivy;
+ private final Ivy ivy;
private BeanContainer container;
private Set<Plugin> plugins = new LinkedHashSet<Plugin>();
+ public PluginManagerImpl(final ApplicationManager applicationManager, final EventManager eventManager, final EventPublisher eventPublisher, final XStore xstore, final Ivy ivy) {
+ assert applicationManager != null;
+ this.applicationManager = applicationManager;
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert eventPublisher != null;
+ this.eventPublisher = eventPublisher;
+ assert xstore != null;
+ this.xstore = xstore;
+ assert ivy != null;
+ this.ivy = ivy;
+ }
+
public void setBeanContainer(final BeanContainer container) {
assert container != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginMetaMapper.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginMetaMapper.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginMetaMapper.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginMetaMapper.java Sun Oct 19 08:36:15 2008
@@ -25,7 +25,6 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
@@ -37,14 +36,19 @@
public class PluginMetaMapper
implements EventListener
{
- @Autowired
- private EventManager eventManager;
+ private final EventManager eventManager;
- @Autowired
- private MetaDataRegistry metaRegistry;
+ private final MetaDataRegistry metaRegistry;
private MetaDataRegistryConfigurer metaConfig;
+ public PluginMetaMapper(final EventManager eventManager, final MetaDataRegistry metaRegistry) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert metaRegistry != null;
+ this.metaRegistry = metaRegistry;
+ }
+
@PostConstruct
public void init() {
assert metaRegistry != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/bundle/CommandBundle.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/bundle/CommandBundle.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/bundle/CommandBundle.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/bundle/CommandBundle.java Sun Oct 19 08:36:15 2008
@@ -22,10 +22,9 @@
import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.registry.AliasRegistry;
import org.apache.geronimo.gshell.registry.CommandRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
/**
* A bundle of {@link Command} instances.
@@ -35,18 +34,20 @@
public class CommandBundle
extends BundleSupport
{
- @Autowired
- private CommandRegistry commandRegistry;
+ private final CommandRegistry commandRegistry;
- @Autowired
- private AliasRegistry aliasRegistry;
+ private final AliasRegistry aliasRegistry;
private List<Command> commands;
private Map<String,String> aliases;
- public CommandBundle(final String name) {
+ public CommandBundle(final CommandRegistry commandRegistry, final AliasRegistry aliasRegistry, final String name) {
super(name);
+ assert commandRegistry != null;
+ this.commandRegistry = commandRegistry;
+ assert aliasRegistry != null;
+ this.aliasRegistry = aliasRegistry;
}
public List<Command> getCommands() {
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasMetaMapper.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasMetaMapper.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasMetaMapper.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasMetaMapper.java Sun Oct 19 08:36:15 2008
@@ -22,11 +22,10 @@
import org.apache.geronimo.gshell.event.Event;
import org.apache.geronimo.gshell.event.EventListener;
import org.apache.geronimo.gshell.event.EventManager;
+import org.apache.geronimo.gshell.registry.AliasRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import org.apache.geronimo.gshell.registry.AliasRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
@@ -38,17 +37,23 @@
public class AliasMetaMapper
implements EventListener
{
- @Autowired
- private EventManager eventManager;
+ private final EventManager eventManager;
- @Autowired
- private MetaDataRegistry metaRegistry;
+ private final MetaDataRegistry metaRegistry;
- @Autowired
- private AliasRegistry aliasRegistry;
+ private final AliasRegistry aliasRegistry;
private MetaDataRegistryConfigurer metaConfig;
+ public AliasMetaMapper(final EventManager eventManager, final MetaDataRegistry metaRegistry, final AliasRegistry aliasRegistry) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert metaRegistry != null;
+ this.metaRegistry = metaRegistry;
+ assert aliasRegistry != null;
+ this.aliasRegistry = aliasRegistry;
+ }
+
@PostConstruct
public synchronized void init() throws Exception {
assert metaRegistry != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasRegistryImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasRegistryImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/AliasRegistryImpl.java Sun Oct 19 08:36:15 2008
@@ -24,7 +24,6 @@
import org.apache.geronimo.gshell.registry.NoSuchAliasException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
import java.util.Collections;
@@ -41,11 +40,15 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private EventPublisher eventPublisher;
+ private final EventPublisher eventPublisher;
private final Map<String,String> aliases = new LinkedHashMap<String,String>();
+ public AliasRegistryImpl(final EventPublisher eventPublisher) {
+ assert eventPublisher != null;
+ this.eventPublisher = eventPublisher;
+ }
+
public void registerAlias(final String name, final String alias) {
assert name != null;
assert alias != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandMetaMapper.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandMetaMapper.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandMetaMapper.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandMetaMapper.java Sun Oct 19 08:36:15 2008
@@ -22,11 +22,10 @@
import org.apache.geronimo.gshell.event.Event;
import org.apache.geronimo.gshell.event.EventListener;
import org.apache.geronimo.gshell.event.EventManager;
+import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import org.apache.geronimo.gshell.registry.CommandRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
@@ -38,17 +37,23 @@
public class CommandMetaMapper
implements EventListener
{
- @Autowired
- private EventManager eventManager;
+ private final EventManager eventManager;
- @Autowired
- private MetaDataRegistry metaRegistry;
+ private final MetaDataRegistry metaRegistry;
- @Autowired
- private CommandRegistry commandRegistry;
+ private final CommandRegistry commandRegistry;
private MetaDataRegistryConfigurer metaConfig;
+ public CommandMetaMapper(final EventManager eventManager, final MetaDataRegistry metaRegistry, final CommandRegistry commandRegistry) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert metaRegistry != null;
+ this.metaRegistry = metaRegistry;
+ assert commandRegistry != null;
+ this.commandRegistry = commandRegistry;
+ }
+
@PostConstruct
public synchronized void init() throws Exception {
assert metaRegistry != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandRegistryImpl.java Sun Oct 19 08:36:15 2008
@@ -20,15 +20,12 @@
package org.apache.geronimo.gshell.wisdom.registry;
import org.apache.geronimo.gshell.command.Command;
-import org.apache.geronimo.gshell.command.CommandLocation;
import org.apache.geronimo.gshell.event.EventPublisher;
import org.apache.geronimo.gshell.registry.CommandRegistry;
import org.apache.geronimo.gshell.registry.DuplicateCommandException;
import org.apache.geronimo.gshell.registry.NoSuchCommandException;
-import org.apache.geronimo.gshell.wisdom.command.CommandSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection;
import java.util.Collections;
@@ -45,11 +42,15 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private EventPublisher eventPublisher;
+ private final EventPublisher eventPublisher;
private final Map<String,Command> commands = new LinkedHashMap<String,Command>();
+ public CommandRegistryImpl(final EventPublisher eventPublisher) {
+ assert eventPublisher != null;
+ this.eventPublisher = eventPublisher;
+ }
+
public void registerCommand(final Command command) throws DuplicateCommandException {
assert command != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImpl.java Sun Oct 19 08:36:15 2008
@@ -31,16 +31,15 @@
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.vfs.FileSystemAccess;
import org.apache.geronimo.gshell.vfs.provider.meta.MetaFileName;
-import org.apache.geronimo.gshell.wisdom.command.GroupCommand;
import org.apache.geronimo.gshell.wisdom.command.AliasCommand;
+import org.apache.geronimo.gshell.wisdom.command.GroupCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.Arrays;
/**
* {@link CommandResolver} component.
@@ -52,8 +51,7 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private FileSystemAccess fileSystemAccess;
+ private final FileSystemAccess fileSystemAccess;
//
// TODO: Consider using FileSystemManager.createVirtualFileSystem() to chroot for resolving?
@@ -65,6 +63,11 @@
private BeanContainer container;
+ public CommandResolverImpl(final FileSystemAccess fileSystemAccess) {
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
+ }
+
public void setBeanContainer(final BeanContainer container) {
assert container != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineBuilderImpl.java Sun Oct 19 08:36:15 2008
@@ -22,6 +22,7 @@
import org.apache.geronimo.gshell.commandline.CommandLine;
import org.apache.geronimo.gshell.commandline.CommandLineBuilder;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
+import org.apache.geronimo.gshell.io.Closer;
import org.apache.geronimo.gshell.notification.ErrorNotification;
import org.apache.geronimo.gshell.parser.ASTCommandLine;
import org.apache.geronimo.gshell.parser.CommandLineParser;
@@ -29,10 +30,8 @@
import org.apache.geronimo.gshell.parser.visitor.ExecutingVisitor;
import org.apache.geronimo.gshell.parser.visitor.LoggingVisitor;
import org.apache.geronimo.gshell.shell.ShellContext;
-import org.apache.geronimo.gshell.io.Closer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.Reader;
import java.io.StringReader;
@@ -47,10 +46,12 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private CommandLineParser parser;
-
- public CommandLineBuilderImpl() {}
+ private final CommandLineParser parser;
+
+ public CommandLineBuilderImpl(final CommandLineParser parser) {
+ assert parser != null;
+ this.parser = parser;
+ }
private ASTCommandLine parse(final String input) throws ParseException {
assert input != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/CommandLineExecutorImpl.java Sun Oct 19 08:36:15 2008
@@ -23,22 +23,21 @@
import org.apache.geronimo.gshell.command.Arguments;
import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.command.CommandException;
-import org.apache.geronimo.gshell.registry.CommandResolver;
import org.apache.geronimo.gshell.command.CommandResult;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.commandline.CommandLine;
import org.apache.geronimo.gshell.commandline.CommandLineBuilder;
import org.apache.geronimo.gshell.commandline.CommandLineExecutionFailed;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
+import org.apache.geronimo.gshell.io.Closer;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.SystemOutputHijacker;
-import org.apache.geronimo.gshell.io.Closer;
import org.apache.geronimo.gshell.notification.ErrorNotification;
import org.apache.geronimo.gshell.notification.Notification;
+import org.apache.geronimo.gshell.registry.CommandResolver;
import org.apache.geronimo.gshell.shell.ShellContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import java.io.InputStream;
import java.io.OutputStream;
@@ -59,11 +58,16 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private CommandResolver commandResolver;
+ private final CommandResolver commandResolver;
+
+ private final CommandLineBuilder commandLineBuilder;
- @Autowired
- private CommandLineBuilder commandLineBuilder;
+ public CommandLineExecutorImpl(final CommandResolver commandResolver, final CommandLineBuilder commandLineBuilder) {
+ assert commandResolver != null;
+ this.commandResolver = commandResolver;
+ assert commandLineBuilder != null;
+ this.commandLineBuilder = commandLineBuilder;
+ }
public Object execute(final ShellContext context, final String line) throws Exception {
assert context != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsoleErrorHandlerImpl.java Sun Oct 19 08:36:15 2008
@@ -27,7 +27,6 @@
import org.apache.geronimo.gshell.notification.ErrorNotification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* {@link Console.ErrorHandler} component.
@@ -39,14 +38,19 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private EventManager eventManager;
+ private final EventManager eventManager;
- @Autowired
- private Application application;
+ private final Application application;
private Renderer renderer = new Renderer();
+ public ConsoleErrorHandlerImpl(final EventManager eventManager, final Application application) {
+ assert eventManager != null;
+ this.eventManager = eventManager;
+ assert application != null;
+ this.application = application;
+ }
+
public Result handleError(final Throwable error) {
assert error != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ConsolePrompterImpl.java Sun Oct 19 08:36:15 2008
@@ -30,7 +30,6 @@
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
@@ -44,8 +43,7 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private Application application;
+ private final Application application;
private final Interpolator interp = new StringSearchInterpolator("%{", "}");
@@ -53,6 +51,11 @@
private final Renderer renderer = new Renderer();
+ public ConsolePrompterImpl(final Application application) {
+ assert application != null;
+ this.application = application;
+ }
+
@PostConstruct
public void init() {
assert application != null;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/HistoryImpl.java Sun Oct 19 08:36:15 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.gshell.application.Application;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
import java.io.File;
@@ -39,8 +38,12 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private Application application;
+ private final Application application;
+
+ public HistoryImpl(final Application application) {
+ assert application != null;
+ this.application = application;
+ }
@PostConstruct
public void init() throws Exception {
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java Sun Oct 19 08:36:15 2008
@@ -22,6 +22,7 @@
import jline.Completor;
import jline.History;
import org.apache.geronimo.gshell.application.Application;
+import org.apache.geronimo.gshell.application.model.Branding;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
import org.apache.geronimo.gshell.console.Console;
@@ -29,15 +30,13 @@
import org.apache.geronimo.gshell.console.Console.Prompter;
import org.apache.geronimo.gshell.console.JLineConsole;
import org.apache.geronimo.gshell.console.completer.AggregateCompleter;
-import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.Closer;
-import org.apache.geronimo.gshell.application.model.Branding;
+import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.notification.ExitNotification;
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;
import javax.annotation.PostConstruct;
import java.io.BufferedReader;
@@ -56,11 +55,9 @@
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Autowired
- private Application application;
+ private final Application application;
- @Autowired
- private CommandLineExecutor executor;
+ private final CommandLineExecutor executor;
private History history;
@@ -76,6 +73,13 @@
private boolean opened;
+ public ShellImpl(final Application application, final CommandLineExecutor executor) {
+ assert application != null;
+ this.application = application;
+ assert executor != null;
+ this.executor = executor;
+ }
+
private synchronized void ensureOpened() {
if (!opened) {
throw new IllegalStateException("Shell has not been opened or has been closed");
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml?rev=706033&r1=706032&r2=706033&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml Sun Oct 19 08:36:15 2008
@@ -25,29 +25,62 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="pluginManager" class="org.apache.geronimo.gshell.wisdom.plugin.PluginManagerImpl"/>
+ <bean id="pluginManager" class="org.apache.geronimo.gshell.wisdom.plugin.PluginManagerImpl">
+ <constructor-arg ref="applicationManager"/>
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="xstore"/>
+ <constructor-arg ref="ivy"/>
+ </bean>
- <bean id="pluginMetaMapper" class="org.apache.geronimo.gshell.wisdom.plugin.PluginMetaMapper"/>
+ <bean id="pluginMetaMapper" class="org.apache.geronimo.gshell.wisdom.plugin.PluginMetaMapper">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="metaDataRegistry"/>
+ </bean>
- <bean id="aliasRegistry" class="org.apache.geronimo.gshell.wisdom.registry.AliasRegistryImpl"/>
+ <bean id="aliasRegistry" class="org.apache.geronimo.gshell.wisdom.registry.AliasRegistryImpl">
+ <constructor-arg ref="eventManager"/>
+ </bean>
- <bean id="aliasMetaMapper" class="org.apache.geronimo.gshell.wisdom.registry.AliasMetaMapper"/>
+ <bean id="aliasMetaMapper" class="org.apache.geronimo.gshell.wisdom.registry.AliasMetaMapper">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="metaDataRegistry"/>
+ <constructor-arg ref="aliasRegistry"/>
+ </bean>
- <bean id="commandRegistry" class="org.apache.geronimo.gshell.wisdom.registry.CommandRegistryImpl"/>
+ <bean id="commandRegistry" class="org.apache.geronimo.gshell.wisdom.registry.CommandRegistryImpl">
+ <constructor-arg ref="eventManager"/>
+ </bean>
- <bean id="commandMetaMapper" class="org.apache.geronimo.gshell.wisdom.registry.CommandMetaMapper"/>
+ <bean id="commandMetaMapper" class="org.apache.geronimo.gshell.wisdom.registry.CommandMetaMapper">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="metaDataRegistry"/>
+ <constructor-arg ref="commandRegistry"/>
+ </bean>
- <bean id="commandResolver" class="org.apache.geronimo.gshell.wisdom.registry.CommandResolverImpl"/>
+ <bean id="commandResolver" class="org.apache.geronimo.gshell.wisdom.registry.CommandResolverImpl">
+ <constructor-arg ref="fileSystemAccess"/>
+ </bean>
- <bean class="org.apache.geronimo.gshell.wisdom.command.AliasCommand" scope="prototype"/>
+ <bean class="org.apache.geronimo.gshell.wisdom.command.AliasCommand" scope="prototype">
+ <constructor-arg ref="commandLineExecutor"/>
+ </bean>
<bean class="org.apache.geronimo.gshell.wisdom.command.GroupCommand" scope="prototype"/>
- <bean id="commandLineBuilder" class="org.apache.geronimo.gshell.wisdom.shell.CommandLineBuilderImpl"/>
+ <bean id="commandLineBuilder" class="org.apache.geronimo.gshell.wisdom.shell.CommandLineBuilderImpl">
+ <constructor-arg ref="commandLineParser"/>
+ </bean>
- <bean id="commandLineExecutor" class="org.apache.geronimo.gshell.wisdom.shell.CommandLineExecutorImpl"/>
+ <bean id="commandLineExecutor" class="org.apache.geronimo.gshell.wisdom.shell.CommandLineExecutorImpl">
+ <constructor-arg ref="commandResolver"/>
+ <constructor-arg ref="commandLineBuilder"/>
+ </bean>
<bean id="shell" class="org.apache.geronimo.gshell.wisdom.shell.ShellImpl" scope="prototype">
+ <constructor-arg ref="application"/>
+ <constructor-arg ref="commandLineExecutor"/>
+
<property name="completers">
<list>
<ref bean="commandsCompleter"/>
@@ -56,25 +89,47 @@
</property>
<property name="prompter">
- <bean class="org.apache.geronimo.gshell.wisdom.shell.ConsolePrompterImpl"/>
+ <bean class="org.apache.geronimo.gshell.wisdom.shell.ConsolePrompterImpl">
+ <constructor-arg ref="application"/>
+ </bean>
</property>
<property name="errorHandler">
- <bean class="org.apache.geronimo.gshell.wisdom.shell.ConsoleErrorHandlerImpl"/>
+ <bean class="org.apache.geronimo.gshell.wisdom.shell.ConsoleErrorHandlerImpl">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="application"/>
+ </bean>
</property>
<property name="history">
- <bean class="org.apache.geronimo.gshell.wisdom.shell.HistoryImpl"/>
+ <bean class="org.apache.geronimo.gshell.wisdom.shell.HistoryImpl">
+ <constructor-arg ref="application"/>
+ </bean>
</property>
</bean>
- <bean id="commandNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandNameCompleter"/>
+ <bean id="commandNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandNameCompleter" lazy-init="true">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="commandRegistry"/>
+ </bean>
- <bean id="aliasNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.AliasNameCompleter"/>
+ <bean id="aliasNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.AliasNameCompleter" lazy-init="true">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="aliasRegistry"/>
+ </bean>
+
+ <bean id="commandsCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandsCompleter" lazy-init="true">
+ <constructor-arg ref="eventManager"/>
+ <constructor-arg ref="commandRegistry"/>
+ </bean>
- <bean id="commandsCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandsCompleter"/>
+ <bean id="variableNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.VariableNameCompleter" lazy-init="true">
+ <constructor-arg ref="applicationManager"/>
+ </bean>
<bean class="org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataInstaller">
+ <constructor-arg ref="metaDataRegistry"/>
+
<property name="contentNodes">
<map>
<entry key="/system/runtime">
@@ -100,14 +155,14 @@
</property>
</bean>
+ <bean id="defaultCommandCompleter" class="org.apache.geronimo.gshell.wisdom.command.NullCommandCompleter" lazy-init="true"/>
+
<bean id="statelessCommandTemplate" class="org.apache.geronimo.gshell.wisdom.command.StatelessCommand" abstract="true">
<property name="documenter">
<bean class="org.apache.geronimo.gshell.wisdom.command.MessageSourceCommandDocumenter"/>
</property>
- <property name="completer">
- <bean class="org.apache.geronimo.gshell.wisdom.command.NullCommandCompleter"/>
- </property>
+ <property name="completer" ref="defaultCommandCompleter"/>
<property name="messages">
<bean class="org.apache.geronimo.gshell.wisdom.command.CommandMessageSource"/>
@@ -119,9 +174,7 @@
<bean class="org.apache.geronimo.gshell.wisdom.command.MessageSourceCommandDocumenter"/>
</property>
- <property name="completer">
- <bean class="org.apache.geronimo.gshell.wisdom.command.NullCommandCompleter"/>
- </property>
+ <property name="completer" ref="defaultCommandCompleter"/>
<property name="messages">
<bean class="org.apache.geronimo.gshell.wisdom.command.CommandMessageSource"/>