geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r573362 - in /geronimo/sandbox/gshell/trunk: gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/ gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/annotation/ gshell-command-api/src/main/java/org/apache/ge...
Date Thu, 06 Sep 2007 20:37:19 GMT
Author: jdillon
Date: Thu Sep  6 13:37:17 2007
New Revision: 573362

URL: http://svn.apache.org/viewvc?rev=573362&view=rev
Log:
Changed the command desc name to id, since the name of the command will be configured via
a layout, so the desc bit is an id for the command instance

Modified:
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandDescriptor.java
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptor.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/commands.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/EchoCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CopyCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/CommandSetDescriptorBuilder.java

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
Thu Sep  6 13:37:17 2007
@@ -113,7 +113,11 @@
     protected void displayHelp(final CommandLineProcessor clp) {
         assert clp != null;
 
-        io.out.println(context.getCommandDescriptor().getName());
+        //
+        // TODO: Need to ask the LayoutManager what the real name is for our command's ID
+        //
+        
+        io.out.println(context.getCommandDescriptor().getId());
         io.out.println(" -- ");
         io.out.println();
 

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/annotation/CommandComponent.java
Thu Sep  6 13:37:17 2007
@@ -33,7 +33,7 @@
 @Target(ElementType.TYPE)
 public @interface CommandComponent
 {
-    String name();
+    String id();
 
     String description() default "";
 }

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandDescriptor.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandDescriptor.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandDescriptor.java
Thu Sep  6 13:37:17 2007
@@ -29,15 +29,15 @@
 public class CommandDescriptor
     extends ComponentDescriptor
 {
-    private String name;
+    private String id;
 
-    public String getName() {
-        return name;
+    public String getId() {
+        return id;
     }
 
-    public void setName(final String name) {
-        assert name != null;
+    public void setId(final String id) {
+        assert id != null;
 
-        this.name = name;
+        this.id = id;
     }
 }

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptor.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptor.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptor.java
Thu Sep  6 13:37:17 2007
@@ -29,18 +29,18 @@
 public class CommandSetDescriptor
     extends ComponentSetDescriptor
 {
-    private String name;
+    private String id;
 
     private String description;
 
-    public String getName() {
-        return name;
+    public String getId() {
+        return id;
     }
 
-    public void setName(final String name) {
-        assert name != null;
+    public void setId(final String id) {
+        assert id != null;
 
-        this.name = name;
+        this.id = id;
     }
 
     public String getDescription() {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-bsf/src/main/java/org/apache/geronimo/gshell/commands/bsf/ScriptCommand.java
Thu Sep  6 13:37:17 2007
@@ -32,7 +32,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="script")
+@CommandComponent(id="script")
 public class ScriptCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
Thu Sep  6 13:37:17 2007
@@ -29,7 +29,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="exit")
+@CommandComponent(id="exit")
 public class ExitCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
Thu Sep  6 13:37:17 2007
@@ -34,7 +34,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="help")
+@CommandComponent(id="help")
 public class HelpCommand
     extends CommandSupport
 {
@@ -49,9 +49,13 @@
         //noinspection unchecked
         List<CommandDescriptor> list = container.getComponentDescriptorList(Command.class.getName());
 
+        //
+        // TODO: Need to ask the LayoutManager...
+        //
+
         for (CommandDescriptor desc : list) {
             io.out.print("  ");
-            io.out.print(desc.getName());
+            io.out.print(desc.getId());
             io.out.println();
         }
         

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
Thu Sep  6 13:37:17 2007
@@ -35,7 +35,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="set")
+@CommandComponent(id="set")
 public class SetCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
Thu Sep  6 13:37:17 2007
@@ -38,7 +38,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="source")
+@CommandComponent(id="source")
 public class SourceCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
Thu Sep  6 13:37:17 2007
@@ -33,7 +33,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="unset")
+@CommandComponent(id="unset")
 public class UnsetCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/commands.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/commands.xml?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/commands.xml
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/commands.xml
Thu Sep  6 13:37:17 2007
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <command-set>
-    <name>gshell-builtins</name>
+    <id>gshell-builtins</id>
     
     <commands>
         <command>
-            <name>exit</name>
+            <id>exit</id>
             <implementation>org.apache.geronimo.gshell.commands.builtins.ExitCommand</implementation>
         </command>
         
         <command>
-            <name>help</name>
+            <id>help</id>
             <implementation>org.apache.geronimo.gshell.commands.builtins.HelpCommand</implementation>
             <requirements>
                 <requirement>
                     <role>org.codehaus.plexus.PlexusContainer</role>
-                    <field-name>container</field-name>
+                    <field-id>container</field-id>
                 </requirement>
             </requirements>
         </command>
         
         <command>
-            <name>set</name>
+            <id>set</id>
             <implementation>org.apache.geronimo.gshell.commands.builtins.SetCommand</implementation>
         </command>
         
         <command>
-            <name>source</name>
+            <id>source</id>
             <implementation>org.apache.geronimo.gshell.commands.builtins.SourceCommand</implementation>
             <requirements>
                 <requirement>
                     <role>org.apache.geronimo.gshell.Shell</role>
-                    <field-name>shell</field-name>
+                    <field-id>shell</field-id>
                 </requirement>
             </requirements>
         </command>
         
         <command>
-            <name>unset</name>
+            <id>unset</id>
             <implementation>org.apache.geronimo.gshell.commands.builtins.UnsetCommand</implementation>
         </command>
     </commands>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/CatCommand.java
Thu Sep  6 13:37:17 2007
@@ -40,7 +40,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="cat")
+@CommandComponent(id="cat")
 public class CatCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/EchoCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/EchoCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/EchoCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/EchoCommand.java
Thu Sep  6 13:37:17 2007
@@ -31,7 +31,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="echo")
+@CommandComponent(id="echo")
 public class EchoCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/ExecuteCommand.java
Thu Sep  6 13:37:17 2007
@@ -31,7 +31,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="exec")public class ExecuteCommand
+@CommandComponent(id="exec")public class ExecuteCommand
     extends CommandSupport
 {
     private ProcessBuilder builder;

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/JavaCommand.java
Thu Sep  6 13:37:17 2007
@@ -37,7 +37,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="java")
+@CommandComponent(id="java")
 public class JavaCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/SleepCommand.java
Thu Sep  6 13:37:17 2007
@@ -28,7 +28,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="sleep")
+@CommandComponent(id="sleep")
 public class SleepCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-optional/src/main/java/org/apache/geronimo/gshell/commands/optional/WaitCommand.java
Thu Sep  6 13:37:17 2007
@@ -32,7 +32,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="wait")
+@CommandComponent(id="wait")
 public class WaitCommand
     extends CommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CopyCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CopyCommand.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CopyCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/CopyCommand.java
Thu Sep  6 13:37:17 2007
@@ -30,7 +30,7 @@
  *
  * @version $Rev$ $Date$
  */
-@CommandComponent(name="copy")
+@CommandComponent(id="copy")
 public class CopyCommand
     extends VFSCommandSupport
 {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/CommandSetDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/CommandSetDescriptorBuilder.java?rev=573362&r1=573361&r2=573362&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/CommandSetDescriptorBuilder.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/CommandSetDescriptorBuilder.java
Thu Sep  6 13:37:17 2007
@@ -48,10 +48,10 @@
 
         CommandSetDescriptor setDescriptor = new CommandSetDescriptor();
 
-        setDescriptor.setName(c.getChild("name").getValue());
+        setDescriptor.setId(c.getChild("id").getValue());
         setDescriptor.setDescription(c.getChild("description").getValue());
 
-        log.debug("Loading command set: {}", setDescriptor.getName());
+        log.debug("Loading command set: {}", setDescriptor.getId());
 
         // Commands
         PlexusConfiguration[] commands = c.getChild("commands").getChildren("command");
@@ -69,14 +69,14 @@
 
         CommandDescriptor d = new CommandDescriptor();
 
-        d.setName(c.getChild("name").getValue());
+        d.setId(c.getChild("id").getValue());
         d.setDescription(c.getChild("description").getValue());
         d.setImplementation(c.getChild("implementation").getValue());
 
-        log.debug("Loading command: {}", d.getName());
+        log.debug("Loading command: {}", d.getId());
 
         d.setRole(Command.class.getName());
-        d.setRoleHint(d.getName());
+        d.setRoleHint(d.getId());
         d.setInstantiationStrategy("per-lookup");
         
         // Requirements



Mime
View raw message