You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2013/06/07 23:42:05 UTC

svn commit: r1490844 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

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" ) ) )
             {