Facets addon uses simple container instead of CDI. Tests failing

forge · Nov 1, 2013 · 655bc5c · 655bc5c
1 parent 60a457a
commit 655bc5c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/facets/addon/pom.xml b/facets/addon/pom.xml
@@ -25,7 +25,7 @@
       <!-- Furnace Container -->
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
-         <artifactId>cdi</artifactId>
+         <artifactId>simple</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>

diff --git a/facets/impl/pom.xml b/facets/impl/pom.xml
@@ -10,21 +10,24 @@
    <name>Forge - Facets Addon Impl</name>
 
    <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge.furnace.container</groupId>
-         <artifactId>cdi-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
          <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
-      
+
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets-api</artifactId>
          <scope>provided</scope>
       </dependency>
+
+      <dependency>
+         <groupId>org.jboss.forge.furnace.container</groupId>
+         <artifactId>simple</artifactId>
+         <classifier>forge-addon</classifier>
+         <scope>provided</scope>
+      </dependency>
+
    </dependencies>
 </project>
diff --git a/facets/impl/src/main/java/org/jboss/forge/addon/facets/FacetFactoryImpl.java b/facets/impl/src/main/java/org/jboss/forge/addon/facets/FacetFactoryImpl.java
@@ -15,11 +15,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.inject.Inject;
-
 import org.jboss.forge.addon.facets.constraints.FacetConstraint;
 import org.jboss.forge.addon.facets.constraints.FacetInspector;
 import org.jboss.forge.furnace.addons.AddonRegistry;
+import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 import org.jboss.forge.furnace.services.Imported;
 import org.jboss.forge.furnace.util.Assert;
 import org.jboss.forge.furnace.util.Predicate;
@@ -31,8 +30,12 @@ public class FacetFactoryImpl implements FacetFactory
 {
    private static final Logger log = Logger.getLogger(FacetFactoryImpl.class.getName());
 
-   @Inject
-   private AddonRegistry registry;
+   private final AddonRegistry registry;
+
+   public FacetFactoryImpl()
+   {
+      this.registry = SimpleContainer.getFurnace(getClass().getClassLoader()).getAddonRegistry();
+   }
 
    @Override
    public <FACETEDTYPE extends Faceted<?>, FACETTYPE extends Facet<FACETEDTYPE>> FACETTYPE create(

diff --git a/facets/impl/src/main/resources/META-INF/services/org.jboss.forge.addon.facets.FacetFactory b/facets/impl/src/main/resources/META-INF/services/org.jboss.forge.addon.facets.FacetFactory
@@ -0,0 +1 @@
+org.jboss.forge.addon.facets.FacetFactoryImpl
diff --git a/facets/tests/pom.xml b/facets/tests/pom.xml
@@ -13,6 +13,12 @@
          <artifactId>facets</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.furnace.container</groupId>
+         <artifactId>simple</artifactId>
+         <classifier>forge-addon</classifier>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
          <artifactId>cdi</artifactId>