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 2012/07/26 19:49:28 UTC
svn commit: r1366107 -
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
Author: mcculls
Date: Thu Jul 26 17:49:28 2012
New Revision: 1366107
URL: http://svn.apache.org/viewvc?rev=1366107&view=rev
Log:
Fix manifest goal for jar projects with no sources; also 'calcManifest' method now expects caller to store the manifest rather than rely on a side-effect
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
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=1366107&r1=1366106&r2=1366107&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 Thu Jul 26 17:49:28 2012
@@ -172,7 +172,14 @@ public class ManifestPlugin extends Bund
if ( !file.exists() )
{
- throw new FileNotFoundException( file.getPath() );
+ if ( file.equals( getOutputDirectory() ) )
+ {
+ file.mkdirs();
+ }
+ else
+ {
+ throw new FileNotFoundException( file.getPath() );
+ }
}
Builder analyzer = getOSGiBuilder( project, instructions, properties, classpath );
@@ -203,7 +210,7 @@ public class ManifestPlugin extends Bund
else
{
analyzer.mergeManifest( analyzer.getJar().getManifest() );
- analyzer.calcManifest();
+ analyzer.getJar().setManifest( analyzer.calcManifest() );
}
mergeMavenManifest( project, analyzer );