Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 32926 invoked from network); 21 Jun 2008 17:46:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jun 2008 17:46:46 -0000 Received: (qmail 14637 invoked by uid 500); 21 Jun 2008 17:46:48 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 14627 invoked by uid 500); 21 Jun 2008 17:46:48 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 14606 invoked by uid 99); 21 Jun 2008 17:46:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jun 2008 10:46:48 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jun 2008 17:46:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B5BF923889BA; Sat, 21 Jun 2008 10:46:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r670239 - in /geronimo/gshell/trunk: ./ gshell-api/src/main/java/org/apache/geronimo/gshell/command/ gshell-api/src/test/java/org/apache/geronimo/gshell/command/ gshell-assembly/ gshell-assembly/src/main/underlay/etc/ gshell-cli/ gshell-cli... Date: Sat, 21 Jun 2008 17:46:23 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080621174624.B5BF923889BA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Sat Jun 21 10:46:22 2008 New Revision: 670239 URL: http://svn.apache.org/viewvc?rev=670239&view=rev Log: Finish splitting up rapture to allow plexus to work again as a container Added: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/ geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/java/org/apache/geronimo/gshell/rapture/command/DefaultVariablesTest.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java (props changed) - copied unchanged from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java (props changed) - copied unchanged from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java (props changed) - copied unchanged from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java (contents, props changed) - copied, changed from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java (props changed) - copied unchanged from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java (props changed) - copied unchanged from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java Removed: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/test/java/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/test/resources/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/application/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/builder/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/command/DefaultVariables.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/plugin/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/java/org/apache/geronimo/gshell/rapture/builder/ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/java/org/apache/geronimo/gshell/rapture/command/DefaultVariablesTest.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/resources/ Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml geronimo/gshell/trunk/gshell-cli/pom.xml geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/pom.xml geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml geronimo/gshell/trunk/pom.xml Added: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java?rev=670239&view=auto ============================================================================== --- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java (added) +++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/Variables.java Sat Jun 21 10:46:22 2008 @@ -0,0 +1,204 @@ +/* + * 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.command; + +import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder; + +import java.util.*; + +/** + * Provides a nested-namespace for command variables. + * + * @version $Rev$ $Date$ + */ +public class Variables +{ + private final Map map; + + private final Variables parent; + + private final Set immutables = new HashSet(); + + public Variables(final Map map, final Variables parent) { + assert map != null; + assert parent != null; + + this.map = map; + this.parent = parent; + } + + public Variables(final Variables parent) { + assert parent != null; + + this.map = new HashMap(); + this.parent = parent; + } + + public Variables(final Map map) { + assert map != null; + + this.map = map; + this.parent = null; + } + + public Variables() { + this(new HashMap()); + } + + public String toString() { + return ReflectionToStringBuilder.toString(this); + } + + public void set(final String name, final Object value) { + set(name, value, true); + } + + public void set(final String name, final Object value, boolean mutable) { + assert name != null; + + ensureMutable(name); + + map.put(name, value); + + if (!mutable) { + immutables.add(name); + } + } + + public Object get(final String name) { + assert name != null; + + Object value = map.get(name); + if (value == null && parent != null) { + value = parent.get(name); + } + + return value; + } + + public Object get(final String name, final Object _default) { + Object value = get(name); + if (value == null) { + return _default; + } + + return value; + } + + public void unset(final String name) { + assert name != null; + + ensureMutable(name); + + map.remove(name); + } + + public boolean contains(final String name) { + assert name != null; + + return map.containsKey(name); + } + + public boolean isMutable(final String name) { + assert name != null; + + boolean mutable = true; + + // First ask out parent if there is one, if they are immutable, then so are we + if (parent != null) { + mutable = parent.isMutable(name); + } + + if (mutable) { + mutable = !immutables.contains(name); + } + + return mutable; + } + + private void ensureMutable(final String name) { + assert name != null; + + if (!isMutable(name)) { + throw new ImmutableVariableException(name); + } + } + + public boolean isCloaked(final String name) { + assert name != null; + + int count = 0; + + Variables vars = this; + while (vars != null && count < 2) { + if (vars.contains(name)) { + count++; + } + + vars = vars.parent(); + } + + return count > 1; + } + + public Iterator names() { + // Chain to parent iterator if we have a parent + return new Iterator() { + Iterator iter = map.keySet().iterator(); + boolean more = parent() != null; + + public boolean hasNext() { + boolean next = iter.hasNext(); + if (!next && more) { + iter = parent().names(); + more = false; + next = hasNext(); + } + + return next; + } + + public String next() { + return iter.next(); + } + + public void remove() { + throw new UnsupportedOperationException(); + } + }; + } + + public Variables parent() { + return parent; + } + + /** + * Throw to indicate that a variable change was attempted but the variable was not muable. + */ + class ImmutableVariableException + extends RuntimeException + { + ///CLOVER:OFF + + public ImmutableVariableException(final String name) { + super("Variable is immutable: " + name); + } + } +} Copied: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/java/org/apache/geronimo/gshell/rapture/command/DefaultVariablesTest.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java?p2=geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/java/org/apache/geronimo/gshell/rapture/command/DefaultVariablesTest.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/test/java/org/apache/geronimo/gshell/rapture/command/DefaultVariablesTest.java (original) +++ geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java Sat Jun 21 10:46:22 2008 @@ -17,24 +17,27 @@ * under the License. */ -package org.apache.geronimo.gshell.rapture.command; +package org.apache.geronimo.gshell.command; import junit.framework.TestCase; -import org.apache.geronimo.gshell.command.Variables; -import org.apache.geronimo.gshell.rapture.command.DefaultVariables; import java.util.Iterator; /** - * Unit tests for the {@link DefaultVariables} class. + * Unit tests for the {@link Variables} class. * * @version $Rev$ $Date$ */ -public class DefaultVariablesTest +public class VariablesTest extends TestCase { + private Variables vars; + + protected void setUp() throws Exception { + vars = new Variables(); + } + public void testSet() throws Exception { - DefaultVariables vars = new DefaultVariables(); String name = "a"; Object value = new Object(); @@ -50,7 +53,6 @@ } public void testSetAsImmutable() throws Exception { - DefaultVariables vars = new DefaultVariables(); String name = "a"; Object value = new Object(); @@ -68,8 +70,8 @@ } public void testSetAsImmutableInParent() throws Exception { - Variables parent = new DefaultVariables(); - DefaultVariables vars = new DefaultVariables(parent); + Variables parent = new Variables(); + Variables vars = new Variables(parent); String name = "a"; Object value = new Object(); @@ -87,8 +89,8 @@ } public void testSetParentFromChild() throws Exception { - Variables parent = new DefaultVariables(); - DefaultVariables vars = new DefaultVariables(parent); + Variables parent = new Variables(); + Variables vars = new Variables(parent); String name = "a"; Object value = new Object(); @@ -101,7 +103,6 @@ } public void testGet() throws Exception { - DefaultVariables vars = new DefaultVariables(); String name = "a"; Object value = new Object(); @@ -114,7 +115,6 @@ } public void testGetUsingDefault() throws Exception { - DefaultVariables vars = new DefaultVariables(); String name = "a"; Object value = new Object(); @@ -126,8 +126,8 @@ } public void testGetCloaked() throws Exception { - Variables parent = new DefaultVariables(); - DefaultVariables vars = new DefaultVariables(parent); + Variables parent = new Variables(); + Variables vars = new Variables(parent); String name = "a"; Object value = new Object(); @@ -144,7 +144,6 @@ } public void testUnsetAsImmutable() throws Exception { - DefaultVariables vars = new DefaultVariables(); String name = "a"; Object value = new Object(); @@ -162,8 +161,8 @@ } public void testUnsetAsImmutableInParent() throws Exception { - Variables parent = new DefaultVariables(); - DefaultVariables vars = new DefaultVariables(parent); + Variables parent = new Variables(); + Variables vars = new Variables(parent); String name = "a"; Object value = new Object(); @@ -181,8 +180,8 @@ } public void testCloaking() throws Exception { - Variables parent = new DefaultVariables(); - DefaultVariables vars = new DefaultVariables(parent); + Variables parent = new Variables(); + Variables vars = new Variables(parent); String name = "a"; Object value = new Object(); @@ -195,24 +194,22 @@ } public void testParent() throws Exception { - Variables parent = new DefaultVariables(); + Variables parent = new Variables(); assertNull(parent.parent()); - DefaultVariables vars = new DefaultVariables(parent); + Variables vars = new Variables(parent); assertNotNull(vars.parent()); assertEquals(parent, vars.parent()); } public void testNames() throws Exception { - DefaultVariables vars = new DefaultVariables(); Iterator iter = vars.names(); assertNotNull(iter); assertFalse(iter.hasNext()); } public void testNamesImmutable() throws Exception { - DefaultVariables vars = new DefaultVariables(); vars.set("a", "b"); Iterator iter = vars.names(); Propchange: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-api/src/test/java/org/apache/geronimo/gshell/command/VariablesTest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/gshell/trunk/gshell-assembly/pom.xml URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/pom.xml?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-assembly/pom.xml (original) +++ geronimo/gshell/trunk/gshell-assembly/pom.xml Sat Jun 21 10:46:22 2008 @@ -50,8 +50,8 @@ - org.apache.geronimo.gshell - gshell-rapture + org.apache.geronimo.gshell.rapture + gshell-rapture-bootstrap Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original) +++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Sat Jun 21 10:46:22 2008 @@ -45,17 +45,15 @@ - - + org.apache.geronimo.gshell.commands 1.0-alpha-2-SNAPSHOT Modified: geronimo/gshell/trunk/gshell-cli/pom.xml URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/pom.xml?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-cli/pom.xml (original) +++ geronimo/gshell/trunk/gshell-cli/pom.xml Sat Jun 21 10:46:22 2008 @@ -49,8 +49,8 @@ - org.apache.geronimo.gshell - gshell-rapture + org.apache.geronimo.gshell.rapture + gshell-rapture-bootstrap Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original) +++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Sat Jun 21 10:46:22 2008 @@ -31,7 +31,7 @@ import org.apache.geronimo.gshell.model.application.Application; import org.apache.geronimo.gshell.model.settings.Settings; import org.apache.geronimo.gshell.application.settings.SettingsLocator; -import org.apache.geronimo.gshell.rapture.builder.ShellBuilder; +import org.apache.geronimo.gshell.rapture.ShellBuilder; import org.codehaus.plexus.classworlds.ClassWorld; import java.util.ArrayList; Copied: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java?p2=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/builder/ShellBuilder.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java Sat Jun 21 10:46:22 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.geronimo.gshell.rapture.builder; +package org.apache.geronimo.gshell.rapture; import org.apache.geronimo.gshell.application.ApplicationConfiguration; import org.apache.geronimo.gshell.application.ApplicationManager; @@ -34,7 +34,6 @@ import org.apache.geronimo.gshell.application.settings.SettingsManager; import org.apache.geronimo.gshell.shell.Shell; import org.apache.geronimo.gshell.shell.ShellFactory; -import org.apache.geronimo.gshell.rapture.command.DefaultVariables; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.DefaultContainerConfiguration; import org.codehaus.plexus.PlexusContainerException; @@ -202,7 +201,7 @@ applicationConfig.setIo(new IO()); } if (applicationConfig.getVariables() == null) { - applicationConfig.setVariables(new DefaultVariables()); + applicationConfig.setVariables(new Variables()); } // Hijack the system output streams Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/ShellBuilder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java?p2=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java Sat Jun 21 10:46:22 2008 @@ -34,10 +34,10 @@ import org.apache.geronimo.gshell.model.interpolate.InterpolatorSupport; import org.apache.geronimo.gshell.model.settings.Settings; import org.apache.geronimo.gshell.plexus.GShellPlexusContainer; -import org.apache.geronimo.gshell.rapture.plugin.PluginCollector; -import org.apache.geronimo.gshell.rapture.plugin.PluginDiscoverer; import org.apache.geronimo.gshell.application.settings.SettingsManager; import org.apache.geronimo.gshell.shell.Shell; +import org.apache.geronimo.gshell.rapture.plugin.PluginDiscoverer; +import org.apache.geronimo.gshell.rapture.plugin.PluginCollector; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultApplicationManager.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/application/DefaultSettingsManager.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandActionDescriptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java Sat Jun 21 10:46:22 2008 @@ -21,7 +21,6 @@ import org.apache.geronimo.gshell.command.CommandCompleter; import org.apache.geronimo.gshell.model.command.CommandModel; -import org.apache.geronimo.gshell.rapture.command.DefaultCommandCompleter; /** * Descriptor for a {@link CommandCompleter} Plexus component. @@ -40,7 +39,7 @@ setRole(CommandCompleter.class); setRoleHint(model.getId()); - setImplementation(DefaultCommandCompleter.class); + setImplementation("org.apache.geronimo.gshell.rapture.command.DefaultCommandCompleter"); setVersion(model.getVersion()); setIsolatedRealm(false); setInstantiationStrategy("singleton"); Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandCompleterDescriptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java Sat Jun 21 10:46:22 2008 @@ -21,7 +21,6 @@ import org.apache.geronimo.gshell.model.command.CommandModel; import org.apache.geronimo.gshell.command.CommandContainer; -import org.apache.geronimo.gshell.rapture.command.DefaultCommandContainer; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; /** @@ -41,7 +40,7 @@ setRole(CommandContainer.class); setRoleHint(model.getId()); - setImplementation(DefaultCommandContainer.class); + setImplementation("org.apache.geronimo.gshell.rapture.command.DefaultCommandContainer"); setVersion(model.getVersion()); setIsolatedRealm(false); setInstantiationStrategy("singleton"); Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandContainerDescriptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java Sat Jun 21 10:46:22 2008 @@ -21,7 +21,6 @@ import org.apache.geronimo.gshell.command.CommandDocumenter; import org.apache.geronimo.gshell.model.command.CommandModel; -import org.apache.geronimo.gshell.rapture.command.DefaultCommandDocumenter; /** * Descriptor for a {@link CommandDocumenter} Plexus component. @@ -40,7 +39,7 @@ setRole(CommandDocumenter.class); setRoleHint(model.getId()); - setImplementation(DefaultCommandDocumenter.class); + setImplementation("org.apache.geronimo.gshell.rapture.command.DefaultCommandDocumenter"); setVersion(model.getVersion()); setIsolatedRealm(false); setInstantiationStrategy("singleton"); Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/CommandDocumenterDescriptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/ComponentDescriptorSupport.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java (from r670220, geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java) URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java?p2=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java&p1=geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java&r1=670220&r2=670239&rev=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java Sat Jun 21 10:46:22 2008 @@ -23,6 +23,10 @@ import org.apache.geronimo.gshell.yarn.ToStringStyle; import org.apache.geronimo.gshell.model.command.CommandModel; import org.apache.geronimo.gshell.model.plugin.Plugin; +import org.apache.geronimo.gshell.rapture.descriptor.CommandActionDescriptor; +import org.apache.geronimo.gshell.rapture.descriptor.CommandCompleterDescriptor; +import org.apache.geronimo.gshell.rapture.descriptor.CommandContainerDescriptor; +import org.apache.geronimo.gshell.rapture.descriptor.CommandDocumenterDescriptor; import org.codehaus.plexus.component.repository.ComponentSetDescriptor; import org.codehaus.plexus.component.repository.ComponentDescriptor; Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/descriptor/PluginDescriptor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginCollector.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-bootstrap/src/main/java/org/apache/geronimo/gshell/rapture/plugin/PluginDiscoverer.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/pom.xml URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/pom.xml?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/pom.xml (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/pom.xml Sat Jun 21 10:46:22 2008 @@ -87,7 +87,12 @@ org.codehaus.plexus plexus-interpolation - + + + org.apache.geronimo.gshell.rapture + gshell-rapture-bootstrap + + commons-jexl commons-jexl Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultCommandLineExecutor.java Sat Jun 21 10:46:22 2008 @@ -31,7 +31,6 @@ import org.apache.geronimo.gshell.notification.ErrorNotification; import org.apache.geronimo.gshell.notification.Notification; import org.apache.geronimo.gshell.util.Arguments; -import org.apache.geronimo.gshell.rapture.command.DefaultVariables; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; @@ -221,7 +220,7 @@ CommandContext context = new CommandContext() { // Command instances get their own namespace with defaults from the current - final Variables vars = new DefaultVariables(variables); + final Variables vars = new Variables(variables); public Object[] getArguments() { return args; Modified: geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java (original) +++ geronimo/gshell/trunk/gshell-rapture/gshell-rapture-core/src/main/java/org/apache/geronimo/gshell/rapture/shell/DefaultShellContext.java Sat Jun 21 10:46:22 2008 @@ -23,7 +23,6 @@ import org.apache.geronimo.gshell.yarn.ReflectionToStringBuilder; import org.apache.geronimo.gshell.io.IO; import org.apache.geronimo.gshell.shell.ShellContext; -import org.apache.geronimo.gshell.rapture.command.DefaultVariables; /** * Default {@link org.apache.geronimo.gshell.shell.ShellContext} implementation. @@ -48,7 +47,7 @@ } public DefaultShellContext(final IO io) { - this(io, new DefaultVariables()); + this(io, new Variables()); } public IO getIo() { Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml (original) +++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/pom.xml Sat Jun 21 10:46:22 2008 @@ -59,8 +59,8 @@ - org.apache.geronimo.gshell - gshell-rapture + org.apache.geronimo.gshell.rapture + gshell-rapture-core Modified: geronimo/gshell/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=670239&r1=670238&r2=670239&view=diff ============================================================================== --- geronimo/gshell/trunk/pom.xml (original) +++ geronimo/gshell/trunk/pom.xml Sat Jun 21 10:46:22 2008 @@ -459,11 +459,17 @@ - org.apache.geronimo.gshell - gshell-rapture + org.apache.geronimo.gshell.rapture + gshell-rapture-bootstrap 1.0-alpha-2-SNAPSHOT - + + + org.apache.geronimo.gshell.rapture + gshell-rapture-core + 1.0-alpha-2-SNAPSHOT + + org.apache.geronimo.gshell gshell-wisdom