You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/02/21 23:37:49 UTC
svn commit: r510277 - in
/maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin:
BundleAllPlugin.java ManifestPlugin.java
Author: carlos
Date: Wed Feb 21 14:37:48 2007
New Revision: 510277
URL: http://svn.apache.org/viewvc?view=rev&rev=510277
Log:
Use project.artifact.file instead of project.file property
Modified:
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
Modified: maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java?view=diff&rev=510277&r1=510276&r2=510277
==============================================================================
--- maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java (original)
+++ maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java Wed Feb 21 14:37:48 2007
@@ -255,10 +255,10 @@
Map instructions = new HashMap();
instructions.put( Analyzer.EXPORT_PACKAGE, "*" );
- project.setFile( getFile( artifact ) );
+ project.getArtifact().setFile( getFile( artifact ) );
File outputFile = getOutputFile( artifact );
- if ( project.getFile().equals( outputFile ) )
+ if ( project.getArtifact().getFile().equals( outputFile ) )
{
/* TODO find the cause why it's getting here */
return;
@@ -271,7 +271,7 @@
Analyzer analyzer = getAnalyzer( project, getClasspath( project ) );
checkDuplicatedPackages( project, analyzer.getExports().keySet() );
- Jar osgiJar = new Jar( project.getArtifactId(), project.getFile() );
+ Jar osgiJar = new Jar( project.getArtifactId(), project.getArtifact().getFile() );
Manifest manifest = analyzer.getJar().getManifest();
osgiJar.setManifest( manifest );
outputFile.getParentFile().mkdirs();
Modified: maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java?view=diff&rev=510277&r1=510276&r2=510277
==============================================================================
--- maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java (original)
+++ maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java Wed Feb 21 14:37:48 2007
@@ -103,7 +103,7 @@
analyzer.getProperties().putAll( properties );
}
- analyzer.setJar( project.getFile() );
+ analyzer.setJar( project.getArtifact().getFile() );
if ( analyzer.getProperty( Analyzer.IMPORT_PACKAGE ) == null )
analyzer.setProperty( Analyzer.IMPORT_PACKAGE, "*" );