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 2007/05/18 07:43:16 UTC

svn commit: r539264 - in /geronimo/sandbox/gshell/trunk: ./ gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/ gshell-server/gshell-server-telnet/ gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshel...

Author: jdillon
Date: Thu May 17 22:43:15 2007
New Revision: 539264

URL: http://svn.apache.org/viewvc?view=rev&rev=539264
Log:
(GSHELL-28) Replace NVT4J with telnetd, mostly working except for some key handling (like END/HOME/BACKSPACE)

Added:
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java   (with props)
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties   (with props)
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties   (with props)
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties   (with props)
Removed:
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ConsoleFactoryImpl.java
    geronimo/sandbox/gshell/trunk/repository/nvt4j/
Modified:
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/TerminalSupport.java
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml
    geronimo/sandbox/gshell/trunk/repository/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/TerminalSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/TerminalSupport.java?view=diff&rev=539264&r1=539263&r2=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/TerminalSupport.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/src/main/java/org/apache/geronimo/gshell/server/TerminalSupport.java Thu May 17 22:43:15 2007
@@ -124,6 +124,8 @@
         // TODO: Need to check if this is correct... arrow handling is a tad off
         //
 
+        log.info("Read virtual key: " + c);
+        
         // in Unix terminals, arrow keys are represented by
         // a sequence of 3 characters. E.g., the up arrow
         // key yields 27, 91, 68

Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml?view=diff&rev=539264&r1=539263&r2=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml Thu May 17 22:43:15 2007
@@ -40,19 +40,10 @@
             <artifactId>gshell-server-core</artifactId>
             <version>${version}</version>
         </dependency>
-
-        <!--
-        NOTE: May want to enhance xbean-telnet to behave like nvt4j and be more extendable than nvt4j
-
+        
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-telnet</artifactId>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>nvt4j</groupId>
-            <artifactId>nvt4j</artifactId>
+            <groupId>net.sourceforge.telnetd</groupId>
+            <artifactId>telnetd</artifactId>
         </dependency>
     </dependencies>
 

Added: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java?view=auto&rev=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java Thu May 17 22:43:15 2007
@@ -0,0 +1,132 @@
+/*
+ * 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.server.telnet;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+
+import net.wimpi.telnetd.net.Connection;
+import net.wimpi.telnetd.net.ConnectionEvent;
+import net.wimpi.telnetd.io.BasicTerminalIO;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import jline.Terminal;
+import jline.ConsoleReader;
+
+import org.apache.geronimo.gshell.console.JLineConsole;
+import org.apache.geronimo.gshell.console.IO;
+import org.apache.geronimo.gshell.Shell;
+import org.apache.geronimo.gshell.InteractiveShell;
+
+/**
+ * Adapter to integrate GShell as a TelnetD shell.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ShellImpl
+    implements net.wimpi.telnetd.shell.Shell
+{
+    private Log log = LogFactory.getLog(this.getClass());
+
+    //
+    // Shell
+    //
+    
+    public void run(final Connection connection) {
+        try {
+            doRun(connection);
+        }
+        catch (Exception e) {
+            log.error("Unhandled exception", e);
+        }
+    }
+
+    private void doRun(final Connection connection) throws Exception {
+        assert connection != null;
+        
+        connection.addConnectionListener(this);
+
+        BasicTerminalIO terminalIO = connection.getTerminalIO();
+        Terminal term = new TelnetTerminal(terminalIO);
+        IO io = new IO(createInputStream(terminalIO), createOutputStream(terminalIO));
+
+        ConsoleReader reader = new ConsoleReader(io.inputStream, io.out, /* bindings */ null, term);
+        JLineConsole console = new JLineConsole(io, reader);
+        Shell shell = new Shell(console.getIO());
+
+        InteractiveShell interp = new InteractiveShell(console, shell);
+        interp.run();
+    }
+
+    private InputStream createInputStream(final BasicTerminalIO io) {
+        return new InputStream() {
+            public int read() throws IOException {
+                return io.read();
+            }
+        };
+    }
+
+    private OutputStream createOutputStream(final BasicTerminalIO io) {
+        return new OutputStream() {
+            public void write(int b) throws IOException {
+                io.write((byte)b);
+            }
+        };
+    }
+
+    //
+    // ConnectionListener
+    //
+    
+    public void connectionIdle(final ConnectionEvent event) {
+        assert event != null;
+
+        log.info("Connection went idle: " + event);
+    }
+
+    public void connectionTimedOut(final ConnectionEvent event) {
+        assert event != null;
+
+        log.info("Connection timed out: " + event);
+    }
+
+    public void connectionLogoutRequest(final ConnectionEvent event) {
+        assert event != null;
+
+        log.info("Connection logout request: " + event);
+    }
+
+    public void connectionSentBreak(final ConnectionEvent event) {
+        assert event != null;
+        
+        log.info("Connection sent break: " + event);
+    }
+
+    //
+    // Factory Access
+    //
+
+    public static net.wimpi.telnetd.shell.Shell createShell() {
+        return new ShellImpl();
+    }
+}

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/ShellImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java?view=auto&rev=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java Thu May 17 22:43:15 2007
@@ -0,0 +1,82 @@
+/*
+ * 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.server.telnet;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+import net.wimpi.telnetd.io.BasicTerminalIO;
+
+import org.apache.geronimo.gshell.server.TerminalSupport;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class TelnetTerminal
+    extends TerminalSupport
+{
+    private BasicTerminalIO io;
+
+    public TelnetTerminal(final BasicTerminalIO io) {
+        assert io != null;
+
+        this.io = io;
+    }
+
+    public int getTerminalWidth() {
+        return io.getColumns();
+    }
+
+    public int getTerminalHeight() {
+        return io.getRows();
+    }
+
+    public int readVirtualKey(final InputStream in) throws IOException {
+        assert in != null;
+
+        int c = readCharacter(in);
+        
+        switch (c) {
+            case BasicTerminalIO.UP:
+                return CTRL_P;
+
+            case BasicTerminalIO.DOWN:
+                return CTRL_N;
+
+            case BasicTerminalIO.LEFT:
+                return CTRL_B;
+
+            case BasicTerminalIO.RIGHT:
+                return CTRL_F;
+
+            //
+            // TODO: HOME & END, backspace/delete
+            //
+        }
+        
+        if (c > 128) {
+            throw new IOException("UTF-8 not supported");
+        }
+
+        return c;
+    }
+}

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetTerminal.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java?view=auto&rev=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java Thu May 17 22:43:15 2007
@@ -0,0 +1,93 @@
+/*
+ * 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.server.telnet;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+
+import org.apache.geronimo.gshell.command.Command;
+import org.apache.geronimo.gshell.command.CommandSupport;
+import org.apache.geronimo.gshell.command.MessageSource;
+import org.apache.geronimo.gshell.command.CommandException;
+
+import java.net.Socket;
+import java.util.Properties;
+
+import net.wimpi.telnetd.TelnetD;
+
+/**
+ * Starts a Telnet shell server.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TelnetdCommand
+    extends CommandSupport
+{
+    private int port = 5057;
+
+    public TelnetdCommand() {
+        super("telnetd");
+    }
+
+    protected Options getOptions() {
+        MessageSource messages = getMessageSource();
+
+        Options options = super.getOptions();
+
+        options.addOption(OptionBuilder.withLongOpt("port")
+            .withDescription(messages.getMessage("cli.option.port"))
+            .hasArg()
+            .create('p'));
+
+        return options;
+    }
+
+    protected boolean processCommandLine(final CommandLine line) throws CommandException {
+        assert line != null;
+
+        if (line.hasOption('p')) {
+            String tmp = line.getOptionValue('p');
+            port = Integer.parseInt(tmp);
+        }
+
+        return false;
+    }
+
+    protected Object doExecute(final Object[] args) throws Exception {
+        assert args != null;
+
+        Properties props = new Properties();
+        props.load(getClass().getResourceAsStream("telnetd.properties"));
+
+        //
+        // TODO: Stuff in the port and other settings into the properties
+        //
+        
+        TelnetD telnetd = TelnetD.createTelnetD(props);
+        telnetd.start();
+
+        //
+        // TODO: Spit out something useful to indicate we are listening
+        //
+        
+        return Command.SUCCESS;
+    }
+}

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/java/org/apache/geronimo/gshell/server/telnet/TelnetdCommand.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties?view=auto&rev=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties (added)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties Thu May 17 22:43:15 2007
@@ -0,0 +1,32 @@
+##
+## 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.
+##
+
+##
+## $Rev$ $Date$
+##
+
+class=org.apache.geronimo.gshell.server.telnet.TelnetdCommand
+
+name=telnetd
+
+# aliases=
+
+category=/gshell/server
+
+enable=true
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/META-INF/org.apache.geronimo.gshell.command/telnetd.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties?view=auto&rev=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties (added)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties Thu May 17 22:43:15 2007
@@ -0,0 +1,44 @@
+##
+## 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.
+##
+
+##
+## $Rev$ $Date$
+##
+
+##
+## Option descriptions
+##
+
+cli.option.help=Display this help message
+
+cli.option.port=Use a specified port number
+
+##
+## Option usage (help)
+##
+
+cli.usage.description=Starts a telnet daemon
+
+cli.usage.footer=
+
+##
+## Information messages
+##
+
+info.listening=Listening for connections on port: %s
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/TelnetdCommandMessages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties?view=auto&rev=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties (added)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties Thu May 17 22:43:15 2007
@@ -0,0 +1,76 @@
+##
+## 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.
+##
+
+##
+## $Rev$ $Date$
+##
+
+# List of terminals available and defined below
+terminals=vt100,ansi,windoof,xterm
+
+# vt100 implementation and aliases
+term.vt100.class=net.wimpi.telnetd.io.terminal.vt100
+term.vt100.aliases=default,vt100-am,vt102,dec-vt100
+
+# ansi implementation and aliases
+term.ansi.class=net.wimpi.telnetd.io.terminal.ansi
+term.ansi.aliases=color-xterm,xterm-color,vt320,vt220,linux,screen
+
+# windoof implementation and aliases
+term.windoof.class=net.wimpi.telnetd.io.terminal.Windoof
+term.windoof.aliases=
+
+# xterm implementation and aliases
+term.xterm.class=net.wimpi.telnetd.io.terminal.xterm
+term.xterm.aliases=
+
+##################
+# Shells Section #
+##################
+
+# List of shells available and defined below
+shells=gshell
+
+# shell implementations
+shell.gshell.class=org.apache.geronimo.gshell.server.telnet.ShellImpl
+
+#####################
+# Listeners Section #
+#####################
+
+listeners=std
+
+#Basic listener and connection management settings
+std.port=6666
+std.floodprotection=5
+std.maxcon=25
+
+# Timeout Settings for connections (ms)
+std.time_to_warning=3600000
+std.time_to_timedout=60000
+
+# Housekeeping thread active every 1 secs
+std.housekeepinginterval=1000
+std.inputmode=character
+
+# Login shell
+std.loginshell=gshell
+
+# Connection filter class
+std.connectionfilter=none
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/src/main/resources/org/apache/geronimo/gshell/server/telnet/telnetd.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?view=diff&rev=539264&r1=539263&r2=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Thu May 17 22:43:15 2007
@@ -136,13 +136,13 @@
                 <artifactId>xbean-finder</artifactId>
                 <version>3.0</version>
             </dependency>
-
+            
             <dependency>
-                <groupId>nvt4j</groupId>
-                <artifactId>nvt4j</artifactId>
-                <version>1.0a1</version>
+                <groupId>net.sourceforge.telnetd</groupId>
+                <artifactId>telnetd</artifactId>
+                <version>2.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>picocontainer</groupId>
                 <artifactId>picocontainer</artifactId>

Modified: geronimo/sandbox/gshell/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/repository/pom.xml?view=diff&rev=539264&r1=539263&r2=539264
==============================================================================
--- geronimo/sandbox/gshell/trunk/repository/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/repository/pom.xml Thu May 17 22:43:15 2007
@@ -36,11 +36,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>nvt4j</groupId>
-            <artifactId>nvt4j</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>sshtools</groupId>
             <artifactId>j2ssh-core</artifactId>
             <version>0.2.7</version>
@@ -67,7 +62,6 @@
         <dependency>
             <groupId>net.sourceforge.telnetd</groupId>
             <artifactId>telnetd</artifactId>
-            <version>2.0</version>
         </dependency>
     </dependencies>