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/28 19:51:43 UTC

svn commit: r699867 - in /geronimo/gshell/trunk: ./ gshell-support/ gshell-support/gshell-ansi/ gshell-support/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ gshell-support/gshell-console/ gshell-support/gshell-event/src/main/java/org/apache/...

Author: jdillon
Date: Sun Sep 28 10:51:42 2008
New Revision: 699867

URL: http://svn.apache.org/viewvc?rev=699867&view=rev
Log:
Adding gshell-terminal module, which will hold jline abstration/hacks/whatever
Fixed up the artifact exclusions in app and plugin mgrs

Added:
    geronimo/gshell/trunk/gshell-support/gshell-terminal/
    geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml   (with props)
    geronimo/gshell/trunk/gshell-support/gshell-terminal/src/
    geronimo/gshell/trunk/gshell-support/gshell-terminal/src/main/
    geronimo/gshell/trunk/gshell-support/gshell-terminal/src/main/java/
    geronimo/gshell/trunk/gshell-support/gshell-terminal/src/main/resources/
Modified:
    geronimo/gshell/trunk/gshell-support/gshell-ansi/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java
    geronimo/gshell/trunk/gshell-support/gshell-console/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-event/src/main/java/org/apache/geronimo/gshell/event/EventManagerImpl.java
    geronimo/gshell/trunk/gshell-support/pom.xml
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-support/gshell-ansi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ansi/pom.xml?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ansi/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ansi/pom.xml Sun Sep 28 10:51:42 2008
@@ -44,8 +44,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-terminal</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/gshell/trunk/gshell-support/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java Sun Sep 28 10:51:42 2008
@@ -41,6 +41,10 @@
     private CommandLineProcessor processor;
 
     //
+    // FIXME: Refactor all this stuff to simplify the API
+    //
+    
+    //
     // TODO: Combine these into 1 dynamic MS
     //
 

Modified: geronimo/gshell/trunk/gshell-support/gshell-console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-console/pom.xml?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-console/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-console/pom.xml Sun Sep 28 10:51:42 2008
@@ -50,10 +50,10 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-terminal</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.gshell.support</groupId>
             <artifactId>gshell-io</artifactId>

Modified: geronimo/gshell/trunk/gshell-support/gshell-event/src/main/java/org/apache/geronimo/gshell/event/EventManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-event/src/main/java/org/apache/geronimo/gshell/event/EventManagerImpl.java?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-event/src/main/java/org/apache/geronimo/gshell/event/EventManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-event/src/main/java/org/apache/geronimo/gshell/event/EventManagerImpl.java Sun Sep 28 10:51:42 2008
@@ -44,7 +44,7 @@
     public void addListener(final EventListener listener) {
         assert listener != null;
 
-        log.debug("Adding listener: {}", listener);
+        log.trace("Adding listener: {}", listener);
 
         synchronized (listeners) {
             listeners.add(listener);
@@ -54,7 +54,7 @@
     public void removeListneer(final EventListener listener) {
         assert listener != null;
         
-        log.debug("Removing listener: {}", listener);
+        log.trace("Removing listener: {}", listener);
 
         synchronized (listeners) {
             listeners.remove(listener);

Added: geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml?rev=699867&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml Sun Sep 28 10:51:42 2008
@@ -0,0 +1,47 @@
+<?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.support</groupId>
+        <artifactId>gshell-support</artifactId>
+        <version>1.0-alpha-2-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>gshell-terminal</artifactId>
+    <name>GShell Support :: Terminal</name>
+    
+    <description>
+        Terminal abstraction.
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-terminal/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Sun Sep 28 10:51:42 2008
@@ -42,6 +42,7 @@
     <modules>
         <module>gshell-yarn</module>
         <module>gshell-chronos</module>
+        <module>gshell-terminal</module>
         <module>gshell-ansi</module>
         <module>gshell-artifact</module>
         <module>gshell-clp</module>

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java Sun Sep 28 10:51:42 2008
@@ -215,6 +215,7 @@
             "gshell-application",
             "gshell-cli",
             "gshell-clp",
+            "gshell-chronos",
             "gshell-i18n",
             "gshell-io",
             "gshell-model",
@@ -223,6 +224,7 @@
             "gshell-yarn",
             "gshell-interpolation",
             "jcl104-over-slf4j",
+            "gshell-terminal",
             "jline",
             "log4j",
             "maven-artifact",

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java Sun Sep 28 10:51:42 2008
@@ -149,6 +149,10 @@
 
         filter.add(new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME));
 
+        //
+        // FIXME: Need to inherit some of this crap from the applications exclusions!
+        //
+        
         filter.add(new ExclusionSetFilter(new String[] {
             "aopalliance",
             "geronimo-annotation_1.0_spec",
@@ -163,6 +167,9 @@
             "gshell-yarn",
             "gshell-interpolation",
             "gshell-layout",
+            "gshell-terminal",
+            "gshell-console",
+            "gshell-chronos",
             "jcl104-over-slf4j",
             "jline",
             "plexus-classworlds",

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=699867&r1=699866&r2=699867&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Sun Sep 28 10:51:42 2008
@@ -470,6 +470,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>
+                <artifactId>gshell-terminal</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.gshell.support</groupId>
                 <artifactId>gshell-ansi</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>