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/06 21:57:40 UTC
svn commit: r573351 - in /geronimo/sandbox/gshell/trunk: gshell-cli/pom.xml
gshell-commands/gshell-bsf/pom.xml gshell-console/ gshell-core/pom.xml
gshell-core/src/main/java/org/apache/geronimo/gshell/console/ pom.xml
Author: jdillon
Date: Thu Sep 6 12:57:39 2007
New Revision: 573351
URL: http://svn.apache.org/viewvc?rev=573351&view=rev
Log:
Merge gshell-console back into gshell-core
Added:
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/console/
- copied from r573345, geronimo/sandbox/gshell/trunk/gshell-console/src/main/java/org/apache/geronimo/gshell/console/
Removed:
geronimo/sandbox/gshell/trunk/gshell-console/
Modified:
geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/pom.xml
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=573351&r1=573350&r2=573351&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Thu Sep 6 12:57:39 2007
@@ -40,12 +40,6 @@
<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-commands/gshell-bsf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/pom.xml?rev=573351&r1=573350&r2=573351&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/pom.xml Thu Sep 6 12:57:39 2007
@@ -46,15 +46,6 @@
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-console</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!--
- NOTE: Currently only here to pick some the Jline conosole bits which should eventually be relocated.
- -->
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-core</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=573351&r1=573350&r2=573351&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Thu Sep 6 12:57:39 2007
@@ -43,13 +43,7 @@
<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>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-parser</artifactId>
@@ -69,6 +63,11 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
</dependency>
<dependency>
Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=573351&r1=573350&r2=573351&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Thu Sep 6 12:57:39 2007
@@ -338,7 +338,6 @@
<module>gshell-prefs</module>
<module>gshell-ansi</module>
<module>gshell-bootstrap</module>
- <module>gshell-console</module>
<module>gshell-api</module>
<module>javacc-maven-plugin</module>
<module>gshell-parser</module>