commit 5ba746b1a633f235ff35e59f06614d1ef2fd66fd
author Stuart McCulloch <mcculls@apache.org> Wed Oct 31 06:49:53 2007 +0000
committer Stuart McCulloch <mcculls@apache.org> Wed Oct 31 06:49:53 2007 +0000
tree 7170956d02a0c5661345cdde2c7e84fccdfc7bbc
parent 8ab1f64c65b451467c4498a3cdadb0025e7ec566

FELIX-417: fix project references

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@590570 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

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 e5e2f7b..a721406 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -221,7 +221,7 @@
             properties.putAll(this.transformDirectives(instructions));
 
             // pass maven resource paths onto BND analyzer
-            final String mavenResourcePaths = this.getMavenResourcePaths();
+            final String mavenResourcePaths = this.getMavenResourcePaths(project);
             final String includeResource = (String)properties.get(Analyzer.INCLUDE_RESOURCE);
             if (includeResource != null)
             {
@@ -259,11 +259,11 @@
             }
 
             Builder builder = new Builder();
-            builder.setBase(this.baseDir);
+            builder.setBase(project.getBasedir());
             builder.setProperties(properties);
             builder.setClasspath(classpath);
 
-            Collection embeddableArtifacts = getEmbeddableArtifacts(properties);
+            Collection embeddableArtifacts = getEmbeddableArtifacts(project, properties);
             if (embeddableArtifacts.size() > 0)
             {
                 // add BND instructions to embed selected dependencies
@@ -581,12 +581,12 @@
         this.outputDirectory = outputDirectory;
     }
 
-    String getMavenResourcePaths()
+    String getMavenResourcePaths(MavenProject project)
     {
-        final String basePath = this.baseDir.getAbsolutePath();
+        final String basePath = project.getBasedir().getAbsolutePath();
 
         StringBuffer resourcePaths = new StringBuffer();
-        for (Iterator i = this.project.getResources().iterator(); i.hasNext();)
+        for (Iterator i = project.getResources().iterator(); i.hasNext();)
         {
             org.apache.maven.model.Resource resource = (org.apache.maven.model.Resource)i.next();
 
@@ -598,7 +598,7 @@
             {
                 String path = sourcePath;
 
-                // make relative to basedir
+                // make relative to project
                 if (path.startsWith(basePath))
                 {
                     if ( path.length() == basePath.length() )
@@ -643,7 +643,7 @@
         return resourcePaths.toString();
     }
 
-    Collection getEmbeddableArtifacts(Properties properties)
+    Collection getEmbeddableArtifacts(MavenProject project, Properties properties)
     {
         String embedTransitive = properties.getProperty(DependencyEmbedder.EMBED_TRANSITIVE);
         if (Boolean.valueOf(embedTransitive).booleanValue())