FORGE-1658: environment now uses simple container

forge · Mar 8, 2014 · 29320ca · 29320ca
1 parent f9a8702
commit 29320ca
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/environment/addon/pom.xml b/environment/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/environment/impl/pom.xml b/environment/impl/pom.xml
@@ -8,15 +8,15 @@
    <artifactId>environment-impl</artifactId>
    <name>Forge - Environment Impl</name>
    <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge.furnace.container</groupId>
-         <artifactId>cdi-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-api</artifactId>
       </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/environment/impl/src/main/java/org/jboss/forge/addon/environment/impl/EnvironmentImpl.java b/environment/impl/src/main/java/org/jboss/forge/addon/environment/impl/EnvironmentImpl.java
@@ -12,15 +12,13 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Singleton;
-
 import org.jboss.forge.addon.environment.Category;
 import org.jboss.forge.addon.environment.Environment;
+import org.jboss.forge.furnace.container.simple.Service;
 
-@Singleton
-public class EnvironmentImpl implements Environment
+public class EnvironmentImpl implements Environment, Service
 {
-   private Map<String, Map<Object, Object>> categorizedMap =
+   private static final Map<String, Map<Object, Object>> categorizedMap =
             Collections.synchronizedMap(
                      new HashMap<String, Map<Object, Object>>());
 

diff --git a/environment/impl/src/main/resources/META-INF/beans.xml b/environment/impl/src/main/resources/META-INF/beans.xml
diff --git a/...mpl/src/main/resources/META-INF/services/org.jboss.forge.furnace.container.simple.Service b/...mpl/src/main/resources/META-INF/services/org.jboss.forge.furnace.container.simple.Service
@@ -0,0 +1 @@
+org.jboss.forge.addon.environment.impl.EnvironmentImpl
diff --git a/environment/tests/src/test/java/org/jboss/forge/addon/environment/CDIEnvironmentTest.java b/environment/tests/src/test/java/org/jboss/forge/addon/environment/CDIEnvironmentTest.java
@@ -32,7 +32,7 @@ public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
-               .addPackages(true, CDIEnvironmentTest.class.getPackage())
+               .addClasses(TestCategory.class, UserInterfaceCategory.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),