geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r573972 - in /geronimo/sandbox/gshell/trunk: gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/ gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/ gshell-maven-plugin/src/main/java/org/apache/geronimo/...
Date Sun, 09 Sep 2007 09:28:02 GMT
Author: jdillon
Date: Sun Sep  9 02:28:02 2007
New Revision: 573972

URL: http://svn.apache.org/viewvc?rev=573972&view=rev
Log:
Put the id and desc in into the commands.xml for the top-level descriptor

Modified:
    geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptorWriter.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java
    geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java

Modified: geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptorWriter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptorWriter.java?rev=573972&r1=573971&r2=573972&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptorWriter.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-command-api/src/main/java/org/apache/geronimo/gshell/command/descriptor/CommandSetDescriptorWriter.java
Sun Sep  9 02:28:02 2007
@@ -42,6 +42,9 @@
             XMLWriter w = new PrettyPrintXMLWriter(writer);
 
             w.startElement("command-set");
+
+            element(w, "id", desc.getId());
+            element(w, "description", desc.getDescription());
             
             writeCommands(w, desc.getCommandDescriptors());
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java?rev=573972&r1=573971&r2=573972&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/plugin/PluginCollector.java
Sun Sep  9 02:28:02 2007
@@ -66,7 +66,7 @@
                     log.error("Ignoring duplicate command id: {}", id);
                 }
                 else {
-                    log.debug("Command discovered; id: {}", id);
+                    log.debug("Found command: {}", id);
                     commandDescriptors.put(id, desc);
                 }
             }

Modified: geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java?rev=573972&r1=573971&r2=573972&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-maven-plugin/src/main/java/org/apache/geronimo/gshell/maven/gshell/CommandSetDescriptorMojo.java
Sun Sep  9 02:28:02 2007
@@ -234,6 +234,7 @@
             getLog().info("Discovered " + commands.size() + " command type(s)");
 
             CommandSetDescriptor setDesc = new CommandSetDescriptor();
+            setDesc.setId(project.getArtifactId());
 
             for (Class type : commands) {
                 CommandDescriptor commandDesc = createCommandDescriptor(type);



Mime
View raw message