I guess we need furnace-api after-all. For now this won't hurt.

forge · Jul 12, 2013 · 181f532 · 181f532
1 parent 0b3d427
commit 181f532
Show file tree

Hide file tree

Showing 57 changed files with 310 additions and 123 deletions.
diff --git a/addon-manager/api/pom.xml b/addon-manager/api/pom.xml
@@ -15,6 +15,12 @@
          <artifactId>container-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>dependencies-api</artifactId>

diff --git a/addon-manager/impl/pom.xml b/addon-manager/impl/pom.xml
@@ -17,6 +17,12 @@
          <artifactId>container-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>addon-manager-api</artifactId>

diff --git a/addons/addon/pom.xml b/addons/addon/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
-   
+
    <artifactId>addons</artifactId>
    <name>Forge - Addon Development Addon</name>
-   
+
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
@@ -21,7 +22,15 @@
          <artifactId>addons-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
-
+
+      <!-- Furnace Container -->
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>container-cdi</artifactId>
+         <classifier>forge-addon</classifier>
+         <scope>provided</scope>
+      </dependency>
+
       <!-- Addon Dependencies -->
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
@@ -49,14 +58,6 @@
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
-
-      <!-- Furnace Container -->
-      <dependency>
-         <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>container-cdi</artifactId>
-         <classifier>forge-addon</classifier>
-         <scope>provided</scope>
-      </dependency>
    </dependencies>
    <build>
       <plugins>

diff --git a/addons/api/pom.xml b/addons/api/pom.xml
@@ -11,7 +11,7 @@
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>furnace-api</artifactId>
+         <artifactId>container-cdi-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/addons/impl/pom.xml b/addons/impl/pom.xml
@@ -13,6 +13,12 @@
          <artifactId>container-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>addons-api</artifactId>

diff --git a/addons/tests/pom.xml b/addons/tests/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
@@ -8,6 +9,15 @@
    <artifactId>addons-tests</artifactId>
    <name>Forge - Addon Development Addon Tests</name>
    <dependencies>
+
+      <!-- Furnace Container -->
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>container-cdi</artifactId>
+         <classifier>forge-addon</classifier>
+         <scope>provided</scope>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons</artifactId>
@@ -30,6 +40,7 @@
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
+
       <dependency>
          <groupId>org.jboss.forge.test</groupId>
          <artifactId>forge-test-harness</artifactId>

diff --git a/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java b/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java
@@ -13,7 +13,6 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.addon.addons.AddonProjectConfigurator;
 import org.jboss.forge.addon.addons.facets.ForgeContainerAPIFacet;
 import org.jboss.forge.addon.dependencies.Dependency;
 import org.jboss.forge.addon.dependencies.builder.DependencyBuilder;
@@ -42,17 +41,17 @@ public class AddonProjectConfiguratorTest
 {
    @Deployment
    @Dependencies({
+            @AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT"),
             @AddonDependency(name = "org.jboss.forge.addon:addons", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
       return ShrinkWrap.create(ForgeArchive.class).
                addBeansXML().
-               addPackages(true, AddonProjectConfigurator.class.getPackage()).
                addAsAddonDependencies(
-                        AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
                         AddonDependencyEntry.create("org.jboss.forge.addon:addons", "2.0.0-SNAPSHOT"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT")
+                        AddonDependencyEntry.create("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT")
                );
    }
 

diff --git a/configuration/addon/pom.xml b/configuration/addon/pom.xml
@@ -9,11 +9,6 @@
    <name>Forge - Configuration Addon</name>
    <artifactId>configuration</artifactId>
    <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>furnace-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>configuration-api</artifactId>

diff --git a/configuration/api/pom.xml b/configuration/api/pom.xml
@@ -9,11 +9,17 @@
    <artifactId>configuration-api</artifactId>
    <name>Forge - Configuration API</name>
    <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>container-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>projects</artifactId>

diff --git a/configuration/impl/pom.xml b/configuration/impl/pom.xml
@@ -15,6 +15,12 @@
          <artifactId>container-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>configuration-api</artifactId>

diff --git a/configuration/pom.xml b/configuration/pom.xml
@@ -18,12 +18,6 @@
    </modules>
    <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.jboss.forge.furnace</groupId>
-            <artifactId>furnace-api</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>provided</scope>
-         </dependency>
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>configuration</artifactId>

diff --git a/convert/api/pom.xml b/convert/api/pom.xml
@@ -14,5 +14,10 @@
          <artifactId>container-cdi-api</artifactId>
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
    </dependencies>
 </project>
diff --git a/convert/impl/pom.xml b/convert/impl/pom.xml
@@ -13,6 +13,12 @@
          <artifactId>container-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>convert-api</artifactId>

diff --git a/environment/impl/pom.xml b/environment/impl/pom.xml
@@ -13,6 +13,12 @@
          <artifactId>container-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>environment-api</artifactId>

diff --git a/facets/addon/pom.xml b/facets/addon/pom.xml
@@ -22,11 +22,6 @@
          <artifactId>facets-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>furnace-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
 
       <!-- Furnace Container -->
       <dependency>

diff --git a/facets/impl/pom.xml b/facets/impl/pom.xml
@@ -16,6 +16,12 @@
          <artifactId>container-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>

diff --git a/javaee/api/pom.xml b/javaee/api/pom.xml
@@ -14,6 +14,12 @@
          <artifactId>container-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>projects</artifactId>

diff --git a/javaee/impl/pom.xml b/javaee/impl/pom.xml
@@ -10,15 +10,21 @@
    <name>Forge - JavaEE Impl</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-         <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>container-cdi-api</artifactId>
+         <scope>provided</scope>
       </dependency>
-
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>container-cdi-api</artifactId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
+
+      <dependency>
+         <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+         <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-api</artifactId>

diff --git a/javaee/pom.xml b/javaee/pom.xml
@@ -26,12 +26,6 @@
    </properties>
    <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.jboss.forge.furnace</groupId>
-            <artifactId>furnace-api</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>provided</scope>
-         </dependency>
          <dependency>
             <groupId>org.jboss.spec</groupId>
             <artifactId>jboss-javaee-6.0</artifactId>

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/JavaEETestHelper.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/JavaEETestHelper.java
@@ -7,11 +7,7 @@
 
 package org.jboss.forge.addon.javaee;
 
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
 import org.jboss.forge.arquillian.archive.ForgeArchive;
-import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.forge.ui.test.WizardTester;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -22,16 +18,9 @@
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
  * 
  */
-public abstract class JavaEETestHelper
+public final class JavaEETestHelper
 {
-   @Deployment
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace:container-cdi", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:javaee", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
-   })
-   public static ForgeArchive getDeployment()
+   public static ForgeArchive getDeploymentx()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java
@@ -15,13 +15,14 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.addon.facets.FacetFactory;
-import org.jboss.forge.addon.javaee.JavaEETestHelper;
 import org.jboss.forge.addon.javaee.facets.CDIFacet;
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.projects.ProjectFactory;
 import org.jboss.forge.arquillian.AddonDependency;
 import org.jboss.forge.arquillian.Dependencies;
 import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.descriptor.api.beans10.BeansDescriptor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +37,13 @@ public class CDIFacetTest
    })
    public static ForgeArchive getDeployment()
    {
-      return JavaEETestHelper.getDeployment();
+      return ShrinkWrap.create(ForgeArchive.class)
+               .addBeansXML()
+               .addAsAddonDependencies(
+                        AddonDependencyEntry.create("org.jboss.forge.furnace:container-cdi", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT")
+               );
    }
 
    @Inject