Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 EE0CF107AE for ; Fri, 7 Jun 2013 21:42:27 +0000 (UTC) Received: (qmail 32797 invoked by uid 500); 7 Jun 2013 21:42:27 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 32764 invoked by uid 500); 7 Jun 2013 21:42:27 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 32757 invoked by uid 99); 7 Jun 2013 21:42:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 21:42:27 +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; Fri, 07 Jun 2013 21:42:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8CBD023889BB; Fri, 7 Jun 2013 21:42:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1490844 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Date: Fri, 07 Jun 2013 21:42:05 -0000 To: commits@felix.apache.org From: mcculls@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130607214205.8CBD023889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcculls Date: Fri Jun 7 21:42:04 2013 New Revision: 1490844 URL: http://svn.apache.org/r1490844 Log: FELIX-3349: align external manifest path with current project Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1490844&r1=1490843&r2=1490844&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Fri Jun 7 21:42:04 2013 @@ -720,6 +720,10 @@ public class BundlePlugin extends Abstra // First grab the external manifest file (if specified and different to target location) File externalManifestFile = archiveConfig.getManifestFile(); + if ( !externalManifestFile.isAbsolute() ) + { + externalManifestFile = new File( currentProject.getBasedir(), externalManifestFile.getPath() ); + } if ( null != externalManifestFile && externalManifestFile.exists() && !externalManifestFile.equals( new File( manifestLocation, "MANIFEST.MF" ) ) ) {