svn commit: r581888 - in /felix/trunk/bundleplugin: pom.xml src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java

[mcculls]

Author: mcculls
Date: Thu Oct  4 06:12:06 2007
New Revision: 581888

URL: http://svn.apache.org/viewvc?rev=581888&view=rev
Log:
FELIX-360: apply the rest of Carlos' fixes

Modified:
    felix/trunk/bundleplugin/pom.xml
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
    
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java

Modified: felix/trunk/bundleplugin/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?rev=581888&r1=581887&r2=581888&view=diff
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Thu Oct  4 06:12:06 2007
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-dependency-tree</artifactId>
-      <version>1.0</version>
+      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-osgi</artifactId>
-      <version>0.1.0</version>
+      <version>0.2.0-SNAPSHOT</version>
     </dependency>
  </dependencies>
 </project>

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java?rev=581888&r1=581887&r2=581888&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
 Thu Oct  4 06:12:06 2007
@@ -48,7 +48,6 @@
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.shared.dependency.tree.DependencyNode;
-import org.apache.maven.shared.dependency.tree.DependencyTree;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
 
@@ -174,12 +173,12 @@
         }
         artifactsBeingProcessed.add( project.getArtifact() );
 
-        DependencyTree dependencyTree;
+        DependencyNode dependencyTree;
 
         try
         {
             dependencyTree = dependencyTreeBuilder.buildDependencyTree( 
project, localRepository, factory,
-                                                                        
artifactMetadataSource, collector );
+                                                                        
artifactMetadataSource, null, collector );
         }
         catch ( DependencyTreeBuilderException e )
         {
@@ -188,6 +187,12 @@
 
         BundleInfo bundleInfo = new BundleInfo();
 
+        if ( !dependencyTree.hasChildren() )
+        {
+            /* no need to traverse the tree */
+            return bundleRoot( project, bundleInfo );
+        }
+
         getLog().debug( "Will bundle the following dependency tree" + LS + 
dependencyTree );
 
         for ( Iterator it = dependencyTree.inverseIterator(); it.hasNext(); )
@@ -197,6 +202,11 @@
             {
                 /* this is the root, current project */
                 break;
+            }
+
+            if ( node.getState() != DependencyNode.INCLUDED )
+            {
+                continue;
             }
 
             if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) 
)

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=581888&r1=581887&r2=581888&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 Thu Oct  4 06:12:06 2007
@@ -534,7 +534,7 @@
     {
         Properties properties = new Properties();
         // Setup defaults
-        String bsn = project.getGroupId() + "." + project.getArtifactId();
+        String bsn = maven2OsgiConverter.getBundleSymbolicName( 
project.getArtifact() );
         properties.put(Analyzer.BUNDLE_SYMBOLICNAME, bsn);
         properties.put(Analyzer.IMPORT_PACKAGE, "*");
 

Modified: 
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java?rev=581888&r1=581887&r2=581888&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
 (original)
+++ 
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
 Thu Oct  4 06:12:06 2007
@@ -69,10 +69,10 @@
         assertEquals( "2.0.0.SNAPSHOT", osgiVersion );
 
         osgiVersion = plugin.convertVersionToOsgi( "2" );
-        assertEquals( "2", osgiVersion );
+        assertEquals( "2.0.0", osgiVersion );
 
         osgiVersion = plugin.convertVersionToOsgi( "2.1" );
-        assertEquals( "2.1", osgiVersion );
+        assertEquals( "2.1.0", osgiVersion );
 
         osgiVersion = plugin.convertVersionToOsgi( "2.1.3" );
         assertEquals( "2.1.3", osgiVersion );