Fixed compilation errors due to furnace changes

forge · Feb 26, 2015 · aec07d7 · aec07d7
1 parent fbdfe39
commit aec07d7
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 67 deletions.
diff --git a/.../org/jboss/forge/furnace/container/simple/AddonRegistryIncompatibleServiceLookupTest.java b/.../org/jboss/forge/furnace/container/simple/AddonRegistryIncompatibleServiceLookupTest.java
@@ -14,9 +14,9 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+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;
@@ -38,12 +38,12 @@ public class AddonRegistryIncompatibleServiceLookupTest
 {
 
    @Deployment
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClass(Aa.class)
                .addBeansXML()
                .addAsServiceProvider(Service.class, AddonRegistryIncompatibleServiceLookupTest.class)
@@ -58,9 +58,9 @@ public static ForgeArchive getDeployment()
    }
 
    @Deployment(name = "test:dep2,2", testable = false, order = 2)
-   public static ForgeArchive getDeploymentDep2()
+   public static AddonArchive getDeploymentDep2()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClass(BB.class)
                .addAsServiceProvider(Service.class, BB.class)
                .addAsAddonDependencies(
@@ -70,10 +70,10 @@ public static ForgeArchive getDeploymentDep2()
    }
 
    @Deployment(name = "test:dep1,1", testable = false, order = 1)
-   public static ForgeArchive getDeploymentDep1()
+   public static AddonArchive getDeploymentDep1()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addClass(BB.class)
                .addAsServiceProvider(Service.class, BB.class)
                .addAsAddonDependencies(

diff --git a/...est/java/org/jboss/forge/furnace/container/simple/AddonRegistryInheritanceLookupTest.java b/...est/java/org/jboss/forge/furnace/container/simple/AddonRegistryInheritanceLookupTest.java
@@ -14,9 +14,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.arquillian.AddonDependencies;
 import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+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;
@@ -38,12 +40,12 @@ public class AddonRegistryInheritanceLookupTest
 {
 
    @Deployment
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addBeansXML()
                .addAsServiceProvider(Service.class, AddonRegistryInheritanceLookupTest.class)
                .addAsAddonDependencies(
@@ -57,9 +59,9 @@ public static ForgeArchive getDeployment()
    }
 
    @Deployment(name = "test:dep2,2", testable = false, order = 2)
-   public static ForgeArchive getDeploymentDep2()
+   public static AddonArchive getDeploymentDep2()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClass(PublishedServiceSubtype.class)
                .addAsServiceProvider(Service.class, PublishedServiceSubtype.class)
                .addAsAddonDependencies(
@@ -70,9 +72,9 @@ public static ForgeArchive getDeploymentDep2()
    }
 
    @Deployment(name = "test:dep1,1", testable = false, order = 1)
-   public static ForgeArchive getDeploymentDep1()
+   public static AddonArchive getDeploymentDep1()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClass(PublishedService.class)
                .addAsServiceProvider(Service.class, PublishedService.class)
                .addAsAddonDependencies(

diff --git a/...c/test/java/org/jboss/forge/furnace/container/simple/AddonRegistryInstanceLookupTest.java b/...c/test/java/org/jboss/forge/furnace/container/simple/AddonRegistryInstanceLookupTest.java
@@ -10,9 +10,9 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
@@ -29,12 +29,12 @@
 public class AddonRegistryInstanceLookupTest
 {
    @Deployment(order = 2)
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addAsServiceProvider(Service.class, AddonRegistryInstanceLookupTest.class)
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:simple"),
@@ -45,19 +45,19 @@ public static ForgeArchive getDeployment()
    }
 
    @Deployment(name = "dependency,1", testable = false, order = 1)
-   public static ForgeArchive getDependencyDeployment()
+   public static AddonArchive getDependencyDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(PublishedService.class)
                .addAsLocalServices(PublishedService.class);
 
       return archive;
    }
 
    @Deployment(name = "other,1", testable = false, order = 0)
-   public static ForgeArchive getContainerDeployment()
+   public static AddonArchive getContainerDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(PublishedService.class)
                .addAsLocalServices(PublishedService.class);
 

diff --git a/...c/test/java/org/jboss/forge/furnace/container/simple/AddonRegistryMultipleAddonsTest.java b/...c/test/java/org/jboss/forge/furnace/container/simple/AddonRegistryMultipleAddonsTest.java
@@ -14,9 +14,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.arquillian.AddonDependencies;
 import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+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;
@@ -38,12 +40,12 @@ public class AddonRegistryMultipleAddonsTest
 {
 
    @Deployment
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addBeansXML()
                .addAsServiceProvider(Service.class, AddonRegistryMultipleAddonsTest.class)
                .addAsAddonDependencies(
@@ -57,9 +59,9 @@ public static ForgeArchive getDeployment()
    }
 
    @Deployment(name = "test:dep2,2", testable = false, order = 2)
-   public static ForgeArchive getDeploymentDep2()
+   public static AddonArchive getDeploymentDep2()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClass(BB.class)
                .addAsServiceProvider(Service.class, BB.class)
                .addAsAddonDependencies(
@@ -69,10 +71,10 @@ public static ForgeArchive getDeploymentDep2()
    }
 
    @Deployment(name = "test:dep1,1", testable = false, order = 1)
-   public static ForgeArchive getDeploymentDep1()
+   public static AddonArchive getDeploymentDep1()
    {
-      ForgeArchive archive = ShrinkWrap
-               .create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap
+               .create(AddonArchive.class)
                .addClass(Aa.class)
                .addAsServiceProvider(Service.class, Aa.class)
                .addAsAddonDependencies(

diff --git a/.../src/test/java/org/jboss/forge/furnace/container/simple/ContainerLifecycleEventsTest.java b/.../src/test/java/org/jboss/forge/furnace/container/simple/ContainerLifecycleEventsTest.java
@@ -8,9 +8,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.arquillian.AddonDependencies;
 import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.forge.furnace.services.Imported;
@@ -26,12 +28,12 @@
 public class ContainerLifecycleEventsTest
 {
    @Deployment
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(ContainerLifecycleEventsTest.class)
                .addClasses(LifecycleEventListener.class)
                .addAsServiceProvider(Service.class, ContainerLifecycleEventsTest.class)

diff --git a/tests/src/test/java/org/jboss/forge/furnace/container/simple/ImportedLookupTest.java b/tests/src/test/java/org/jboss/forge/furnace/container/simple/ImportedLookupTest.java
@@ -9,9 +9,9 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.arquillian.services.LocalServices;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.container.simple.services.MockService;
@@ -29,12 +29,12 @@
 public class ImportedLookupTest
 {
    @Deployment(order = 3)
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(MockService.class, MockServiceConsumer.class)
                .addAsLocalServices(ImportedLookupTest.class)
                .addAsAddonDependencies(
@@ -45,9 +45,9 @@ public static ForgeArchive getDeployment()
    }
 
    @Deployment(name = "dep1,1", testable = false, order = 2)
-   public static ForgeArchive getDeploymentDep1()
+   public static AddonArchive getDeploymentDep1()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(MockServiceConsumer.class, MockService.class)
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("dep3"),
@@ -58,9 +58,9 @@ public static ForgeArchive getDeploymentDep1()
    }
 
    @Deployment(name = "dep3,1", testable = false, order = 0)
-   public static ForgeArchive getDeploymentDep3()
+   public static AddonArchive getDeploymentDep3()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(MockServicePayload.class)
                .addAsAddonDependencies(
                         AddonDependencyEntry.create("org.jboss.forge.furnace.container:simple")

diff --git a/tests/src/test/java/org/jboss/forge/furnace/container/simple/SingletonServiceTest.java b/tests/src/test/java/org/jboss/forge/furnace/container/simple/SingletonServiceTest.java
@@ -11,9 +11,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.arquillian.AddonDependencies;
 import org.jboss.forge.arquillian.AddonDependency;
-import org.jboss.forge.arquillian.Dependencies;
-import org.jboss.forge.arquillian.archive.ForgeArchive;
+import org.jboss.forge.arquillian.AddonDeployment;
+import org.jboss.forge.arquillian.AddonDeployments;
+import org.jboss.forge.arquillian.archive.AddonArchive;
 import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.forge.furnace.services.Imported;
@@ -25,12 +27,12 @@
 public class SingletonServiceTest
 {
    @Deployment
-   @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.furnace.container:simple")
+   @AddonDeployments({
+            @AddonDeployment(name = "org.jboss.forge.furnace.container:simple")
    })
-   public static ForgeArchive getDeployment()
+   public static AddonArchive getDeployment()
    {
-      ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
+      AddonArchive archive = ShrinkWrap.create(AddonArchive.class)
                .addClasses(SingletonServiceTest.class)
                .addClasses(SimpleSingletonInstance.class)
                .addAsServiceProvider(SingletonService.class, SimpleSingletonInstance.class)