Return-Path: 
 <scm-return-21781-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 4460 invoked from network); 6 Sep 2007 22:19:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Sep 2007 22:19:31 -0000
Received: (qmail 5332 invoked by uid 500); 6 Sep 2007 22:19:25 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 5177 invoked by uid 500); 6 Sep 2007 22:19:25 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 5166 invoked by uid 99); 6 Sep 2007 22:19:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 15:19:25 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 22:20:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2430C1A9832; Thu,  6 Sep 2007 15:19:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r573399 - in /geronimo/server/trunk: ./
 assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/
 assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/
 modules/geronimo-commands/ modules/geronimo-commands/src/main/groovy/org/a...
Date: Thu, 06 Sep 2007 22:19:05 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070906221906.2430C1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Thu Sep  6 15:19:03 2007
New Revision: 573399

URL: http://svn.apache.org/viewvc?rev=573399&view=rev
Log:
Update for the latest gshell changes

Added:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml   (with props)
    geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/
    geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml   (with props)
Removed:
    geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/plexus/
Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
    geronimo/server/trunk/modules/geronimo-commands/pom.xml
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml?rev=573399&r1=573398&r2=573399&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml Thu Sep  6 15:19:03 2007
@@ -159,13 +159,15 @@
                 <include>org.slf4j:slf4j-api</include>
                 <include>org.slf4j:slf4j-log4j12</include>
                 <include>org.slf4j:jcl104-over-slf4j</include>
-                <include>org.apache.geronimo.gshell:gshell-api</include>
+                <include>org.apache.geronimo.gshell:gshell-command-api</include>
                 <include>org.apache.geronimo.gshell:gshell-cli</include>
                 <include>org.apache.geronimo.gshell:gshell-core</include>
-                <include>org.apache.geronimo.gshell:gshell-clp</include>
-                <include>org.apache.geronimo.gshell:gshell-prefs</include>
-                <include>org.apache.geronimo.gshell:gshell-i18n</include>
-                <include>org.apache.geronimo.gshell:gshell-common</include>
+                <include>org.apache.geronimo.gshell:gshell-parser</include>
+                <include>org.apache.geronimo.gshell.support:gshell-ansi</include>
+                <include>org.apache.geronimo.gshell.support:gshell-clp</include>
+                <include>org.apache.geronimo.gshell.support:gshell-prefs</include>
+                <include>org.apache.geronimo.gshell.support:gshell-i18n</include>
+                <include>org.apache.geronimo.gshell.support:gshell-common</include>
                 <include>org.apache.geronimo.gshell:gshell-diet-log4j</include>
                 <include>org.apache.geronimo.gshell.commands:gshell-builtins</include>
                 <include>org.codehaus.plexus:plexus-utils</include>
@@ -173,7 +175,7 @@
                 <include>org.codehaus.plexus:plexus-container-default</include>
                 <include>org.codehaus.plexus:plexus-expression-evaluator</include>
                 <include>jline:jline</include>
-                <include>org.apache.xbean:xbean-finder</include>
+                <include>com.thoughtworks.xstream:xstream</include>
                 <include>org.codehaus.groovy:groovy-all</include>
                 <include>org.apache.ant:ant</include>
                 <include>org.apache.ant:ant-launcher</include>

Added: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml?rev=573399&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml Thu Sep  6 15:19:03 2007
@@ -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$ -->
+
+<layout>
+    <name>/</name>
+
+    <nodes>
+        <command>
+            <name>help</name>
+            <id>org.apache.geronimo.gshell.commands.buildins.HelpCommand</id>
+        </command>
+        
+        <alias>
+            <name>?</name>
+            <command>help</command>
+        </alias>
+        
+        <command>
+            <name>start-server</name>
+            <id>org.apache.geronimo.commands.StartServerCommand</id>
+        </command>
+        
+        <alias>
+            <name>start</name>
+            <command>start-server</command>
+        </alias>
+    </nodes>
+</layout>

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/underlay/etc/layout.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/pom.xml?rev=573399&r1=573398&r2=573399&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-commands/pom.xml Thu Sep  6 15:19:03 2007
@@ -52,7 +52,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-api</artifactId>
+            <artifactId>gshell-command-api</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java?rev=573399&r1=573398&r2=573399&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java Thu Sep  6 15:19:03 2007
@@ -27,7 +27,7 @@
 
 import org.slf4j.Logger;
 
-import org.apache.geronimo.gshell.console.IO;
+import org.apache.geronimo.gshell.command.IO;
 
 /**
  * Custom Ant builder to setup the desired output formatting.

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy?rev=573399&r1=573398&r2=573399&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy (original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy Thu Sep  6 15:19:03 2007
@@ -26,7 +26,7 @@
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-import org.apache.geronimo.gshell.console.IO
+import org.apache.geronimo.gshell.command.IO
 
 /**
  * Helper to execute a process and perform some verification logic to determine if the process is up or not.

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=573399&r1=573398&r2=573399&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy (original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Thu Sep  6 15:19:03 2007
@@ -21,6 +21,7 @@
 
 import org.apache.geronimo.gshell.command.CommandSupport
 import org.apache.geronimo.gshell.command.CommandException
+import org.apache.geronimo.gshell.command.annotation.CommandComponent
 
 import org.apache.geronimo.gshell.clp.Option
 
@@ -34,6 +35,7 @@
  *
  * @version $Id$
  */
+@CommandComponent(id='start-server')
 class StartServerCommand
     extends CommandSupport
 {
@@ -125,10 +127,6 @@
     
     String password = 'manager'
     
-    StartServerCommand() {
-        super('start-server')
-    }
-    
     private File getJavaAgentJar() {
         def file = new File(geronimoHome, 'bin/jpa.jar')
         
@@ -149,7 +147,6 @@
     }
     
     protected Object doExecute() throws Exception {
-        def io = getIO()
         ant = new AntBuilder(log, io)
         
         if (!geronimoHome) {
@@ -280,13 +277,15 @@
             return
         }
         
+        def name = context.commandDescriptor.id
+        
         def scanner = ant.fileScanner {
             fileset(dir: basedir) {
-                include(name: "${this.name},*.groovy")
+                include(name: "${name},*.groovy")
             }
         }
         
-        def binding = new Binding([command: this, log: log, io: getIO()])
+        def binding = new Binding([command: this, log: log, io: io])
         def shell = new GroovyShell(binding)
         
         for (file in scanner) {

Added: geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml?rev=573399&view=auto
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml (added)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml Thu Sep  6 15:19:03 2007
@@ -0,0 +1,30 @@
+<?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$ -->
+
+<command-set>
+    <commands>
+        <command>
+            <id>start-server</id>
+            <implementation>org.apache.geronimo.commands.StartServerCommand</implementation>
+        </command>
+    </commands>
+</command-set>

Propchange: geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-commands/src/main/resources/META-INF/gshell/commands.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=573399&r1=573398&r2=573399&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Sep  6 15:19:03 2007
@@ -1471,7 +1471,7 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
-                <artifactId>gshell-api</artifactId>
+                <artifactId>gshell-command-api</artifactId>
                 <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>