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/08/31 21:07:18 UTC
svn commit: r571543 - in /geronimo/sandbox/gshell/trunk: ./
gshell-commands/gshell-scripting-commands/src/main/java/org/apache/geronimo/gshell/commands/scripting/
gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/org.apache.geronimo...
Author: jdillon
Date: Fri Aug 31 12:07:17 2007
New Revision: 571543
URL: http://svn.apache.org/viewvc?rev=571543&view=rev
Log:
Don't need those property files anymore, plexus will find commands for us now, bridge the component desc to the command def for now
Added:
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml (with props)
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml (with props)
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml (with props)
Removed:
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/
geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/
Modified:
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/java/org/apache/geronimo/gshell/commands/scripting/ScriptCommand.java
geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
geronimo/sandbox/gshell/trunk/pom.xml
Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/java/org/apache/geronimo/gshell/commands/scripting/ScriptCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/java/org/apache/geronimo/gshell/commands/scripting/ScriptCommand.java?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/java/org/apache/geronimo/gshell/commands/scripting/ScriptCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/java/org/apache/geronimo/gshell/commands/scripting/ScriptCommand.java Fri Aug 31 12:07:17 2007
@@ -76,8 +76,7 @@
}
if (this.interactive) {
- InteractiveInterpreter interp = new InteractiveInterpreter(
- new JLineConsole(getIO()), engine, language);
+ InteractiveInterpreter interp = new InteractiveInterpreter(new JLineConsole(getIO()), engine, language);
interp.run();
}
Added: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml?rev=571543&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml Fri Aug 31 12:07:17 2007
@@ -0,0 +1,33 @@
+<?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$ -->
+
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>script</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.scripting.ScriptCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+ </components>
+</component-set>
\ No newline at end of file
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml?rev=571543&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml Fri Aug 31 12:07:17 2007
@@ -0,0 +1,73 @@
+<?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$ -->
+
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>cat</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.standard.CatCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>echo</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.standard.EchoCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>exec</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.standard.ExecuteCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>java</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.standard.JavaCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>sleep</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.standard.SleepCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>wait</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.standard.WaitCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+ </components>
+</component-set>
\ No newline at end of file
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml?rev=571543&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml (added)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml Fri Aug 31 12:07:17 2007
@@ -0,0 +1,33 @@
+<?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$ -->
+
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>copy</role-hint>
+ <implementation>org.apache.geronimo.gshell.commands.vfs.CopyCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+ </components>
+</component-set>
\ No newline at end of file
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Fri Aug 31 12:07:17 2007
@@ -46,11 +46,6 @@
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-diet-plexus-utils</artifactId>
<version>${pom.version}</version>
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Shell.java Fri Aug 31 12:07:17 2007
@@ -24,7 +24,6 @@
import org.apache.commons.lang.time.StopWatch;
import org.apache.geronimo.gshell.command.Command;
import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.command.CommandDefinition;
import org.apache.geronimo.gshell.command.CommandManager;
import org.apache.geronimo.gshell.command.MessageSource;
import org.apache.geronimo.gshell.command.MessageSourceImpl;
@@ -35,10 +34,8 @@
import org.apache.geronimo.gshell.commandline.CommandLineBuilder;
import org.apache.geronimo.gshell.console.IO;
import org.apache.geronimo.gshell.util.Arguments;
-
import org.codehaus.plexus.MutablePlexusContainer;
-import org.codehaus.plexus.component.repository.ComponentDescriptor;
-
+import org.codehaus.plexus.PlexusContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -134,35 +131,11 @@
}
//
- // HACK: For now we need to make sure we get a mutable container
- //
- MutablePlexusContainer childContainer = (MutablePlexusContainer)
- container.createChildContainer("command", container.getContainerRealm());
-
- //
- // HACK: Register the command def crapo as a component descriptor in the child container
+ // FIXME: Probably need to pick a better way to name the command invocation container, or do we even really need this?
//
-
- CommandDefinition def = commandManager.getCommandDefinition(commandName);
-
- ComponentDescriptor desc = new ComponentDescriptor();
- desc.setRole(Command.class.getName());
- desc.setImplementation(def.getClassName());
- desc.setRoleHint(def.getName());
-
- childContainer.getComponentRepository().addComponentDescriptor(desc);
- //
- // HACK: Pull out the damn command
- //
-
- final Command command = (Command)childContainer.lookup(Command.class, def.getName());
-
- //
- // HACK: Auto-wire setter-based dependencies for now
- //
-
- childContainer.autowire(command);
+ final PlexusContainer childContainer = container.createChildContainer("command-invocation", container.getContainerRealm());
+ final Command command = (Command)childContainer.lookup(Command.class, commandName);
//
// TODO: DI all bits if we can, then free up "context" to replace "category" as a term
@@ -213,7 +186,7 @@
// HACK: Nuke the child container now
//
- container.removeChildContainer("command");
+ container.removeChildContainer("command-invocation");
}
return result;
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java Fri Aug 31 12:07:17 2007
@@ -45,17 +45,6 @@
super("help");
}
- public void setCommandManager(final CommandManager commandManager) {
- this.commandManager = commandManager;
- }
-
- private CommandManager getCommandManager() {
- if (commandManager == null) {
- throw new IllegalStateException("Not initialized; missing command manger");
- }
- return commandManager;
- }
-
protected String getUsage() {
return super.getUsage() + " [topic|command]";
}
@@ -63,7 +52,6 @@
protected Object doExecute() throws Exception {
IO io = getIO();
- CommandManager manager = getCommandManager();
//
// TODO: Externalize strings
@@ -86,7 +74,7 @@
// HACK: For now just list all know commands
//
- for (CommandDefinition def : manager.commandDefinitions()) {
+ for (CommandDefinition def : commandManager.commandDefinitions()) {
io.out.print(" ");
io.out.print(def.getName());
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java Fri Aug 31 12:07:17 2007
@@ -22,11 +22,15 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.xbean.finder.ResourceFinder;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.repository.ComponentDescriptor;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +40,7 @@
* @version $Rev$ $Date$
*/
public class CommandManagerImpl
- implements CommandManager
+ implements CommandManager, Initializable
{
private static final Logger log = LoggerFactory.getLogger(CommandManager.class);
@@ -44,23 +48,34 @@
private Map<String,CommandDefinition> commandAliasMap = new HashMap<String,CommandDefinition>();
- public CommandManagerImpl() throws CommandException {
+ // @Requirement
+ private PlexusContainer container;
+
+ public void initialize() throws InitializationException {
try {
discoverCommands();
}
catch (Exception e) {
- throw new CommandException(e);
+ throw new InitializationException("Failed to discover commands", e);
}
}
private void discoverCommands() throws Exception {
log.info("Discovering commands");
- ResourceFinder finder = new ResourceFinder("META-INF/");
- Map<String, Properties> map = finder.mapAllProperties("org.apache.geronimo.gshell.command");
-
- for (String filename : map.keySet()) {
- Properties props = map.get(filename);
+ List<ComponentDescriptor> descriptors = container.getComponentDescriptorList(Command.class.getName());
+ for (ComponentDescriptor desc : descriptors) {
+ //
+ // HACK: Bridge old def from descriptor
+ //
+
+ Properties props = new Properties();
+
+ props.put("name", desc.getRoleHint());
+ props.put("class", desc.getImplementation());
+ props.put("enable", true);
+ props.put("category", "ignored");
+
CommandDefinition def = new CommandDefinition(props);
addCommandDefinition(def);
}
Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml Fri Aug 31 12:07:17 2007
@@ -54,6 +54,12 @@
<implementation>org.apache.geronimo.gshell.command.CommandManagerImpl</implementation>
<instantiation-strategy>singleton</instantiation-strategy>
<lifecycle-handler>plexus</lifecycle-handler>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.PlexusContainer</role>
+ <field-name>container</field-name>
+ </requirement>
+ </requirements>
</component>
<component>
@@ -110,6 +116,56 @@
<role>org.apache.geronimo.gshell.console.IO</role>
<role-hint>default</role-hint>
<implementation>org.apache.geronimo.gshell.console.IO</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <!--
+ Builtin Commands
+ -->
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>exit</role-hint>
+ <implementation>org.apache.geronimo.gshell.builtins.ExitCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>help</role-hint>
+ <implementation>org.apache.geronimo.gshell.builtins.HelpCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gshell.command.CommandManager</role>
+ <field-name>commandManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>set</role-hint>
+ <implementation>org.apache.geronimo.gshell.builtins.SetCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>source</role-hint>
+ <implementation>org.apache.geronimo.gshell.builtins.SourceCommand</implementation>
+ <instantiation-strategy>singleton</instantiation-strategy>
+ <lifecycle-handler>plexus</lifecycle-handler>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gshell.command.Command</role>
+ <role-hint>unset</role-hint>
+ <implementation>org.apache.geronimo.gshell.builtins.UnsetCommand</implementation>
<instantiation-strategy>singleton</instantiation-strategy>
<lifecycle-handler>plexus</lifecycle-handler>
</component>
Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=571543&r1=571542&r2=571543&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Fri Aug 31 12:07:17 2007
@@ -132,12 +132,6 @@
<artifactId>jline</artifactId>
<version>0.9.91</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.1</version>
- </dependency>
<dependency>
<groupId>org.antlr</groupId>
@@ -336,6 +330,7 @@
<module>gshell-parser</module>
<module>gshell-api</module>
<module>gshell-core</module>
+ <module>gshell-layout</module>
<module>gshell-cli</module>
<module>gshell-commands</module>
<module>gshell-testsuite</module>