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/22 13:08:09 UTC
svn commit: r707031 - in /geronimo/gshell/trunk:
gshell-assembly/src/main/underlay/etc/
gshell-commands/gshell-admin/src/main/resources/META-INF/spring/
gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/
gshell-commands/gshell-builtins/src/...
Author: jdillon
Date: Wed Oct 22 04:08:07 2008
New Revision: 707031
URL: http://svn.apache.org/viewvc?rev=707031&view=rev
Log:
Configure default-init-method and default-destroy-method to avoid needing @PostConstruct/@PreDestroy in the core bits
Removed:
geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/LifecycleProcessor.java
Modified:
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml
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/RshServer.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManagerImpl.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml
geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/BeanContainerAwareProcessorTest.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImpl.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-truezip/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ExtensionMapConfigurer.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/FileSystemManagerFactoryBean.java
geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/MimeTypeMapConfigurer.java
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/resources/META-INF/spring/components.xml
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/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/registry/AliasMetaMapper.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/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-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Wed Oct 22 04:08:07 2008
@@ -23,7 +23,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml Wed Oct 22 04:08:07 2008
@@ -21,7 +21,7 @@
<!-- $Rev$ $Date$ -->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
+
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
@@ -35,7 +35,7 @@
<appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="${gshell.home}/var/log/gshell.log"/>
<param name="Append" value="false"/>
- <param name="Threshold" value="${gshell.log.console.level}"/>
+ <param name="Threshold" value="DEBUG"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p (%t) [%c] %m%n"/>
</layout>
@@ -45,46 +45,18 @@
<level value="INFO"/>
</logger>
- <logger name="org.apache.geronimo.gshell.artifact.GShellArtifactMetadataSource">
- <level value="DEBUG"/>
- </logger>
-
- <logger name="org.apache.geronimo.gshell.artifact.monitor.ProgressSpinnerMonitor">
- <level value="INFO"/>
- </logger>
-
<logger name="org.apache.geronimo.gshell.application.ApplicationSecurityManager">
<level value="DEBUG"/>
</logger>
- <logger name="org.apache.geronimo.gshell.application.model.interpolate.InterpolatorSupport">
- <level value="DEBUG"/>
- </logger>
-
<logger name="org.apache.geronimo.gshell.console">
<level value="INFO"/>
</logger>
- <logger name="org.codehaus.plexus.PlexusContainer">
- <level value="INFO"/>
- </logger>
-
<logger name="org.apache.mina.filter.executor.ExecutorFilter">
<level value="INFO"/>
</logger>
- <logger name="org.apache.maven">
- <level value="INFO"/>
- </logger>
-
- <logger name="org.apache.maven.artifact.manager">
- <level value="ERROR"/>
- </logger>
-
- <logger name="org.apache.maven.artifact.repository.metadata">
- <level value="WARN"/>
- </logger>
-
<logger name="org.springframework">
<level value="WARN"/>
</logger>
@@ -93,12 +65,6 @@
<level value="INFO"/>
</logger>
- <!--
- <logger name="org.apache.geronimo.gshell.spring.BeanContainerContextImpl">
- <level value="WARN"/>
- </logger>
- -->
-
<logger name="org.apache.commons.vfs.cache">
<level value="INFO"/>
</logger>
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<gshell:plugin name="gshell-admin">
<gshell:command-bundle name="default">
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<gshell:plugin name="gshell-bsf">
<gshell:command-bundle name="default">
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=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/components.xml Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<gshell:plugin name="gshell-builtins">
<gshell:command-bundle name="default">
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<gshell:plugin name="gshell-log4j">
<gshell:command-bundle name="default">
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/components.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/components.xml Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<gshell:plugin name="gshell-optional">
<gshell:command-bundle name="default">
Modified: geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/components.xml Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<gshell:plugin name="gshell-remote">
<gshell:command-bundle name="default">
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -26,7 +26,10 @@
xsi:schemaLocation="
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"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean id="vfsCommandActionTemplate" abstract="true">
<property name="fileSystemAccess" ref="fileSystemAccess"/>
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/pom.xml Wed Oct 22 04:08:07 2008
@@ -20,7 +20,9 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean class="org.apache.geronimo.gshell.remote.client.RshClient" scope="prototype">
<constructor-arg ref="cryptoContext"/>
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -57,8 +57,10 @@
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/timeout/TimeoutManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManagerImpl.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManagerImpl.java Wed Oct 22 04:08:07 2008
@@ -19,18 +19,16 @@
package org.apache.geronimo.gshell.remote.server.timeout;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
-
import org.apache.geronimo.gshell.chronos.Duration;
-import org.apache.geronimo.gshell.whisper.util.NamedThreadFactory;
import org.apache.geronimo.gshell.whisper.transport.Session;
+import org.apache.geronimo.gshell.whisper.util.NamedThreadFactory;
import org.apache.geronimo.gshell.whisper.util.SessionAttributeBinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
/**
* Default {@link TimeoutManager} implementation.
@@ -46,7 +44,7 @@
private ScheduledThreadPoolExecutor scheduler;
- @PostConstruct
+ // @PostConstruct
public void init() {
ThreadFactory tf = new NamedThreadFactory(getClass());
scheduler = new ScheduledThreadPoolExecutor(Runtime.getRuntime().availableProcessors(), tf);
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean id="timeoutManager" class="org.apache.geronimo.gshell.remote.server.timeout.TimeoutManagerImpl" lazy-init="true"/>
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java Wed Oct 22 04:08:07 2008
@@ -23,11 +23,10 @@
package org.apache.geronimo.gshell.whisper.ssl;
+import org.apache.geronimo.gshell.io.Closer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.geronimo.gshell.io.Closer;
-import javax.annotation.PostConstruct;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.ManagerFactoryParameters;
import javax.net.ssl.SSLContext;
@@ -90,7 +89,7 @@
private SSLContext clientInstance;
- @PostConstruct
+ // @PostConstruct
public synchronized void init() throws Exception {
if (preload) {
log.debug("Preloading SSLContext instances");
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java Wed Oct 22 04:08:07 2008
@@ -22,7 +22,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
@@ -50,7 +49,7 @@
this.factories = factories;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
if (factories == null) {
log.warn("No transport factories discovered");
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocatorImpl" lazy-init="true">
<property name="factories">
Modified: geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/components.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/components.xml Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean id="cryptoContext" class="org.apache.geronimo.gshell.security.crypto.CryptoContextImpl" lazy-init="true">
<property name="transformation" value="RSA"/>
Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/pom.xml Wed Oct 22 04:08:07 2008
@@ -78,12 +78,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -65,7 +65,7 @@
// Hook up annotation processing
// context.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
- context.addBeanPostProcessor(new LifecycleProcessor());
+ // context.addBeanPostProcessor(new LifecycleProcessor());
// Add automatic trace logging of loaded beans
context.addBeanFactoryPostProcessor(new LoggingProcessor());
Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/BeanContainerAwareProcessorTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/BeanContainerAwareProcessorTest.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/BeanContainerAwareProcessorTest.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/BeanContainerAwareProcessorTest.java Wed Oct 22 04:08:07 2008
@@ -19,8 +19,6 @@
package org.apache.geronimo.gshell.spring;
-import javax.annotation.PostConstruct;
-
import junit.framework.Assert;
/**
@@ -53,7 +51,7 @@
this.container = container;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
initialized = true;
Assert.assertNotNull(container);
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImpl.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/MetaDataRegistryImpl.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImpl.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImpl.java Wed Oct 22 04:08:07 2008
@@ -27,7 +27,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
import java.util.HashMap;
import java.util.Map;
@@ -45,7 +44,7 @@
private String rootFileName = MetaFileName.SCHEME + ":/";
- @PostConstruct
+ // @PostConstruct
public void init() throws FileSystemException {
// Register the root folder
MetaFileNameParser parser = new MetaFileNameParser();
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataContent;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
-import javax.annotation.PostConstruct;
import java.util.Map;
/**
@@ -46,7 +45,7 @@
this.contentNodes = nodes;
}
- @PostConstruct
+ // @PostConstruct
public void init() throws Exception {
assert metaRegistry != null;
MetaDataRegistryConfigurer metaConfig = new MetaDataRegistryConfigurer(metaRegistry);
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<!--
TODO: Add other TZ schemes, docs suggest that OOTB TZ6 supports:
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ExtensionMapConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ExtensionMapConfigurer.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ExtensionMapConfigurer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/ExtensionMapConfigurer.java Wed Oct 22 04:08:07 2008
@@ -19,8 +19,6 @@
package org.apache.geronimo.gshell.vfs.config;
-import javax.annotation.PostConstruct;
-
/**
* Configures an extension mapping.
*
@@ -41,7 +39,7 @@
this.scheme = scheme;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
if (extension == null) {
throw new RuntimeException("Missing property: extension");
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -22,7 +22,6 @@
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.operations.FileOperationProvider;
-import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
@@ -51,7 +50,7 @@
schemes.add(scheme);
}
- @PostConstruct
+ // @PostConstruct
public void init() throws FileSystemException {
// TODO: Handle nulls & exceptions
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -22,7 +22,6 @@
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.provider.FileProvider;
-import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
@@ -51,7 +50,7 @@
schemes.add(scheme);
}
- @PostConstruct
+ // @PostConstruct
public void init() throws FileSystemException {
// TODO: Handle nulls & exceptions
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -23,8 +23,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-
/**
* Support for configuration of a {@link FileSystemManager}.
*
@@ -51,7 +49,7 @@
this.fileSystemManager = fileSystemManager;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
assert fileSystemManager != null;
log.debug("Configuring file system manager: {}", 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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -35,8 +35,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
-import javax.annotation.PostConstruct;
-
/**
* Spring {@link FactoryBean} to construct a {@link FileSystemManager} instance.
*
@@ -85,7 +83,7 @@
this.defaultProvider = provider;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
if (filesCache == null) {
filesCache = new SoftRefFilesCache();
Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/MimeTypeMapConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/MimeTypeMapConfigurer.java?rev=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/MimeTypeMapConfigurer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/config/MimeTypeMapConfigurer.java Wed Oct 22 04:08:07 2008
@@ -19,8 +19,6 @@
package org.apache.geronimo.gshell.vfs.config;
-import javax.annotation.PostConstruct;
-
/**
* Configures a MIME type mapping.
*
@@ -41,7 +39,7 @@
this.scheme = scheme;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
if (mimeType == null) {
throw new RuntimeException("Missing property: mimeType");
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -35,7 +35,6 @@
implements Filter
{
private static final String[] EXCLUDES = {
- "geronimo-annotation_1.0_spec",
"gshell-ansi",
"gshell-api",
"gshell-artifact",
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -28,7 +28,6 @@
import org.apache.geronimo.gshell.wisdom.registry.AliasRegisteredEvent;
import org.apache.geronimo.gshell.wisdom.registry.AliasRemovedEvent;
-import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
@@ -55,7 +54,7 @@
this.aliasRegistry = aliasRegistry;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
// Populate the initial list of alias names
Collection<String> names = aliasRegistry.getAliasNames();
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -28,7 +28,6 @@
import org.apache.geronimo.gshell.wisdom.registry.CommandRegisteredEvent;
import org.apache.geronimo.gshell.wisdom.registry.CommandRemovedEvent;
-import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
@@ -55,7 +54,7 @@
this.commandRegistry = commandRegistry;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
// Populate the initial list of command names
Collection<String> names = commandRegistry.getCommandNames();
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -29,10 +29,10 @@
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.FileSystemAccess;
import org.apache.geronimo.gshell.wisdom.registry.CommandRegisteredEvent;
import org.apache.geronimo.gshell.wisdom.registry.CommandRemovedEvent;
-import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -53,22 +53,28 @@
private final CommandRegistry commandRegistry;
+ private final FileSystemAccess fileSystemAccess;
+
private final Map<String,Completor> completors = new HashMap<String,Completor>();
private final AggregateCompleter delegate = new AggregateCompleter();
- public CommandsCompleter(final EventManager eventManager, final CommandRegistry commandRegistry) {
+ public CommandsCompleter(final EventManager eventManager, final CommandRegistry commandRegistry, final FileSystemAccess fileSystemAccess) {
assert eventManager != null;
this.eventManager = eventManager;
+
assert commandRegistry != null;
this.commandRegistry = commandRegistry;
+
+ assert fileSystemAccess != null;
+ this.fileSystemAccess = fileSystemAccess;
}
//
// FIXME: This does not properly complete when in a command group :-(
//
- @PostConstruct
+ // @PostConstruct
public void init() throws Exception {
// Populate the initial list of completers from the currently registered commands
Collection<String> names = commandRegistry.getCommandNames();
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -47,7 +47,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
import java.io.File;
import java.net.URL;
import java.util.LinkedHashSet;
@@ -89,7 +88,7 @@
this.container = container;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
assert eventManager != null;
eventManager.addListener(new EventListener() {
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -26,8 +26,6 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import javax.annotation.PostConstruct;
-
/**
* Handles mapping of plugins under <tt>meta:/plugins</tt>.
*
@@ -49,7 +47,7 @@
this.metaRegistry = metaRegistry;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
assert metaRegistry != null;
metaConfig = new MetaDataRegistryConfigurer(metaRegistry);
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -27,8 +27,6 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import javax.annotation.PostConstruct;
-
/**
* Handles mapping of aliases under <tt>meta:/aliases</tt>.
*
@@ -54,7 +52,7 @@
this.aliasRegistry = aliasRegistry;
}
- @PostConstruct
+ // @PostConstruct
public synchronized void init() throws Exception {
assert metaRegistry != null;
metaConfig = new MetaDataRegistryConfigurer(metaRegistry);
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -27,8 +27,6 @@
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import javax.annotation.PostConstruct;
-
/**
* Handles mapping of commands under <tt>meta:/commands</tt>.
*
@@ -54,7 +52,7 @@
this.commandRegistry = commandRegistry;
}
- @PostConstruct
+ // @PostConstruct
public synchronized void init() throws Exception {
assert metaRegistry != null;
metaConfig = new MetaDataRegistryConfigurer(metaRegistry);
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -31,8 +31,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-
/**
* {@link Console.Prompter} component.
*
@@ -56,7 +54,7 @@
this.application = application;
}
- @PostConstruct
+ // @PostConstruct
public void init() {
assert application != null;
interp.addValueSource(new PrefixedObjectValueSource("application", application));
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -24,7 +24,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
import java.io.File;
import java.io.IOException;
@@ -45,7 +44,7 @@
this.application = application;
}
- @PostConstruct
+ // @PostConstruct
public void init() throws Exception {
assert application != null;
File file = application.getModel().getBranding().getHistoryFile();
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=707031&r1=707030&r2=707031&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 Wed Oct 22 04:08:07 2008
@@ -38,7 +38,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -90,7 +89,7 @@
return true;
}
- @PostConstruct
+ // @PostConstruct
public synchronized void init() throws Exception {
if (opened) {
throw new IllegalStateException("Shell is already opened");
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=707031&r1=707030&r2=707031&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml Wed Oct 22 04:08:07 2008
@@ -23,7 +23,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-autowire="no">
+ default-autowire="no"
+ default-dependency-check="none"
+ default-init-method="init"
+ default-destroy-method="destroy">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -250,6 +253,7 @@
<bean id="commandsCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandsCompleter" lazy-init="true">
<constructor-arg ref="eventManager"/>
<constructor-arg ref="commandRegistry"/>
+ <constructor-arg ref="fileSystemAccess"/>
</bean>
<bean id="variableNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.VariableNameCompleter" lazy-init="true">