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/06/22 09:56:50 UTC
svn commit: r670317 - in /geronimo/gshell/trunk:
gshell-api/src/main/java/org/apache/geronimo/gshell/command/
gshell-api/src/main/java/org/apache/geronimo/gshell/shell/
gshell-api/src/main/java/org/apache/geronimo/gshell/util/
gshell-api/src/test/java/...
Author: jdillon
Date: Sun Jun 22 00:56:49 2008
New Revision: 670317
URL: http://svn.apache.org/viewvc?rev=670317&view=rev
Log:
Drop ShellContext, drop util package, clean up variables update
Added:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java (contents, props changed)
- copied, changed from r670219, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Arguments.java
geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java (contents, props changed)
- copied, changed from r670219, geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/util/ArgumentsTest.java
Removed:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellContext.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/
geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/util/
geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java
Modified:
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAction.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java
geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java
geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java
geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultLayoutManager.java
geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/ExecutingVisitor.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellContextProxy.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/DefaultRemoteShell.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java
geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java
Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java (from r670219, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Arguments.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Arguments.java&r1=670219&r2=670317&rev=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Arguments.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java Sun Jun 22 00:56:49 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.util;
+package org.apache.geronimo.gshell.command;
import java.lang.reflect.Array;
import java.util.List;
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Arguments.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAction.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAction.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandAction.java Sun Jun 22 00:56:49 2008
@@ -34,8 +34,8 @@
* @param context The execution context of the command.
* @return The result of the command execution.
*
- * @throws Exception Command execution failed.
- * @throws Notification Inform the shell of some non-exception exit state.
+ * @throws Notification Inform the shell of some non-exception exit state.
+ * @throws Exception Command execution failed.
*/
Object execute(CommandContext context) throws Notification, Exception;
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java Sun Jun 22 00:56:49 2008
@@ -21,12 +21,16 @@
import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* Provides a nested-namespace for command variables.
*
- * @version $Rev$ $Date$
+ * @version $Rev: 670220 $ $Date: 2008-06-21 23:24:57 +0700 (Sat, 21 Jun 2008) $
*/
public class Variables
{
@@ -192,7 +196,7 @@
/**
* Throw to indicate that a variable change was attempted but the variable was not muable.
*/
- class ImmutableVariableException
+ public class ImmutableVariableException
extends RuntimeException
{
///CLOVER:OFF
Modified: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java Sun Jun 22 00:56:49 2008
@@ -30,6 +30,8 @@
public interface Shell
extends CommandLineExecutor
{
+ // IO getIo(); ???
+
Variables getVariables();
/**
@@ -54,5 +56,5 @@
* @throws Exception Failed to execute commands.
* @throws UnsupportedOperationException The shell does not support iteractive execution.
*/
- void run(Object... args) throws UnsupportedOperationException, Exception;
+ void run(Object... args) throws Exception;
}
Copied: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java (from r670219, geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/util/ArgumentsTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java?p2=geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java&p1=geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/util/ArgumentsTest.java&r1=670219&r2=670317&rev=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/util/ArgumentsTest.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java Sun Jun 22 00:56:49 2008
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.geronimo.gshell.util;
+package org.apache.geronimo.gshell.command;
import junit.framework.TestCase;
+import org.apache.geronimo.gshell.command.Arguments;
/**
* Tests for the {@link Arguments} class.
Propchange: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ArgumentsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationContext.java Sun Jun 22 00:56:49 2008
@@ -21,7 +21,6 @@
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.Application;
-import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.command.Variables;
/**
Modified: geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java Sun Jun 22 00:56:49 2008
@@ -23,8 +23,8 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
+import org.apache.geronimo.gshell.command.Arguments;
import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.util.Arguments;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultCommandContainer.java Sun Jun 22 00:56:49 2008
@@ -22,7 +22,6 @@
import org.apache.geronimo.gshell.clp.CommandLineProcessor;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.clp.ProcessingException;
-import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandCompleter;
import org.apache.geronimo.gshell.command.CommandContainer;
@@ -31,7 +30,7 @@
import org.apache.geronimo.gshell.command.CommandResult;
import org.apache.geronimo.gshell.notification.Notification;
import org.apache.geronimo.gshell.plexus.GShellPlexusContainer;
-import org.apache.geronimo.gshell.util.Arguments;
+import org.apache.geronimo.gshell.command.Arguments;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java Sun Jun 22 00:56:49 2008
@@ -30,7 +30,7 @@
import org.apache.geronimo.gshell.io.SystemOutputHijacker;
import org.apache.geronimo.gshell.notification.ErrorNotification;
import org.apache.geronimo.gshell.notification.Notification;
-import org.apache.geronimo.gshell.util.Arguments;
+import org.apache.geronimo.gshell.command.Arguments;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultLayoutManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultLayoutManager.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultLayoutManager.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultLayoutManager.java Sun Jun 22 00:56:49 2008
@@ -35,7 +35,7 @@
*
* @version $Rev$ $Date$
*/
-@Component(role= LayoutManager.class)
+@Component(role=LayoutManager.class)
public class DefaultLayoutManager
implements LayoutManager
{
Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/ExecutingVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/ExecutingVisitor.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/ExecutingVisitor.java (original)
+++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/ExecutingVisitor.java Sun Jun 22 00:56:49 2008
@@ -29,7 +29,7 @@
import org.apache.geronimo.gshell.parser.ASTQuotedString;
import org.apache.geronimo.gshell.parser.CommandLineParserVisitor;
import org.apache.geronimo.gshell.parser.SimpleNode;
-import org.apache.geronimo.gshell.util.Arguments;
+import org.apache.geronimo.gshell.command.Arguments;
import org.apache.geronimo.gshell.command.Variables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellContextProxy.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellContextProxy.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellContextProxy.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/RemoteShellContextProxy.java Sun Jun 22 00:56:49 2008
@@ -22,7 +22,6 @@
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.remote.client.RshClient;
-import org.apache.geronimo.gshell.shell.ShellContext;
/**
* ???
@@ -30,7 +29,7 @@
* @version $Rev$ $Date$
*/
public class RemoteShellContextProxy
- implements ShellContext
+ // implements ShellContext
{
private final RshClient client;
Modified: 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/DefaultRemoteShell.java?rev=670317&r1=670316&r2=670317&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/DefaultRemoteShell.java Sun Jun 22 00:56:49 2008
@@ -19,11 +19,10 @@
package org.apache.geronimo.gshell.remote.server;
+import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
import org.apache.geronimo.gshell.remote.RemoteShell;
-import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.shell.ShellInfo;
-import org.apache.geronimo.gshell.command.Variables;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.slf4j.Logger;
@@ -47,22 +46,21 @@
private CommandLineExecutor executor;
// FIXME: Pull this from some manager's context
- @Requirement
- private ShellContext context;
+ // private ShellContext context;
private boolean opened = true;
public DefaultRemoteShell() {
}
- public DefaultRemoteShell(final ShellInfo shellInfo, final CommandLineExecutor executor, final ShellContext context) {
+ public DefaultRemoteShell(final ShellInfo shellInfo, final CommandLineExecutor executor/*, final ShellContext context*/) {
assert shellInfo != null;
assert executor != null;
- assert context != null;
+ // assert context != null;
this.shellInfo = shellInfo;
this.executor = executor;
- this.context = context;
+ // this.context = context;
}
private void ensureOpened() {
@@ -87,8 +85,10 @@
public Variables getVariables() {
ensureOpened();
-
- return context.getVariables();
+
+ throw new Error();
+
+ // return context.getVariables();
}
public ShellInfo getInfo() {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.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/OpenShellHandler.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java Sun Jun 22 00:56:49 2008
@@ -25,7 +25,6 @@
import org.apache.geronimo.gshell.remote.server.RemoteIO;
import org.apache.geronimo.gshell.remote.server.RemoteShellContainer;
import org.apache.geronimo.gshell.whisper.transport.Session;
-import org.apache.geronimo.gshell.rapture.shell.DefaultShellContext;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.component.annotations.Component;
@@ -54,14 +53,10 @@
// Setup the I/O context (w/o auto-flushing)
context.io = new RemoteIO(session);
- // FIXME: Need to find out what to do here, w/o this lookup
- // IOLookup.set(context.container, context.io);
-
- // Setup shell environemnt
- context.env = new DefaultShellContext(context.io);
- // FIXME: Need to find out what to do here, w/o this lookup
- // EnvironmentLookup.set(context.container, context.env);
+ // FIXME:
+ // context.variables =
+
// Create a new shell instance
context.shell = (RemoteShell) context.container.lookup(RemoteShell.class);
Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.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/ServerSessionContext.java?rev=670317&r1=670316&r2=670317&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java Sun Jun 22 00:56:49 2008
@@ -28,7 +28,6 @@
import org.apache.geronimo.gshell.remote.jaas.UserPrincipal;
import org.apache.geronimo.gshell.remote.server.RemoteIO;
import org.apache.geronimo.gshell.remote.server.RemoteShellContainer;
-import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.whisper.util.SessionAttributeBinder;
/**
@@ -64,7 +63,7 @@
public RemoteIO io;
- public ShellContext env;
+ // public RemoteVariables variables;
public RemoteShell shell;
}