Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 68EDC4DAE for ; Mon, 27 Jun 2011 22:59:32 +0000 (UTC) Received: (qmail 78200 invoked by uid 500); 27 Jun 2011 22:59:32 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78121 invoked by uid 500); 27 Jun 2011 22:59:31 -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 78114 invoked by uid 99); 27 Jun 2011 22:59:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2011 22:59:31 +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; Mon, 27 Jun 2011 22:59:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 15B152388900; Mon, 27 Jun 2011 22:59:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1140360 - /geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java Date: Mon, 27 Jun 2011 22:59:08 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110627225908.15B152388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Mon Jun 27 22:59:07 2011 New Revision: 1140360 URL: http://svn.apache.org/viewvc?rev=1140360&view=rev Log: GERONIMO-5586 use wrap bundle from console add to repo for non-bundles Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java?rev=1140360&r1=1140359&r2=1140360&view=diff ============================================================================== --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java (original) +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java Mon Jun 27 22:59:07 2011 @@ -46,6 +46,8 @@ import javax.portlet.RenderResponse; import javax.portlet.WindowState; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -53,6 +55,9 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.SortedSet; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; /** * @version $Rev$ $Date$ @@ -175,18 +180,52 @@ public class RepositoryViewPortlet exten set.put(jarName, group + "/" + artifact + "/" + version + "/" + fileType); instance.addAliases(set); } - repo.copyToRepository(file, new Artifact(group, artifact, version, fileType), new FileWriteMonitor() { - public void writeStarted(String fileDescription, int fileSize) { - log.info("Copying into repository " + fileDescription + "..."); - } - public void writeProgress(int bytes) { - } + JarFile jar = new JarFile(file); + try { + // only handle non OSGi jar + Manifest manifest = jar.getManifest(); + if (manifest != null && + manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-SymbolicName")) != null && + manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-Version")) != null) { + + URL wrap = new URL("wrap", null, file.toURI().toURL().toExternalForm() + "$Bundle-SymbolicName=" + artifact + "&Bundle-Version=" + version.replace("-", ".")); + InputStream in = wrap.openStream(); + try { + repo.copyToRepository(in, (int)file.getTotalSpace(), new Artifact(group, artifact, version, fileType), new FileWriteMonitor() { + public void writeStarted(String fileDescription, int fileSize) { + log.info("Copying into repository " + fileDescription + "..."); + } + + public void writeProgress(int bytes) { + } + + public void writeComplete(int bytes) { + log.info("Finished."); + } + }); + } finally { + in.close(); + } + } else { + repo.copyToRepository(file, new Artifact(group, artifact, version, fileType), new FileWriteMonitor() { + public void writeStarted(String fileDescription, int fileSize) { + log.info("Copying into repository " + fileDescription + "..."); + } - public void writeComplete(int bytes) { - log.info("Finished."); + public void writeProgress(int bytes) { + } + + public void writeComplete(int bytes) { + log.info("Finished."); + } + }); } - }); + } finally { + jar.close(); + } + + } catch (FileUploadException e) { throw new PortletException(e); } catch (GBeanNotFoundException e) {