| commit | 0ab638932870a3bfdac9e0b5be302a292c5ee858 | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@apache.org> | Fri Oct 19 11:43:24 2007 +0000 |
| committer | Stuart McCulloch <mcculls@apache.org> | Fri Oct 19 11:43:24 2007 +0000 |
| tree | a990ccfe002695706562f80c22f2d40a464cffc4 | |
| parent | 97f48149ca51ff276d3bf36efd449e67b2270887 [diff] |
FELIX-402: use correct manifest location when using reactor build git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@586385 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index b2f7d35..1a20ad7 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -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" );
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java index 6fb02f2..bf4db79 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -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 {