From scm-return-45519-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Tue Feb 01 15:41:24 2011 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 15042 invoked from network); 1 Feb 2011 15:41:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Feb 2011 15:41:24 -0000 Received: (qmail 60821 invoked by uid 500); 1 Feb 2011 15:41:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 60687 invoked by uid 500); 1 Feb 2011 15:41:20 -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 60674 invoked by uid 99); 1 Feb 2011 15:41:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 15:41:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 01 Feb 2011 15:41:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 902E22388903; Tue, 1 Feb 2011 15:40:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066073 - in /geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/src/main: java/org/apache/geronimo/shell/diagnose/DiagnoseCommand.java resources/OSGI-INF/blueprint/shell-diagnose.xml Date: Tue, 01 Feb 2011 15:40:56 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110201154056.902E22388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"> - +