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/09/20 10:59:29 UTC
svn commit: r697337 - in /geronimo/gshell/trunk:
gshell-api/src/main/java/org/apache/geronimo/gshell/command/
gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/
gshell-remote/gshell-remote-server/src/main/java/org/apache/ge...
Author: jdillon
Date: Sat Sep 20 01:59:28 2008
New Revision: 697337
URL: http://svn.apache.org/viewvc?rev=697337&view=rev
Log:
rsh-server command now boots up
Added:
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java (contents, props changed)
- copied, changed from r697034, geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java
Removed:
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java
geronimo/gshell/trunk/gshell-support/gshell-plexus/src/main/java/org/apache/geronimo/gshell/plexus/GShellPlexusContainer.java
geronimo/gshell/trunk/gshell-support/gshell-plexus/src/main/java/org/apache/geronimo/gshell/plexus/LookupFactorySupport.java
Modified:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResult.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/CloseShellHandler.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManager.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/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
geronimo/gshell/trunk/gshell-support/gshell-plexus/pom.xml
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResult.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResult.java?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResult.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandResult.java Sat Sep 20 01:59:28 2008
@@ -44,6 +44,9 @@
public CommandResult(final Object value) {
this(value, null, null);
+
+ assert value != null;
+ assert !(value instanceof Throwable);
}
public CommandResult(final Throwable failure) {
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java Sat Sep 20 01:59:28 2008
@@ -32,5 +32,7 @@
void activate();
+ // TODO: enable() disable() isEnabled()
+
// TODO: deactivate(), activate/deactiavate bundle?
}
\ No newline at end of file
Copied: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java (from r697034, geronimo/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/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java?p2=geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java&p1=geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java&r1=697034&r2=697337&rev=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java Sat Sep 20 01:59:28 2008
@@ -26,38 +26,28 @@
import org.apache.geronimo.gshell.io.IO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* Provides the server-side encapsulation of the basic shell bits to allow remote clients to invoke commands.
*
* @version $Rev$ $Date$
*/
-public class DefaultRemoteShell
+public class RemoteShellImpl
implements RemoteShell
{
private final Logger log = LoggerFactory.getLogger(getClass());
+ @Autowired
private ShellInfo shellInfo;
+ @Autowired
private CommandLineExecutor executor;
- // FIXME: Pull this from some manager's context
- // private ShellContext context;
-
private boolean opened = true;
- public DefaultRemoteShell() {}
+ public RemoteShellImpl() {}
- public DefaultRemoteShell(final ShellInfo shellInfo, final CommandLineExecutor executor/*, final ShellContext context*/) {
- assert shellInfo != null;
- assert executor != null;
- // assert context != null;
-
- this.shellInfo = shellInfo;
- this.executor = executor;
- // this.context = context;
- }
-
private void ensureOpened() {
if (!opened) {
throw new IllegalStateException("Not opened");
@@ -82,8 +72,6 @@
ensureOpened();
throw new Error();
-
- // return context.getVariables();
}
public ShellInfo getInfo() {
Propchange: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/RemoteShellImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/CloseShellHandler.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/CloseShellHandler.java?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/CloseShellHandler.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/CloseShellHandler.java Sat Sep 20 01:59:28 2008
@@ -47,6 +47,8 @@
context.container.close();
context.container = null;
+ // context.io = null;
+
//
// TODO: Send a meaningful response
//
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManager.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/TimeoutManager.java?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManager.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/timeout/TimeoutManager.java Sat Sep 20 01:59:28 2008
@@ -25,7 +25,7 @@
import org.apache.geronimo.gshell.whisper.transport.Session;
/**
- * ???
+ * Provides task timeout support.
*
* @version $Rev$ $Date$
*/
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=697337&r1=697336&r2=697337&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 Sat Sep 20 01:59:28 2008
@@ -33,7 +33,7 @@
import javax.annotation.PostConstruct;
/**
- * ???
+ * Default {@link TimeoutManager} implementation.
*
* @version $Rev$ $Date$
*/
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=697337&r1=697336&r2=697337&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 Sat Sep 20 01:59:28 2008
@@ -72,4 +72,6 @@
</constructor-arg>
</bean>
+ <bean class="org.apache.geronimo.gshell.remote.server.RemoteShellImpl" scope="prototype"/>
+
</beans>
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java Sat Sep 20 01:59:28 2008
@@ -55,6 +55,10 @@
log.debug("Prepare applciation context");
+ //
+ // FIXME: Need to refactor the BeanContainerImpl muck to allow some of this to be shared
+ //
+
container = new BeanContainer() {
public BeanContainer getParent() {
return null;
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java Sat Sep 20 01:59:28 2008
@@ -33,7 +33,7 @@
import org.apache.mina.handler.demux.MessageHandler;
/**
- * ???
+ * Tests a simple PING -> PONG message protocol over the VM transport.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-support/gshell-plexus/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-plexus/pom.xml?rev=697337&r1=697336&r2=697337&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-plexus/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-plexus/pom.xml Sat Sep 20 01:59:28 2008
@@ -50,11 +50,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
</dependencies>