Return-Path: X-Original-To: apmail-tuscany-commits-archive@www.apache.org Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C59814C71 for ; Sun, 15 May 2011 06:55:44 +0000 (UTC) Received: (qmail 21234 invoked by uid 500); 15 May 2011 06:55:44 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 21212 invoked by uid 500); 15 May 2011 06:55:43 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 21203 invoked by uid 99); 15 May 2011 06:55:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 May 2011 06:55:42 +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; Sun, 15 May 2011 06:55:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2F54F23889B1; Sun, 15 May 2011 06:55:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1103281 - /tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Date: Sun, 15 May 2011 06:55:21 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110515065521.2F54F23889B1@eris.apache.org> Author: antelder Date: Sun May 15 06:55:20 2011 New Revision: 1103281 URL: http://svn.apache.org/viewvc?rev=1103281&view=rev Log: Update the detailed installed contribution command to show more information about the contribution Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=1103281&r1=1103280&r2=1103281&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java (original) +++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Sun May 15 06:55:20 2011 @@ -25,11 +25,9 @@ import static java.lang.System.out; import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -46,6 +44,9 @@ import org.apache.tuscany.sca.assembly.S import org.apache.tuscany.sca.common.java.io.IOHelper; import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.Export; +import org.apache.tuscany.sca.contribution.java.JavaExport; +import org.apache.tuscany.sca.contribution.namespace.NamespaceExport; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.impl.NodeImpl; import org.apache.tuscany.sca.monitor.ValidationException; @@ -218,10 +219,24 @@ public class Shell { if (c == null) { out.println("Contribution " + curi + " not installed"); } else { - out.println("Contribution " + curi); + out.println(curi); out.println(" URL: " + c.getLocation()); - // TODO: add full detail view of contribution showing - // uri, url, dependent contrubutions, deployables, exports + + List es = new ArrayList(); + for (Export e : c.getExports()) { + if (e instanceof JavaExport) { + es.add(((JavaExport)e).getPackage()); + } else if (e instanceof NamespaceExport) { + es.add(((NamespaceExport)e).getNamespace()); + } + } + out.println(" Exports: " + es); + + List ds = new ArrayList(); + for (Composite cp : c.getDeployables()) { + ds.add(cp.getURI()); + } + out.println(" Deployables: " + ds); } } else { for (String curi : getNode().getInstalledContributionURIs()) {