Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 15950 invoked from network); 5 May 2010 18:56:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 May 2010 18:56:57 -0000 Received: (qmail 97258 invoked by uid 500); 5 May 2010 18:56:57 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 97219 invoked by uid 500); 5 May 2010 18:56:57 -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 97210 invoked by uid 99); 5 May 2010 18:56:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 18:56:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 05 May 2010 18:56:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 89A8C23888EA; Wed, 5 May 2010 18:56:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941426 - /geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/DisplayManifestMojo.java Date: Wed, 05 May 2010 18:56:03 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100505185603.89A8C23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Wed May 5 18:56:03 2010 New Revision: 941426 URL: http://svn.apache.org/viewvc?rev=941426&view=rev Log: display attributes and directives in display-manifest goal Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/DisplayManifestMojo.java Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/DisplayManifestMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/DisplayManifestMojo.java?rev=941426&r1=941425&r2=941426&view=diff ============================================================================== --- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/DisplayManifestMojo.java (original) +++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/java/org/apache/geronimo/mavenplugins/osgi/DisplayManifestMojo.java Wed May 5 18:56:03 2010 @@ -23,6 +23,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import org.apache.geronimo.mavenplugins.osgi.utils.BundleResolver; import org.apache.maven.plugin.Mojo; @@ -104,7 +105,28 @@ public class DisplayManifestMojo extends if (exportPackages != null && exportPackages.length > 0) { System.out.println("Exports:"); for (ExportPackageDescription exportPackage : exportPackages) { - System.out.println(TAB + exportPackage); + StringBuffer buf = new StringBuffer(); + buf.append(TAB + exportPackage); + + Map attributes = exportPackage.getAttributes(); + if (attributes != null) { + attributes.remove("version"); + if (!attributes.isEmpty()) { + buf.append(" Attributes: ").append(attributes); + } + } + Map directives = exportPackage.getDirectives(); + if (directives != null) { + directives.remove("uses"); + directives.remove("x-equinox-ee"); + directives.remove("x-internal"); + if (!directives.isEmpty()) { + buf.append(" Directives: ").append(directives); + } + } + + System.out.println(buf); + String [] list = (String[])exportPackage.getDirective("uses"); if (list != null) { System.out.println(TAB + TAB + "Uses: " + Arrays.asList(list)); @@ -119,7 +141,25 @@ public class DisplayManifestMojo extends if (!imports.isEmpty()) { System.out.println(header); for (ImportPackageSpecification importPackage : imports) { - System.out.println(TAB + importPackage); + StringBuffer buf = new StringBuffer(); + buf.append(TAB + importPackage); + + Map attributes = importPackage.getAttributes(); + if (attributes != null) { + attributes.remove("version"); + if (!attributes.isEmpty()) { + buf.append(" Attributes: ").append(attributes); + } + } + Map directives = importPackage.getDirectives(); + if (directives != null) { + directives.remove("resolution"); + if (!directives.isEmpty()) { + buf.append(" Directives: ").append(directives); + } + } + + System.out.println(buf); } System.out.println(); }