svn commit: r526274 - in /maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin: BundleAllPlugin.java BundlePlugin.java WrapPlugin.java

[carlos]

Author: carlos
Date: Fri Apr  6 13:58:23 2007
New Revision: 526274

URL: http://svn.apache.org/viewvc?view=rev&rev=526274
Log:
Fix null pointers in wrap goal

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/BundlePlugin.java
    
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.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=526274&r1=526273&r2=526274
==============================================================================
--- 
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
 Fri Apr  6 13:58:23 2007
@@ -64,15 +64,6 @@
     private static final Pattern SNAPSHOT_VERSION_PATTERN = Pattern.compile( 
"[0-9]{8}_[0-9]{6}_[0-9]+" );
 
     /**
-     * The Maven Project.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
      * Local Repository.
      *
      * @parameter expression="${localRepository}"
@@ -125,7 +116,7 @@
     public void execute()
         throws MojoExecutionException
     {
-        BundleInfo bundleInfo = bundleAll( project );
+        BundleInfo bundleInfo = bundleAll( getProject() );
         logDuplicatedPackages( bundleInfo );
     }
 
@@ -183,13 +174,16 @@
                 break;
             }
 
+            Artifact artifact = resolveArtifact( node.getArtifact() );
+            node.getArtifact().setFile( artifact.getFile() );
+
             if ( node.getDepth() > depth )
             {
                 /* node is deeper than we want */
-                break;
+                getLog().debug( "Ignoring " + node.getArtifact() + ", depth is 
" + node.getDepth() + ", bigger than " + depth );
+                continue;
             }
 
-            Artifact artifact = resolveArtifact( node.getArtifact() );
             MavenProject childProject;
             try
             {
@@ -206,7 +200,7 @@
             if ( ( artifact.getScope().equals( Artifact.SCOPE_COMPILE ) )
                 || ( artifact.getScope().equals( Artifact.SCOPE_RUNTIME ) ) )
             {
-                BundleInfo subBundleInfo = bundleAll( childProject, depth );
+                BundleInfo subBundleInfo = bundleAll( childProject, depth - 1 
);
                 if ( subBundleInfo != null )
                 {
                     bundleInfo.merge( subBundleInfo );
@@ -220,7 +214,7 @@
             }
         }
 
-        if ( this.project != project )
+        if ( getProject() != project )
         {
             getLog().debug( "Project artifact location: " + 
project.getArtifact().getFile() );
 

Modified: 
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java?view=diff&rev=526274&r1=526273&r2=526274
==============================================================================
--- 
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
 (original)
+++ 
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
 Fri Apr  6 13:58:23 2007
@@ -88,6 +88,10 @@
   */
  private Map    instructions = new HashMap();
  
+ protected MavenProject getProject() {
+  return project;
+ }
+
  public void execute() throws MojoExecutionException {
   Properties properties = new Properties();
 

Modified: 
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java?view=diff&rev=526274&r1=526273&r2=526274
==============================================================================
--- 
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
 (original)
+++ 
maven/sandbox/trunk/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
 Fri Apr  6 13:58:23 2007
@@ -19,7 +19,6 @@
 package org.apache.felix.tools.maven2.bundleplugin;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
 
 /**
  * 
@@ -32,19 +31,10 @@
     extends BundleAllPlugin
 {
 
-    /**
-     * The Maven Project.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
     public void execute()
         throws MojoExecutionException
     {
-        BundleInfo bundleInfo = bundleAll( project, 1 );
+        BundleInfo bundleInfo = bundleAll( getProject(), 1 );
         logDuplicatedPackages( bundleInfo );
     }