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/09/03 00:51:04 UTC
svn commit: r572182 - in /geronimo/sandbox/gshell/trunk: ./ gshell-cli/
gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/ gshell-console/
gshell-console/src/ gshell-console/src/main/ gshell-console/src/main/java/
gshell-console/src/main/java/org...
Author: jdillon
Date: Sun Sep 2 15:51:00 2007
New Revision: 572182
URL: http://svn.apache.org/viewvc?rev=572182&view=rev
Log:
Move console bits to gshell-console module, drop shell depenedncy
Added:
geronimo/sandbox/gshell/trunk/gshell-console/
geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt (with props)
geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt (with props)
geronimo/sandbox/gshell/trunk/gshell-console/pom.xml (with props)
geronimo/sandbox/gshell/trunk/gshell-console/src/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java (contents, props changed)
- copied, changed from r572178, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellRunner.java
geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java (with props)
geronimo/sandbox/gshell/trunk/gshell-console/src/main/resources/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/resources/org/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/resources/org/apache/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/resources/org/apache/geronimo/
geronimo/sandbox/gshell/trunk/gshell-console/src/main/resources/org/apache/geronimo/gshell/
geronimo/sandbox/gshell/trunk/gshell-console/src/test/
geronimo/sandbox/gshell/trunk/gshell-console/src/test/java/
geronimo/sandbox/gshell/trunk/gshell-console/src/test/java/org/
geronimo/sandbox/gshell/trunk/gshell-console/src/test/java/org/apache/
geronimo/sandbox/gshell/trunk/gshell-console/src/test/java/org/apache/geronimo/
geronimo/sandbox/gshell/trunk/gshell-console/src/test/java/org/apache/geronimo/gshell/
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java (contents, props changed)
- copied, changed from r572178, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineShellRunner.java
Removed:
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineShellRunner.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellRunner.java
Modified:
geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
geronimo/sandbox/gshell/trunk/pom.xml
Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?rev=572182&r1=572181&r2=572182&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Sun Sep 2 15:51:00 2007
@@ -40,6 +40,12 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-console</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-core</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=572182&r1=572181&r2=572182&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Sun Sep 2 15:51:00 2007
@@ -24,14 +24,14 @@
import jline.Terminal;
import org.apache.geronimo.gshell.ExitNotification;
-import org.apache.geronimo.gshell.JLineShellRunner;
+import org.apache.geronimo.gshell.JLineConsole;
import org.apache.geronimo.gshell.Shell;
-import org.apache.geronimo.gshell.ShellRunner;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.CommandLineProcessor;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.clp.Printer;
import org.apache.geronimo.gshell.common.StopWatch;
+import org.apache.geronimo.gshell.console.Console;
import org.apache.geronimo.gshell.console.IO;
import org.apache.geronimo.gshell.util.Banner;
import org.apache.geronimo.gshell.util.Version;
@@ -224,10 +224,8 @@
else if (interactive) {
log.debug("Starting interactive console");
- JLineShellRunner runner = new JLineShellRunner(shell);
-
- runner.setExecutor(new ShellRunner.Executor() {
- public Result execute(Shell shell, String line) throws Exception {
+ Console.Executor executor = new Console.Executor() {
+ public Result execute(String line) throws Exception {
try {
Object result = shell.execute(line);
}
@@ -237,9 +235,11 @@
return Result.CONTINUE;
}
- });
+ };
+
+ JLineConsole runner = new JLineConsole(executor, shell);
- runner.setErrorHandler(new ShellRunner.ErrorHandler() {
+ runner.setErrorHandler(new Console.ErrorHandler() {
public Result handleError(Throwable error) {
log.error("Execution failed: " + error, error);
Added: geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt?rev=572182&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt Sun Sep 2 15:51:00 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt?rev=572182&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt (added)
+++ geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt Sun Sep 2 15:51:00 2007
@@ -0,0 +1,11 @@
+=========================================================================
+== NOTICE file corresponding to section 4(d) of the Apache License, ==
+== Version 2.0, in this case for the Apache Geronimo distribution. ==
+=========================================================================
+
+Apache Geronimo
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/gshell/trunk/gshell-console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-console/pom.xml?rev=572182&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-console/pom.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-console/pom.xml Sun Sep 2 15:51:00 2007
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>gshell-console</artifactId>
+ <name>GShell Console</name>
+
+ <description>
+ Console abstraction muck.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java (from r572178, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellRunner.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java?p2=geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellRunner.java&r1=572178&r2=572182&rev=572182&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellRunner.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java Sun Sep 2 15:51:00 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.console;
import java.io.IOException;
@@ -25,17 +25,15 @@
import org.slf4j.LoggerFactory;
/**
- * Support for running a {@link Shell}.
+ * Provides an abstraction of a console.
*
* @version $Rev$ $Date$
*/
-public abstract class ShellRunner
+public abstract class Console
implements Runnable
{
protected final Logger log = LoggerFactory.getLogger(getClass());
- protected final Shell shell;
-
protected boolean running = false;
protected boolean breakOnNull = true;
@@ -50,23 +48,18 @@
}
};
- protected Executor executor = new Executor() {
- public Result execute(final Shell shell, final String line) throws Exception {
- Object result = shell.execute(line);
- return Result.CONTINUE;
- }
- };
-
+ protected Executor executor;
+
protected ErrorHandler errorHandler = new ErrorHandler() {
public Result handleError(Throwable error) {
return Result.STOP;
}
};
- public ShellRunner(final Shell shell) {
- assert shell != null;
+ public Console(final Executor executor) {
+ assert executor != null;
- this.shell = shell;
+ this.executor = executor;
}
public boolean isRunning() {
@@ -134,9 +127,6 @@
try {
running = work();
}
- catch (ExitNotification n) {
- throw n;
- }
catch (Throwable t) {
log.debug("Work failed: {}", t);
@@ -193,7 +183,7 @@
}
// Execute the line
- Executor.Result result = executor.execute(shell, line);
+ Executor.Result result = executor.execute(line);
// Allow executor to request that the loop stop
if (result == Executor.Result.STOP) {
@@ -226,7 +216,7 @@
STOP
}
- Result execute(Shell shell, String line) throws Exception;
+ Result execute(String line) throws Exception;
}
//
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/Console.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java?rev=572182&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java (added)
+++ geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java Sun Sep 2 15:51:00 2007
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * Console handling muck.
+ *
+ * @version $Rev$ $Date$
+ */
+package org.apache.geronimo.gshell;
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=572182&r1=572181&r2=572182&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Sun Sep 2 15:51:00 2007
@@ -43,7 +43,13 @@
<artifactId>gshell-api</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-console</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java (from r572178, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineShellRunner.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineShellRunner.java&r1=572178&r2=572182&rev=572182&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineShellRunner.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java Sun Sep 2 15:51:00 2007
@@ -26,6 +26,7 @@
import jline.ConsoleReader;
import jline.History;
+import org.apache.geronimo.gshell.console.Console;
import org.apache.geronimo.gshell.console.IO;
/**
@@ -33,8 +34,8 @@
*
* @version $Rev$ $Date$
*/
-public class JLineShellRunner
- extends ShellRunner
+public class JLineConsole
+ extends Console
{
private final ConsoleReader reader;
@@ -44,8 +45,8 @@
// TODO: Pass in the terminal instance to be used
//
- public JLineShellRunner(final Shell shell) throws IOException {
- super(shell);
+ public JLineConsole(final Executor executor, final Shell shell) throws IOException {
+ super(executor);
IO io = shell.getIO();
this.reader = new ConsoleReader(io.inputStream, new PrintWriter(io.outputStream, true));
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/JLineConsole.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=572182&r1=572181&r2=572182&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Sun Sep 2 15:51:00 2007
@@ -312,6 +312,7 @@
<module>gshell-ansi</module>
<module>gshell-bootstrap</module>
<module>javacc-maven-plugin</module>
+ <module>gshell-console</module>
<module>gshell-api</module>
<module>gshell-parser</module>
<module>gshell-layout</module>