Refactored to org.jboss.forge.furnace, org.jboss.forge.test

forge · May 19, 2013 · 0802d77 · 0802d77
1 parent 1c0cb42
commit 0802d77
Show file tree

Hide file tree

Showing 69 changed files with 262 additions and 291 deletions.
diff --git a/addon-manager/api/pom.xml b/addon-manager/api/pom.xml
@@ -10,8 +10,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/addon-manager/example/pom.xml b/addon-manager/example/pom.xml
@@ -10,8 +10,8 @@
    <name>Forge - Example Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/addon-manager/example2/pom.xml b/addon-manager/example2/pom.xml
@@ -10,8 +10,8 @@
    <name>Forge - Example Addon 2</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <!-- Just added for testing dependency resolution -->

diff --git a/addon-manager/impl/pom.xml b/addon-manager/impl/pom.xml
@@ -12,8 +12,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/InstallRequestImpl.java b/addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/InstallRequestImpl.java
@@ -198,8 +198,8 @@ private AddonId toAddonId(DependencyNode node)
                   public boolean accept(DependencyNode node)
                   {
                      Coordinate coordinate = node.getDependency().getCoordinate();
-                     return "org.jboss.forge".equals(coordinate.getGroupId())
-                              && "forge-addon-container-api".equals(coordinate.getArtifactId());
+                     return "org.jboss.forge.furnace".equals(coordinate.getGroupId())
+                              && "furnace-api".equals(coordinate.getArtifactId());
                   }
                });
 

diff --git a/addon-manager/tests/pom.xml b/addon-manager/tests/pom.xml
@@ -37,12 +37,12 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.test</groupId>
          <artifactId>forge-test-harness</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.test</groupId>
          <artifactId>arquillian-forge-classpath</artifactId>
          <scope>test</scope>
       </dependency>

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

diff --git a/addons/api/src/main/java/org/jboss/forge/addons/facets/ForgeContainerAPIFacet.java b/addons/api/src/main/java/org/jboss/forge/addons/facets/ForgeContainerAPIFacet.java
@@ -22,8 +22,9 @@
 public class ForgeContainerAPIFacet extends AbstractFacet<Project> implements ProjectFacet
 {
    public static Dependency FORGE_API_DEPENDENCY = DependencyBuilder.create()
-            .setArtifactId("forge-addon-container-api")
-            .setGroupId("org.jboss.forge").setScopeType("provided");
+            .setGroupId("org.jboss.forge.furnace")
+            .setArtifactId("furnace-api")
+            .setScopeType("provided");
 
    @Inject
    private DependencyInstaller installer;

diff --git a/addons/impl/pom.xml b/addons/impl/pom.xml
@@ -9,8 +9,8 @@
    <name>Forge - Addon Development Addon Impl</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/addons/impl/src/main/java/org/jboss/forge/addons/AddonProjectConfigurator.java b/addons/impl/src/main/java/org/jboss/forge/addons/AddonProjectConfigurator.java
@@ -42,6 +42,8 @@
 @SuppressWarnings("unchecked")
 class AddonProjectConfigurator
 {
+   private static final String FORGE_ADDON_CLASSIFIER = "forge-addon";
+
    private Logger log = Logger.getLogger(getClass().getName());
 
    @Inject
@@ -55,6 +57,7 @@ class AddonProjectConfigurator
 
    public void setupSimpleAddonProject(Project project, Version forgeVersion, Iterable<AddonId> dependencyAddons)
    {
+      // TODO Use or remove forgeVersion parameter
       facetFactory.install(ForgeContainerAPIFacet.class, project);
       facetFactory.install(ForgeAddonFacet.class, project);
       facetFactory.install(ForgeAddonAPIFacet.class, project);
@@ -94,11 +97,11 @@ public void setupAddonProject(Project project, Version forgeVersion, Iterable<Ad
 
       Dependency spiProjectDependency = DependencyBuilder.create(
                spiProject.getFacet(MetadataFacet.class).getOutputDependency())
-               .setClassifier("forge-addon");
+               .setClassifier(FORGE_ADDON_CLASSIFIER);
 
       Dependency addonProjectDependency = DependencyBuilder.create(
                addonProject.getFacet(MetadataFacet.class).getOutputDependency())
-               .setClassifier("forge-addon");
+               .setClassifier(FORGE_ADDON_CLASSIFIER);
 
       dependencyInstaller.installManaged(project,
                DependencyBuilder.create(addonProjectDependency).setVersion("${project.version}"));
@@ -135,7 +138,7 @@ private void installSelectedAddons(final Project project, Iterable<AddonId> addo
          String[] mavenCoords = addon.getName().split(":");
          DependencyBuilder dependency = DependencyBuilder.create().setGroupId(mavenCoords[0])
                   .setArtifactId(mavenCoords[1])
-                  .setVersion(addon.getVersion().getVersionString()).setClassifier("forge-addon");
+                  .setVersion(addon.getVersion().getVersionString()).setClassifier(FORGE_ADDON_CLASSIFIER);
          if (managed)
          {
             dependencyInstaller.installManaged(project, dependency);

diff --git a/addons/impl/src/main/java/org/jboss/forge/addons/ForgeAddonSetupStep.java b/addons/impl/src/main/java/org/jboss/forge/addons/ForgeAddonSetupStep.java
@@ -112,7 +112,7 @@ private void configureAddonDependencies()
 
    private void configureVersions()
    {
-      Coordinate c = CoordinateBuilder.create().setGroupId("org.jboss.forge").setArtifactId("forge-addon-container");
+      Coordinate c = CoordinateBuilder.create().setGroupId("org.jboss.forge.furnace").setArtifactId("furnace");
       List<Version> versions = new ArrayList<Version>();
       for (Coordinate versionCoord : dependencyResolver.resolveVersions(DependencyQueryBuilder.create(c)))
       {

diff --git a/addons/tests/pom.xml b/addons/tests/pom.xml
@@ -31,12 +31,12 @@
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.test</groupId>
          <artifactId>forge-test-harness</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.test</groupId>
          <artifactId>arquillian-forge-classpath</artifactId>
          <scope>test</scope>
       </dependency>

diff --git a/addons/tests/src/test/java/org/jboss/forge/addons/AddonProjectConfiguratorTest.java b/addons/tests/src/test/java/org/jboss/forge/addons/AddonProjectConfiguratorTest.java
@@ -69,7 +69,7 @@ public void testCreateAddonProject()
       metadataFacet.setProjectVersion("1.0.0-SNAPSHOT");
       metadataFacet.setTopLevelPackage("com.acme.testproject");
 
-      SingleVersion forgeVersion = new SingleVersion("2.0.0.Alpha3");
+      SingleVersion forgeVersion = new SingleVersion("2.0.0-SNAPSHOT");
       addonProjectFactory.setupAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
 
       DirectoryResource projectRoot = project.getProjectRoot();
@@ -244,7 +244,7 @@ public void testSimpleAddonProject()
       metadataFacet.setProjectVersion("1.0.0-SNAPSHOT");
       metadataFacet.setTopLevelPackage("com.acme.testproject");
 
-      SingleVersion forgeVersion = new SingleVersion("2.0.0.Alpha3");
+      SingleVersion forgeVersion = new SingleVersion("2.0.0-SNAPSHOT");
       addonProjectFactory.setupSimpleAddonProject(project, forgeVersion, Collections.<AddonId> emptyList());
 
       Assert.assertTrue(project.hasFacet(CDIFacet.class));

diff --git a/addons/tests/src/test/java/org/jboss/forge/addons/NewAddonProjectAeshTest.java b/addons/tests/src/test/java/org/jboss/forge/addons/NewAddonProjectAeshTest.java
@@ -103,7 +103,7 @@ public void testContainerInjection() throws Exception
 
       // DependencyFacet dependencies = project.getFacet(DependencyFacet.class);
       // Assert.assertTrue(dependencies.hasEffectiveDependency(DependencyBuilder.create()
-      // .setGroupId("org.jboss.forge").setArtifactId("forge-addon-container-api")));
+      // .setGroupId("org.jboss.forge.furnace").setArtifactId("furnace-api")));
       // Assert.assertTrue("ADDON module is missing", projectRoot.getChild("addon").exists());
       // Assert.assertTrue("API module is missing", projectRoot.getChild("api").exists());
       // Assert.assertTrue("IMPL module is missing", projectRoot.getChild("impl").exists());

diff --git a/aesh/api/pom.xml b/aesh/api/pom.xml
@@ -12,8 +12,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/aesh/impl/pom.xml b/aesh/impl/pom.xml
@@ -33,8 +33,8 @@
          </exclusions>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/aesh/spi/pom.xml b/aesh/spi/pom.xml
@@ -10,8 +10,8 @@
    <name>Forge - Aesh SPI Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/aesh/test-harness/pom.xml b/aesh/test-harness/pom.xml
@@ -11,8 +11,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/aesh/tests/pom.xml b/aesh/tests/pom.xml
@@ -26,12 +26,12 @@
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.test</groupId>
          <artifactId>forge-test-harness</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.test</groupId>
          <artifactId>arquillian-forge-classpath</artifactId>
          <scope>test</scope>
       </dependency>

diff --git a/arquillian/classpath/pom.xml b/arquillian/classpath/pom.xml
@@ -3,8 +3,8 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
+      <groupId>org.jboss.forge.test</groupId>
       <artifactId>arquillian-forge-parent</artifactId>
-      <groupId>org.jboss.forge</groupId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
@@ -14,13 +14,14 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>arquillian-forge-core</artifactId>
-         <version>${project.version}</version>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace</artifactId>
+         <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container</artifactId>
+         <groupId>org.jboss.forge.test</groupId>
+         <artifactId>arquillian-forge-core</artifactId>
+         <scope>compile</scope>
       </dependency>
    </dependencies>
 </project>
diff --git a/arquillian/core/pom.xml b/arquillian/core/pom.xml
@@ -3,8 +3,8 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
+      <groupId>org.jboss.forge.test</groupId>
       <artifactId>arquillian-forge-parent</artifactId>
-      <groupId>org.jboss.forge</groupId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
@@ -13,6 +13,10 @@
    <name>Forge - Arquillian Container Adapter - Core</name>
 
    <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>
          <artifactId>addon-manager-impl</artifactId>
@@ -29,10 +33,6 @@
          <groupId>org.jboss.forge</groupId>
          <artifactId>resources-api</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>

diff --git a/arquillian/pom.xml b/arquillian/pom.xml
@@ -10,6 +10,7 @@
    </parent>
 
    <packaging>pom</packaging>
+   <groupId>org.jboss.forge.test</groupId>
    <artifactId>arquillian-forge-parent</artifactId>
    <name>Forge - Arquillian Container Adapters</name>
 
@@ -19,11 +20,6 @@
    </modules>
 
    <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container</artifactId>
-      </dependency>
-
       <dependency>
          <groupId>org.jboss.arquillian.container</groupId>
          <artifactId>arquillian-container-spi</artifactId>

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -25,8 +25,8 @@
          <artifactId>resources-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-addon-container</artifactId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace</artifactId>
       </dependency>
       <!-- Optional log manager dependency -->
       <dependency>

diff --git a/container-api/pom.xml b/container-api/pom.xml
@@ -9,7 +9,8 @@
       <relativePath>../pom.xml</relativePath>
    </parent>
 
-   <artifactId>forge-addon-container-api</artifactId>
+   <groupId>org.jboss.forge.furnace</groupId>
+   <artifactId>furnace-api</artifactId>
 
    <name>Forge - Addon Container API</name>
 

diff --git a/...oss/forge/container/util/Annotations.java → ...oss/forge/container/util/Annotations.java b/...oss/forge/container/util/Annotations.java → ...oss/forge/container/util/Annotations.java