commit c3a0cc3a59c61ea197cfed479e466eb29b225d4e
author Stuart McCulloch <mcculls@gmail.com> Fri Feb 14 00:19:08 2014 +0000
committer Stuart McCulloch <mcculls@gmail.com> Fri Feb 14 00:19:08 2014 +0000
tree 46a29b6468a1e87397d9c096bf53565ea8a4f0b8
parent ac125280758b28f5693a3ba42790384393b194e5

Ignore support bundle when planning

org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java

diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
index bedd72c..dc64e10 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
@@ -18,6 +18,7 @@
 import org.eclipse.sisu.space.BeanScanning;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 
 import com.google.inject.Guice;
 import com.google.inject.Module;
@@ -29,6 +30,13 @@
     implements BundlePlan
 {
     // ----------------------------------------------------------------------
+    // Constants
+    // ----------------------------------------------------------------------
+
+    private static final String SUPPORT_BUNDLE_NAME =
+        FrameworkUtil.getBundle( PlexusSpaceModule.class ).getSymbolicName();
+
+    // ----------------------------------------------------------------------
     // Implementation fields
     // ----------------------------------------------------------------------
 
@@ -49,18 +57,20 @@
 
     public BindingPublisher prepare( final Bundle bundle )
     {
-        if ( hasPlexusAnnotations( bundle ) || hasPlexusXml( bundle ) )
+        if ( !SUPPORT_BUNDLE_NAME.equals( bundle.getSymbolicName() ) )
         {
-            return new InjectorPublisher( Guice.createInjector( new BundleModule( bundle, locator )
+            if ( hasPlexusAnnotations( bundle ) || hasPlexusXml( bundle ) )
             {
-                @Override
-                protected Module spaceModule()
+                return new InjectorPublisher( Guice.createInjector( new BundleModule( bundle, locator )
                 {
-                    return new PlexusSpaceModule( space, BeanScanning.select( getProperties() ) );
-                }
-            } ) );
+                    @Override
+                    protected Module spaceModule()
+                    {
+                        return new PlexusSpaceModule( space, BeanScanning.select( getProperties() ) );
+                    }
+                } ) );
+            }
         }
-
         return null;
     }