Using AddonArchive instead of ForgeArchive

forge · Feb 27, 2015 · 8ccc2e5 · 8ccc2e5
1 parent d03061a
commit 8ccc2e5
Show file tree

Hide file tree

Showing 174 changed files with 621 additions and 621 deletions.
diff --git a/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java b/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
@@ -19,7 +19,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.addons.Addon;
 import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.addons.AddonRegistry;
@@ -88,10 +88,10 @@ public static void clearRemoteRepository()
             @AddonDeployment(name = "org.jboss.forge.addon:addon-manager"),
             @AddonDeployment(name = "org.jboss.forge.addon:maven")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/ui/AddonListCommandTest.java b/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/ui/AddonListCommandTest.java
@@ -19,7 +19,7 @@
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -38,9 +38,9 @@ public class AddonListCommandTest
             @AddonDeployment(name = "org.jboss.forge.addon:addon-manager"),
             @AddonDeployment(name = "org.jboss.forge.addon:shell-test-harness")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.addon:text"),

diff --git a/...ests/src/test/java/org/jboss/forge/addon/addons/project/AddonProjectConfiguratorTest.java b/...ests/src/test/java/org/jboss/forge/addon/addons/project/AddonProjectConfiguratorTest.java
@@ -42,7 +42,7 @@
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
@@ -63,9 +63,9 @@ public class AddonProjectConfiguratorTest
             @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi"),
             @AddonDeployment(name = "org.jboss.forge.addon:addons")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      return ShrinkWrap.create(ForgeArchive.class).
+      return ShrinkWrap.create(AddonArchive.class).
                addBeansXML().
                addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.addon:addons"),

diff --git a/addons/tests/src/test/java/org/jboss/forge/addon/addons/ui/NewAddonProjectAeshTest.java b/addons/tests/src/test/java/org/jboss/forge/addon/addons/ui/NewAddonProjectAeshTest.java
@@ -13,7 +13,7 @@
 import org.jboss.forge.addon.shell.test.ShellTest;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -38,10 +38,10 @@ public class NewAddonProjectAeshTest
             @AddonDeployment(name = "org.jboss.forge.addon:resources"),
             @AddonDeployment(name = "org.jboss.forge.addon:projects")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/...ion/tests/src/test/java/org/jboss/forge/addon/configuration/ConfigurationFactoryTest.java b/...ion/tests/src/test/java/org/jboss/forge/addon/configuration/ConfigurationFactoryTest.java
@@ -17,7 +17,7 @@
 import org.jboss.forge.addon.resource.ResourceFactory;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -35,10 +35,10 @@ public class ConfigurationFactoryTest
             @AddonDeployment(name = "org.jboss.forge.addon:projects"),
             @AddonDeployment(name = "org.jboss.forge.addon:configuration")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/configuration/tests/src/test/java/org/jboss/forge/addon/configuration/ConfigurationTest.java b/configuration/tests/src/test/java/org/jboss/forge/addon/configuration/ConfigurationTest.java
@@ -20,7 +20,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Test;
@@ -34,10 +34,10 @@ public class ConfigurationTest
             @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi"),
             @AddonDeployment(name = "org.jboss.forge.addon:configuration")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/...ion/tests/src/test/java/org/jboss/forge/addon/configuration/ProjectConfigurationTest.java b/...ion/tests/src/test/java/org/jboss/forge/addon/configuration/ProjectConfigurationTest.java
@@ -20,7 +20,7 @@
 import org.jboss.forge.addon.projects.ProjectFactory;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Test;
@@ -36,10 +36,10 @@ public class ProjectConfigurationTest
             @AddonDeployment(name = "org.jboss.forge.addon:projects"),
             @AddonDeployment(name = "org.jboss.forge.addon:configuration")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/...ration/tests/src/test/java/org/jboss/forge/addon/configuration/UserConfigurationTest.java b/...ration/tests/src/test/java/org/jboss/forge/addon/configuration/UserConfigurationTest.java
@@ -13,7 +13,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -28,10 +28,10 @@ public class UserConfigurationTest
             @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi"),
             @AddonDeployment(name = "org.jboss.forge.addon:configuration")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/...uration/tests/src/test/java/org/jboss/forge/addon/configuration/ui/ConfigCommandTest.java b/...uration/tests/src/test/java/org/jboss/forge/addon/configuration/ui/ConfigCommandTest.java
@@ -17,7 +17,7 @@
 import org.jboss.forge.addon.ui.result.Failed;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.After;
@@ -37,10 +37,10 @@ public class ConfigCommandTest
             @AddonDeployment(name = "org.jboss.forge.addon:projects"),
             @AddonDeployment(name = "org.jboss.forge.addon:maven"),
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/convert/tests/src/test/java/org/jboss/forge/addon/convert/CDIConverterTest.java b/convert/tests/src/test/java/org/jboss/forge/addon/convert/CDIConverterTest.java
@@ -13,7 +13,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -28,10 +28,10 @@ public class CDIConverterTest
             @AddonDeployment(name = "org.jboss.forge.addon:convert"),
             @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addClass(CDIConverterTest.class)
                .addAsAddonDependencies(

diff --git a/convert/tests/src/test/java/org/jboss/forge/addon/convert/exported/ConverterFactoryTest.java b/convert/tests/src/test/java/org/jboss/forge/addon/convert/exported/ConverterFactoryTest.java
@@ -16,7 +16,7 @@
 import org.jboss.forge.addon.convert.exception.ConverterNotFoundException;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -35,10 +35,10 @@ public class ConverterFactoryTest
             @AddonDeployment(name = "org.jboss.forge.addon:convert"),
             @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addPackage(StringToExportedConverterTest.class.getPackage())
                .addAsAddonDependencies(

diff --git a/...s/src/test/java/org/jboss/forge/addon/convert/exported/StringToExportedConverterTest.java b/...s/src/test/java/org/jboss/forge/addon/convert/exported/StringToExportedConverterTest.java
@@ -17,7 +17,7 @@
 import org.jboss.forge.addon.convert.Converter;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -32,10 +32,10 @@ public class StringToExportedConverterTest
             @AddonDeployment(name = "org.jboss.forge.addon:convert"),
             @AddonDeployment(name = "org.jboss.forge.furnace.container:cdi")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addPackage(StringToExportedConverterTest.class.getPackage())
                .addAsAddonDependencies(

diff --git a/core/tests/src/test/java/org/jboss/forge/addon/core/ProjectNewFromArchetypeCommandTest.java b/core/tests/src/test/java/org/jboss/forge/addon/core/ProjectNewFromArchetypeCommandTest.java
@@ -15,7 +15,7 @@
 import org.jboss.forge.addon.ui.test.UITestHarness;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -32,10 +32,10 @@ public class ProjectNewFromArchetypeCommandTest
             @AddonDeployment(name = "org.jboss.forge.addon:maven"),
             @AddonDeployment(name = "org.jboss.forge.addon:ui-test-harness")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/...t/java/org/jboss/forge/addon/database/tools/connections/ConnectionProfileManagerTest.java b/...t/java/org/jboss/forge/addon/database/tools/connections/ConnectionProfileManagerTest.java
@@ -15,7 +15,7 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -33,10 +33,10 @@ public class ConnectionProfileManagerTest
             @AddonDeployment(name = "org.jboss.forge.addon:projects"),
             @AddonDeployment(name = "org.jboss.forge.addon:database-tools")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/.../org/jboss/forge/addon/database/tools/connections/CreateConnectionProfileCommandTest.java b/.../org/jboss/forge/addon/database/tools/connections/CreateConnectionProfileCommandTest.java
@@ -25,7 +25,7 @@
 import org.jboss.forge.addon.ui.test.UITestHarness;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -49,10 +49,10 @@ public class CreateConnectionProfileCommandTest
             @AddonDeployment(name = "org.jboss.forge.addon:maven"),
             @AddonDeployment(name = "org.jboss.forge.addon:ui-test-harness")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/.../org/jboss/forge/addon/database/tools/connections/RemoveConnectionProfileCommandTest.java b/.../org/jboss/forge/addon/database/tools/connections/RemoveConnectionProfileCommandTest.java
@@ -18,7 +18,7 @@
 import org.jboss.forge.addon.ui.test.UITestHarness;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
@@ -37,10 +37,10 @@ public class RemoveConnectionProfileCommandTest
             @AddonDeployment(name = "org.jboss.forge.addon:database-tools"),
             @AddonDeployment(name = "org.jboss.forge.addon:ui-test-harness")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),

diff --git a/.../test/java/org/jboss/forge/addon/database/tools/generate/GenerateEntitiesCommandTest.java b/.../test/java/org/jboss/forge/addon/database/tools/generate/GenerateEntitiesCommandTest.java
@@ -33,7 +33,7 @@
 import org.jboss.forge.addon.ui.test.UITestHarness;
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.After;
@@ -57,10 +57,10 @@ public class GenerateEntitiesCommandTest
             @AddonDeployment(name = "org.jboss.forge.addon:ui-test-harness"),
             @AddonDeployment(name = "org.jboss.forge.addon:maven")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),