Author: gawor
Date: Tue Feb  1 15:40:56 2011
New Revision: 1066073

URL: http://svn.apache.org/viewvc?rev=1066073&view=rev
Log:
GERONIMO-5779: Minor fixes & changed command scope to 'equinox'

Modified:
    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/java/org/apache/geronimo/shell/diagnose/DiagnoseCommand.java
    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/resources/OSGI-INF/blueprint/shell-diagnose.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/java/org/apache/geronimo/shell/diagnose/DiagnoseCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/java/org/apache/geronimo/shell/diagnose/DiagnoseCommand.java?rev=1066073&r1=1066072&r2=1066073&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/java/org/apache/geronimo/shell/diagnose/DiagnoseCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/java/org/apache/geronimo/shell/diagnose/DiagnoseCommand.java Tue Feb  1 15:40:56 2011
@@ -38,7 +38,7 @@ import org.fusesource.jansi.Ansi.Color;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
-@Command(scope = "osgi", name = "diagnose", description = "Diagnose common OSGi resolver problems")
+@Command(scope = "equinox", name = "diagnose", description = "Diagnose common OSGi resolver problems")
 public class DiagnoseCommand extends OsgiCommandSupport {
 
     @Argument(index = 0, name = "ids", description = "The list of bundle IDs separated by whitespaces", required = true, multiValued = true)
@@ -148,9 +148,9 @@ public class DiagnoseCommand extends Osg
             }
         } else if (unsatisfied instanceof BundleSpecification) {
             if (((BundleSpecification) unsatisfied).isOptional()) { 
-                return warning("Missing optionally required bundle" + toString(unsatisfied));
+                return warning("Missing optionally required bundle " + toString(unsatisfied));
             } else {
-                return error("Missing required bundle" + toString(unsatisfied));
+                return error("Missing required bundle " + toString(unsatisfied));
             }
         } else if (unsatisfied instanceof HostSpecification) {
             return error("Missing host bundle " + toString(unsatisfied));

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/resources/OSGI-INF/blueprint/shell-diagnose.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/resources/OSGI-INF/blueprint/shell-diagnose.xml?rev=1066073&r1=1066072&r2=1066073&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/resources/OSGI-INF/blueprint/shell-diagnose.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main/resources/OSGI-INF/blueprint/shell-diagnose.xml Tue Feb  1 15:40:56 2011
@@ -21,7 +21,7 @@
            default-activation="lazy">
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
-        <command name="osgi/diagnose">
+        <command name="equinox/diagnose">
             <action class="org.apache.geronimo.shell.diagnose.DiagnoseCommand"></action>
         </command>
     </command-bundle>