Container is a little more stable. Doesn't re-load already loaded add…

…ons.
forge · Mar 20, 2013 · a435f41 · a435f41
1 parent ad67f1b
commit a435f41
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 96 deletions.
diff --git a/arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java b/arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java
@@ -32,6 +32,7 @@
 import org.jboss.forge.container.exception.ContainerException;
 import org.jboss.forge.container.impl.AddonRepositoryImpl;
 import org.jboss.forge.container.repositories.MutableAddonRepository;
+import org.jboss.forge.container.util.Addons;
 import org.jboss.forge.container.util.ClassLoaders;
 import org.jboss.forge.container.util.Files;
 import org.jboss.forge.container.util.Threads;
@@ -188,8 +189,9 @@ public void undeploy(Archive<?> archive) throws DeploymentException
       try
       {
          repository.disable(addonToUndeploy);
-         if (registry.isRegistered(addonToUndeploy))
-            registry.stop(registry.getRegisteredAddon(addonToUndeploy));
+         Addon registeredAddon = registry.getRegisteredAddon(addonToUndeploy);
+         registry.stop(registeredAddon);
+         Addons.waitUntilStopped(registry.getRegisteredAddon(addonToUndeploy));
       }
       catch (Exception e)
       {

diff --git a/arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeTestMethodExecutor.java b/arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeTestMethodExecutor.java
@@ -65,6 +65,9 @@ public TestResult invoke(final TestMethodExecutor testMethodExecutor)
 
       try
       {
+         System.out.println("Executing test class: "
+                  + testMethodExecutor.getInstance().getClass().getName());
+
          final String testClassName = testMethodExecutor.getInstance().getClass().getName();
          final AddonRegistry addonRegistry = forge.getAddonRegistry();
 
@@ -148,7 +151,10 @@ public Object call() throws Exception
                {
                   try
                   {
-                     System.out.println("Executing test method: " + method);
+                     System.out.println("Executing test method: "
+                              + testMethodExecutor.getInstance().getClass().getName() + "."
+                              + testMethodExecutor.getMethod().getName() + "()");
+
                      method.invoke(instance);
                      result = new TestResult(Status.PASSED);
                   }
@@ -189,9 +195,11 @@ public Object call() throws Exception
       }
       catch (Exception e)
       {
-         throw new IllegalStateException("Error launching test "
+         String message = "Error launching test "
                   + testMethodExecutor.getInstance().getClass().getName() + "."
-                  + testMethodExecutor.getMethod().getName() + "()", e);
+                  + testMethodExecutor.getMethod().getName() + "()";
+         System.out.println(message);
+         throw new IllegalStateException(message, e);
       }
    }
 }
diff --git a/container-api/src/main/java/org/jboss/forge/container/util/Addons.java b/container-api/src/main/java/org/jboss/forge/container/util/Addons.java
@@ -26,7 +26,22 @@ public static void waitUntilStarted(Addon addon)
       }
       catch (Exception e)
       {
-         throw new ContainerException("Addon was not started.", e);
+         throw new ContainerException("Addon [" + addon + "]  was not started.", e);
+      }
+   }
+
+   public static void waitUntilStopped(Addon addon)
+   {
+      try
+      {
+         while (!(addon.getStatus().isStopped() || addon.getStatus().isMissing()))
+         {
+            Thread.sleep(10);
+         }
+      }
+      catch (Exception e)
+      {
+         throw new ContainerException("Addon [" + addon + "] was not stopped.", e);
       }
    }
 

diff --git a/...tainer/dependencies/AddonHotSwapTest.java → ...ontainer/deployment/AddonHotSwapTest.java b/...tainer/dependencies/AddonHotSwapTest.java → ...ontainer/deployment/AddonHotSwapTest.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.container.dependencies;
+package org.jboss.forge.container.deployment;
 
 import java.util.Set;
 import java.util.concurrent.Future;

diff --git a/...s/AddonMultipleDependencyVersionTest.java → ...t/AddonMultipleDependencyVersionTest.java b/...s/AddonMultipleDependencyVersionTest.java → ...t/AddonMultipleDependencyVersionTest.java
@@ -1,4 +1,4 @@
-package org.jboss.forge.container.dependencies;
+package org.jboss.forge.container.deployment;
 
 import javax.inject.Inject;
 

diff --git a/container/src/main/java/org/jboss/forge/container/ForgeImpl.java b/container/src/main/java/org/jboss/forge/container/ForgeImpl.java
@@ -37,7 +37,7 @@ public class ForgeImpl implements Forge
 
    private List<AddonRepository> repositories = new ArrayList<AddonRepository>();
 
-   private LockManager lock = new LockManagerImpl();
+   private final LockManager lock = new LockManagerImpl();
 
    public ForgeImpl()
    {

diff --git a/container/src/main/java/org/jboss/forge/container/addons/AddonTree.java b/container/src/main/java/org/jboss/forge/container/addons/AddonTree.java
@@ -35,26 +35,23 @@ public AddonTree(LockManager lock)
 
    public void add(final Addon addon)
    {
-      ValuedVisitor<Boolean, Addon> exists = new ValuedVisitor<Boolean, Addon>()
+      for (Addon existing : this)
       {
-         @Override
-         public void visit(Addon instance)
-         {
-            if (instance.equals(addon) || instance.getId().equals(addon.getId()))
-               setResult(true);
-         }
-      };
-
-      if (exists.getResult() != null && exists.getResult() == true)
-      {
-         throw new IllegalArgumentException("Cannot add duplicate Addon [" + addon + "] to the registry.");
+         if (existing.equals(addon) || existing.getId().equals(addon.getId()))
+            throw new IllegalArgumentException("Cannot add duplicate Addon [" + addon + "] to the registry.");
       }
-      else
+      reattach(addon);
+
+      System.out.println("Added [" + addon + "]");
+   }
+
+   public void reattach(Addon addon)
+   {
+      if (!contains(addon))
       {
          root.getMutableDependencies().add(
                   new AddonDependencyImpl(lock, root, new SingleVersionRange(addon.getId().getVersion()), addon,
                            false, false));
-
          prune();
       }
    }
@@ -100,6 +97,7 @@ public void visit(Addon instance)
    public void depthFirst(Visitor<Addon> visitor)
    {
       Set<Addon> seen = new HashSet<Addon>();
+      seen.add(root);
       visitDepthFirst(seen, root, visitor);
    }
 
@@ -122,9 +120,7 @@ public void breadthFirst(Visitor<Addon> visitor)
       Queue<Addon> queue = new LinkedList<Addon>();
       Set<Addon> seen = new HashSet<Addon>();
 
-      visitor.visit(root);
       seen.add(root);
-
       queue.add(root);
 
       while (!queue.isEmpty())
@@ -154,7 +150,8 @@ public Iterator<Addon> iterator()
          @Override
          public void visit(Addon instance)
          {
-            getResult().add(instance);
+            if (!root.equals(instance))
+               getResult().add(instance);
          }
       };
 

diff --git a/container/src/main/java/org/jboss/forge/container/impl/AddonImpl.java b/container/src/main/java/org/jboss/forge/container/impl/AddonImpl.java
@@ -39,6 +39,13 @@ private static class Memento
       public Future<Addon> future;
       public AddonRepository repository;
       public ServiceRegistry registry;
+
+      @Override
+      public String toString()
+      {
+         return status.toString();
+      }
+
    }
 
    @SuppressWarnings("unused")