geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r580765 - in /geronimo/sandbox/gshell/trunk: gshell-cli/src/main/resources/META-INF/plexus/ gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/ gshell-command-api/src/main/java/org/apache/geronimo/gshell/shell/ gshell-comma...
Date Sun, 30 Sep 2007 18:52:42 GMT
Author: jdillon
Date: Sun Sep 30 11:52:39 2007
New Revision: 580765

URL: http://svn.apache.org/viewvc?rev=580765&view=rev
Log:
Tidy up some plexus component anno usage
Adding some experimental proxy muck to finish up the client-side of the rsh muck

Added:
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java   (contents, props changed)
      - copied, changed from r580692, geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RemoteShellProxy.java
Removed:
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RemoteShellProxy.java
Modified:
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/IO.java
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/shell/Environment.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ExecutingVisitor.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/EnvironmentLookup.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/IOLookup.java
    geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml Sun Sep 30 11:52:39 2007
@@ -34,22 +34,6 @@
         </component-discoverers>
     </component-discoverer-manager>
 
-    <!--
-    NOTE: We don't need this to use factories... just leaving here right now as reference.
-    
-    <component-factory-manager implementation="org.codehaus.plexus.component.factory.DefaultComponentFactoryManager">
-        <component-factories>
-            <component-factory implementation="org.apache.geronimo.gshell.lookup.IOLookup">
-                <id>IOLookup</id>
-            </component-factory>
-
-            <component-factory implementation="org.apache.geronimo.gshell.lookup.EnvironmentLookup">
-                <id>EnvironmentLookup</id>
-            </component-factory>
-        </component-factories>
-    </component-factory-manager>
-    -->
-
     <components>
         <!--
         Configure our logging component to be used so Plexus will pick it up.
@@ -70,11 +54,8 @@
         </component>
         
         <!--
-        Add our instance lookup components
-
-        TODO: Once the @Component anno supports component-factory we can drop these.
+        Add our instance lookup components.
         -->
-
         <component>
             <role>org.apache.geronimo.gshell.command.IO</role>
             <component-factory>IOLookup</component-factory>
@@ -86,7 +67,7 @@
             <component-factory>EnvironmentLookup</component-factory>
             <instantiation-strategy>per-lookup</instantiation-strategy>
         </component>
-        
+
         <component>
             <role>jline.Terminal</role>
             <component-factory>Terminal</component-factory>

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/IO.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/IO.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/IO.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/IO.java Sun Sep 30 11:52:39 2007
@@ -30,6 +30,7 @@
 import org.apache.geronimo.gshell.common.tostring.ReflectionToStringBuilder;
 import org.slf4j.helpers.MessageFormatter;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * Container for input/output handles.

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/shell/Environment.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/shell/Environment.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/shell/Environment.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/shell/Environment.java Sun Sep 30 11:52:39 2007
@@ -21,6 +21,7 @@
 
 import org.apache.geronimo.gshell.command.IO;
 import org.apache.geronimo.gshell.command.Variables;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * ???

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/pom.xml?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/pom.xml Sun Sep 30 11:52:39 2007
@@ -53,10 +53,6 @@
 
     <build>
         <plugins>
-            <!--
-            FIXME: This plugin is kinda dumb and will generate a components.xml even when there
-                   are no components to put in it.  And that is causing the shade plugin to puke :-(
-            
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-java5-maven-plugin</artifactId>
@@ -69,8 +65,7 @@
                     </execution>
                 </executions>
             </plugin>
-            -->
-            
+
             <plugin>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-maven-plugin</artifactId>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultEnvironment.java Sun Sep 30 11:52:39 2007
@@ -19,10 +19,10 @@
 
 package org.apache.geronimo.gshell;
 
-import org.apache.geronimo.gshell.shell.Environment;
-import org.apache.geronimo.gshell.command.Variables;
 import org.apache.geronimo.gshell.command.IO;
+import org.apache.geronimo.gshell.command.Variables;
 import org.apache.geronimo.gshell.common.tostring.ReflectionToStringBuilder;
+import org.apache.geronimo.gshell.shell.Environment;
 
 /**
  * Default {@link Environment} implementation.

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ExecutingVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ExecutingVisitor.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ExecutingVisitor.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ExecutingVisitor.java Sun Sep 30 11:52:39 2007
@@ -24,6 +24,8 @@
 
 import org.apache.geronimo.gshell.command.CommandExecutor;
 import org.apache.geronimo.gshell.common.Arguments;
+import org.apache.geronimo.gshell.expression.ExpressionEvaluator;
+import org.apache.geronimo.gshell.expression.JexlExpressionEvaluator;
 import org.apache.geronimo.gshell.parser.ASTCommandLine;
 import org.apache.geronimo.gshell.parser.ASTExpression;
 import org.apache.geronimo.gshell.parser.ASTOpaqueString;
@@ -32,8 +34,6 @@
 import org.apache.geronimo.gshell.parser.CommandLineParserVisitor;
 import org.apache.geronimo.gshell.parser.SimpleNode;
 import org.apache.geronimo.gshell.shell.Environment;
-import org.apache.geronimo.gshell.expression.JexlExpressionEvaluator;
-import org.apache.geronimo.gshell.expression.ExpressionEvaluator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java Sun Sep 30 11:52:39 2007
@@ -31,7 +31,6 @@
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.component.factory.ComponentFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java Sun Sep 30 11:52:39 2007
@@ -24,6 +24,7 @@
 import java.util.Properties;
 
 import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Configuration;
 import org.codehaus.plexus.util.IOUtil;
 
 /**
@@ -31,15 +32,15 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=VersionLoader.class, hint="default") // HACK: hint="properties")
+@Component(role=VersionLoader.class)
 public class PropertiesVersionLoader
     implements VersionLoader
 {
     private Properties props;
 
-    // @Configuraton(key="resourceName", value="version.properties")
-    private String resourceName = "version.properties";
-
+    @Configuration(value="version.properties")
+    private String resourceName;
+    
     public String getVersion() {
         if (props == null) {
             InputStream input = getClass().getResourceAsStream(resourceName);

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/expression/JexlExpressionEvaluator.java Sun Sep 30 11:52:39 2007
@@ -29,7 +29,6 @@
 import org.apache.commons.jexl.JexlHelper;
 import org.apache.commons.jexl.resolver.FlatResolver;
 import org.apache.geronimo.gshell.command.Variables;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java Sun Sep 30 11:52:39 2007
@@ -19,8 +19,6 @@
 
 package org.apache.geronimo.gshell.layout;
 
-import java.io.IOException;
-
 import org.apache.geronimo.gshell.command.descriptor.CommandDescriptor;
 import org.apache.geronimo.gshell.layout.loader.LayoutLoader;
 import org.apache.geronimo.gshell.layout.model.Layout;

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java Sun Sep 30 11:52:39 2007
@@ -22,7 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
 import org.apache.geronimo.gshell.layout.model.Layout;
@@ -35,17 +35,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-//
-// FIXME: Should not need to specify a hint of "default" here, but the @Component will default to "default"
-//        instead of null, as it should.
-//
-
 /**
  * A simple XML to {@link Layout} loader, uses XStream to handle the dirty work.
  * 
  * @version $Rev$ $Date$
  */
-@Component(role= LayoutLoader.class, hint="default") // hint="xml"
+@Component(role=LayoutLoader.class)
 public class XMLLayoutLoader
     implements LayoutLoader, Initializable
 {
@@ -54,33 +49,25 @@
     @Requirement
     private ShellInfo info;
 
-    //
-    // FIXME: Need to fix the @Configuration annotation so that it works...
-    //
-
-    // @Configuration(key="url", value={"etc/layout.xml"})
-    private URL url;
+    private URI location;
 
     public void initialize() throws InitializationException {
         assert info != null;
 
-        try {
-            //
-            // HACK: Hard code this for now...
-            //
-            
-            url = new File(info.getHomeDir(), "etc/layout.xml").toURI().toURL();
-        }
-        catch (MalformedURLException e) {
-            throw new InitializationException("Invalid URL for layout configuration", e);
-        }
+        //
+        // HACK: Hard code this for now...
+        //
+
+        location = new File(info.getHomeDir(), "etc/layout.xml").toURI();
     }
 
-    private Layout load(final URL url) throws IOException {
-        assert url != null;
+    private Layout load(final URI location) throws IOException {
+        assert location != null;
 
-        log.debug("Loading layout from XML: {}", url);
+        log.debug("Loading layout from XML: {}", location);
 
+        URL url = location.toURL();
+        
         InputStream input = url.openStream();
 
         Layout layout;
@@ -97,6 +84,6 @@
     }
 
     public Layout load() throws IOException {
-        return load(url);
+        return load(location);
     }
 }

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/EnvironmentLookup.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/EnvironmentLookup.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/EnvironmentLookup.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/EnvironmentLookup.java Sun Sep 30 11:52:39 2007
@@ -22,7 +22,6 @@
 import org.apache.geronimo.gshell.shell.Environment;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.factory.ComponentFactory;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
@@ -31,7 +30,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=ComponentFactory.class, hint="EnvironmentLookup", instantiationStrategy=InstantiationStrategy.SINGLETON)
+@Component(role=ComponentFactory.class, hint="EnvironmentLookup")
 public class EnvironmentLookup
     extends LookupFactorySupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/IOLookup.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/IOLookup.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/IOLookup.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/lookup/IOLookup.java Sun Sep 30 11:52:39 2007
@@ -20,19 +20,17 @@
 package org.apache.geronimo.gshell.lookup;
 
 import org.apache.geronimo.gshell.command.IO;
-import org.apache.geronimo.gshell.shell.Environment;
+import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.factory.ComponentFactory;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.PlexusContainer;
 
 /**
  * Lookup factory for {@link IO} instances.
  *
  * @version $Rev$ $Date$
  */
-@Component(role=ComponentFactory.class, hint="IOLookup", instantiationStrategy=InstantiationStrategy.SINGLETON)
+@Component(role=ComponentFactory.class, hint="IOLookup")
 public class IOLookup
     extends LookupFactorySupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java Sun Sep 30 11:52:39 2007
@@ -48,15 +48,13 @@
 /**
  * Generates a GShell XML commands descriptor.
  *
+ * @version $Rev$ $Date$
  * @goal commands-descriptor
  * @phase process-classes
  * @requiresDependencyResolution runtime
- *
- * @version $Rev$ $Date$
  */
 public class CommandSetDescriptorMojo
-    extends AbstractMojo
-{
+        extends AbstractMojo {
     /**
      * The directory where class files have been built.
      *
@@ -93,7 +91,7 @@
      * @required
      */
     private MavenProject project;
-    
+
     //
     // Mojo
     //
@@ -122,7 +120,7 @@
     private List<Class> loadClasses(final ClassLoader cl) throws MojoExecutionException {
         DirectoryScanner scanner = new DirectoryScanner();
         scanner.setBasedir(classesDirectory);
-        scanner.setIncludes(new String[]{ "**/*.class" });
+        scanner.setIncludes(new String[]{"**/*.class"});
         scanner.scan();
 
         List<Class> classes = new ArrayList<Class>();
@@ -146,14 +144,14 @@
 
     private List<Class> getClasses(Class<?> type) {
         assert type != null;
-        
+
         List<Class> classes = new ArrayList<Class>();
 
         while (type != null) {
             classes.add(type);
             type = type.getSuperclass();
         }
-        
+
         return classes;
     }
 
@@ -180,8 +178,7 @@
 
                     if (requirementAnno.role().isAssignableFrom(Object.class)) {
                         requirement.setRole(f.getType().getName());
-                    }
-                    else {
+                    } else {
                         requirement.setRole(requirementAnno.role().getName());
                     }
 
@@ -190,7 +187,7 @@
                     requirement.setFieldMappingType(f.getType().getName());
 
                     getLog().debug("Found requirement: " + requirement);
-                    
+
                     desc.addRequirement(requirement);
                 }
 

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshClient.java Sun Sep 30 11:52:39 2007
@@ -39,14 +39,13 @@
 import org.apache.geronimo.gshell.remote.message.ExecuteMessage;
 import org.apache.geronimo.gshell.remote.message.OpenShellMessage;
 import org.apache.geronimo.gshell.whisper.message.Message;
+import org.apache.geronimo.gshell.whisper.message.MessageHandler;
 import org.apache.geronimo.gshell.whisper.transport.Transport;
 import org.apache.geronimo.gshell.whisper.transport.TransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocator;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.handler.demux.DemuxingIoHandler;
-import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -58,16 +57,13 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=RshClient.class, instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=RshClient.class, instantiationStrategy="per-lookup")
 public class RshClient
     implements Initializable
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     @Requirement
-    private PlexusContainer container;
-
-    @Requirement
     private CryptoContext crypto;
     
     @Requirement
@@ -75,6 +71,9 @@
 
     private Transport transport;
 
+    @Requirement(role=ClientMessageHandler.class)
+    private List<ClientMessageHandler> handlers;
+
     public void initialize() throws InitializationException {
         new JaasConfigurationHelper("client.login.conf").initialize();
     }
@@ -229,26 +228,22 @@
         extends DemuxingIoHandler
     {
         public Handler() throws Exception {
-            // noinspection unchecked
-            List<ClientMessageHandler> handlers = (List<ClientMessageHandler>)container.lookupList(ClientMessageHandler.class);
-
             // Complain if we don't have any handlers
             if (handlers.isEmpty()) {
                 throw new Error("No message handlers were discovered");
             }
 
             for (ClientMessageHandler handler : handlers) {
-
                 register(handler);
             }
         }
 
-        public void register(final org.apache.geronimo.gshell.whisper.message.MessageHandler handler) {
+        public void register(final MessageHandler handler) {
             assert handler != null;
 
             Class<?> type = handler.getType();
 
-            log.debug("Registering handler: {} for type: {}", handler, type);
+            log.debug("Registering handler: {} -> {}", type.getSimpleName(), handler);
 
             // noinspection unchecked
             addMessageHandler(type, handler);

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RshCommand.java Sun Sep 30 11:52:39 2007
@@ -31,6 +31,7 @@
 import org.apache.geronimo.gshell.clp.Option;
 import org.apache.geronimo.gshell.command.CommandSupport;
 import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.geronimo.gshell.remote.client.proxy.RemoteShellProxy;
 import org.codehaus.plexus.component.annotations.Requirement;
 
 /**

Added: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java?rev=580765&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java Sun Sep 30 11:52:39 2007
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.remote.client.proxy;
+
+import java.io.File;
+
+import org.apache.geronimo.gshell.branding.Branding;
+import org.apache.geronimo.gshell.remote.client.RshClient;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class RemoteBrandingProxy
+    implements Branding
+{
+    private final RshClient client;
+
+    public RemoteBrandingProxy(final RshClient client) {
+        assert client != null;
+
+        this.client = client;
+    }
+
+    public File getUserDirectory() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public File getSharedDirectory() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getDisplayName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getProgramName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getAbout() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getVersion() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getWelcomeBanner() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getProfileScriptName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getInteractiveScriptName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getHistoryFileName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getPropertyName(String name) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getProperty(String name) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getProperty(String name, String defaultValue) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteBrandingProxy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java?rev=580765&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java Sun Sep 30 11:52:39 2007
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.remote.client.proxy;
+
+import org.apache.geronimo.gshell.command.IO;
+import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.remote.client.RshClient;
+import org.apache.geronimo.gshell.shell.Environment;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class RemoteEnvironmentProxy
+    implements Environment
+{
+    private final RshClient client;
+
+    public RemoteEnvironmentProxy(final RshClient client) {
+        assert client != null;
+
+        this.client = client;
+    }
+
+    public IO getIO() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Variables getVariables() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteEnvironmentProxy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java?rev=580765&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java Sun Sep 30 11:52:39 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.remote.client.proxy;
+
+import jline.History;
+import org.apache.geronimo.gshell.remote.client.RshClient;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class RemoteHistoryProxy
+    extends History
+{
+    private final RshClient client;
+
+    public RemoteHistoryProxy(final RshClient client) {
+        assert client != null;
+
+        this.client = client;
+    }
+}

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteHistoryProxy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java?rev=580765&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java Sun Sep 30 11:52:39 2007
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.remote.client.proxy;
+
+import java.io.File;
+import java.net.InetAddress;
+
+import org.apache.geronimo.gshell.remote.client.RshClient;
+import org.apache.geronimo.gshell.shell.ShellInfo;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class RemoteShellInfoProxy
+    implements ShellInfo
+{
+    private final RshClient client;
+
+    public RemoteShellInfoProxy(final RshClient client) {
+        assert client != null;
+
+        this.client = client;
+    }
+
+    public File getHomeDir() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public InetAddress getLocalHost() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getUserName() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellInfoProxy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java (from r580692, geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RemoteShellProxy.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java?p2=geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java&p1=geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RemoteShellProxy.java&r1=580692&r2=580765&rev=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/RemoteShellProxy.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java Sun Sep 30 11:52:39 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.remote.client;
+package org.apache.geronimo.gshell.remote.client.proxy;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -28,6 +28,7 @@
 import org.apache.geronimo.gshell.console.Console;
 import org.apache.geronimo.gshell.console.JLineConsole;
 import org.apache.geronimo.gshell.remote.RemoteShell;
+import org.apache.geronimo.gshell.remote.client.RshClient;
 import org.apache.geronimo.gshell.shell.Environment;
 import org.apache.geronimo.gshell.shell.InteractiveShell;
 import org.apache.geronimo.gshell.shell.ShellInfo;
@@ -55,6 +56,14 @@
 
     private boolean opened;
 
+    private RemoteEnvironmentProxy env;
+
+    private RemoteShellInfoProxy shellInfo;
+
+    private RemoteHistoryProxy history;
+
+    private RemoteBrandingProxy branding;
+
     public RemoteShellProxy(final RshClient client, final IO io, final Terminal terminal) throws Exception {
         assert client != null;
         assert io != null;
@@ -71,6 +80,12 @@
         
         client.openShell();
 
+        // Setup other proxies
+        env = new RemoteEnvironmentProxy(client);
+        shellInfo = new RemoteShellInfoProxy(client);
+        history = new RemoteHistoryProxy(client);
+        branding = new RemoteBrandingProxy(client);
+
         // Copy the client's input stream to our outputstream so users see command output
         outputFeeder = new StreamFeeder(client.getInputStream(), io.outputStream);
         outputFeeder.createThread().start();
@@ -80,14 +95,14 @@
 
     public Environment getEnvironment() {
         ensureOpened();
-        
-        throw new Error("TODO");
+
+        return env;
     }
 
     public ShellInfo getShellInfo() {
         ensureOpened();
 
-        throw new Error("TODO");
+        return shellInfo;
     }
 
     private void ensureOpened() {

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellProxy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java Sun Sep 30 11:52:39 2007
@@ -24,7 +24,6 @@
 import org.apache.geronimo.gshell.shell.Environment;
 import org.apache.geronimo.gshell.shell.ShellInfo;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=RemoteShell.class, instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=RemoteShell.class, instantiationStrategy="per-lookup")
 public class DefaultRemoteShell
     implements RemoteShell
 {

Modified: geronimo/sandbox/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/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RshServer.java Sun Sep 30 11:52:39 2007
@@ -33,9 +33,7 @@
 import org.apache.geronimo.gshell.whisper.transport.TransportServer;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.handler.demux.DemuxingIoHandler;
-import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,15 +43,12 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=RshServer.class, instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=RshServer.class, instantiationStrategy="per-lookup")
 public class RshServer
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     @Requirement
-    private PlexusContainer container;
-
-    @Requirement
     private TimeoutManager timeoutManager;
 
     @Requirement
@@ -61,6 +56,9 @@
 
     private TransportServer server;
 
+    @Requirement(role=ServerMessageHandler.class)
+    private List<ServerMessageHandler> handlers;
+
     public void bind(final URI location) throws Exception {
         TransportFactory factory = locator.locate(location);
 
@@ -83,16 +81,12 @@
         extends DemuxingIoHandler
     {
         public Handler() throws Exception {
-            // noinspection unchecked
-            List<ServerMessageHandler> handlers = (List<ServerMessageHandler>)container.lookupList(ServerMessageHandler.class);
-
             // Complain if we don't have any handlers
             if (handlers.isEmpty()) {
                 throw new Error("No message handlers were discovered");
             }
 
             for (ServerMessageHandler handler : handlers) {
-
                 register(handler);
             }
         }
@@ -102,7 +96,7 @@
 
             Class<?> type = handler.getType();
 
-            log.debug("Registering handler: {} for type: {}", handler, type);
+            log.debug("Registering handler: {} -> {}", type.getSimpleName(), handler);
 
             // noinspection unchecked
             addMessageHandler(type, handler);

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java Sun Sep 30 11:52:39 2007
@@ -52,7 +52,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=SSLContextFactory.class) // HACK: hint="bogus")
+@Component(role=SSLContextFactory.class, hint="bogus")
 public class BogusSSLContextFactory
     implements SSLContextFactory, Initializable
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java Sun Sep 30 11:52:39 2007
@@ -25,7 +25,6 @@
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
 import org.apache.mina.filter.SSLFilter;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.annotations.Requirement;
 
 /**
@@ -33,7 +32,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=Transport.class, hint="ssl", instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=Transport.class, hint="ssl", instantiationStrategy="per-lookup")
 public class SslTransport
     extends TcpTransport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java Sun Sep 30 11:52:39 2007
@@ -25,7 +25,6 @@
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
 import org.apache.mina.filter.SSLFilter;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 import org.codehaus.plexus.component.annotations.Requirement;
 
 /**
@@ -33,7 +32,7 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=TransportServer.class, hint="ssl", instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=TransportServer.class, hint="ssl", instantiationStrategy="per-lookup")
 public class SslTransportServer
     extends TcpTransportServer
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java Sun Sep 30 11:52:39 2007
@@ -26,14 +26,13 @@
 import org.apache.geronimo.gshell.whisper.transport.base.BaseTransport;
 import org.apache.mina.transport.socket.nio.SocketConnector;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 
 /**
  * Provides TCP client-side support.
  *
  * @version $Rev$ $Date$
  */
-@Component(role=Transport.class, hint="tcp", instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=Transport.class, hint="tcp", instantiationStrategy="per-lookup")
 public class TcpTransport
     extends BaseTransport<SocketConnector>
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java Sun Sep 30 11:52:39 2007
@@ -26,14 +26,13 @@
 import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportServer;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 
 /**
  * Provides TCP server-side support.
  *
  * @version $Rev$ $Date$
  */
-@Component(role=TransportServer.class, hint="tcp", instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=TransportServer.class, hint="tcp", instantiationStrategy="per-lookup")
 public class TcpTransportServer
     extends BaseTransportServer
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java Sun Sep 30 11:52:39 2007
@@ -23,14 +23,13 @@
 import org.apache.geronimo.gshell.whisper.transport.base.BaseTransport;
 import org.apache.mina.transport.vmpipe.VmPipeConnector;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 
 /**
  * Provides in-VM client-side support.
  *
  * @version $Rev$ $Date$
  */
-@Component(role=Transport.class, hint="vm", instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=Transport.class, hint="vm", instantiationStrategy="per-lookup")
 public class VmTransport
     extends BaseTransport<VmPipeConnector>
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java?rev=580765&r1=580764&r2=580765&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java Sun Sep 30 11:52:39 2007
@@ -23,14 +23,13 @@
 import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportServer;
 import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.InstantiationStrategy;
 
 /**
  * Provides in-VM server-side support.
  *
  * @version $Rev$ $Date$
  */
-@Component(role=TransportServer.class, hint="vm", instantiationStrategy=InstantiationStrategy.PER_LOOKUP)
+@Component(role=TransportServer.class, hint="vm", instantiationStrategy="per-lookup")
 public class VmTransportServer
     extends BaseTransportServer
 {



Mime
View raw message