svn commit: r586385 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin: BundlePlugin.java ManifestPlugin.java

[mcculls]

Author: mcculls
Date: Fri Oct 19 04:43:24 2007
New Revision: 586385

URL: http://svn.apache.org/viewvc?rev=586385&view=rev
Log:
FELIX-402: use correct manifest location when using reactor build

Modified:
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.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=586385&r1=586384&r2=586385&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 Oct 19 04:43:24 2007
@@ -65,7 +65,7 @@
      *
      * @parameter expression="${manifestLocation}" 
default-value="${project.build.outputDirectory}/META-INF"
      */
-    protected String manifestLocation;
+    protected File manifestLocation;
 
     /**
      * @component
@@ -305,7 +305,7 @@
             Artifact bundleArtifact = project.getArtifact();
             bundleArtifact.setFile(jarFile);
 
-            if (manifestLocation != null && manifestLocation.length() > 0)
+            if (manifestLocation != null)
             {
                 File outputFile = new File( manifestLocation, "MANIFEST.MF" );
 

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?rev=586385&r1=586384&r2=586385&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
 Fri Oct 19 04:43:24 2007
@@ -60,7 +60,7 @@
             throw new MojoExecutionException( "Error trying to generate 
Manifest", e );
         }
 
-        File outputFile = new File( this.manifestLocation + "/MANIFEST.MF" );
+        File outputFile = new File( this.manifestLocation, "MANIFEST.MF" );
 
         try
         {