First green bar, not currently doing any graph management

forge · Jul 2, 2013 · 2091939 · 2091939
1 parent 8fcb97b
commit 2091939
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 45 deletions.
diff --git a/container-api/src/main/java/org/jboss/forge/furnace/addons/Addon.java b/container-api/src/main/java/org/jboss/forge/furnace/addons/Addon.java
@@ -53,7 +53,8 @@ public interface Addon
 
    /**
     * Return the {@link Future} representing the boot-up sequence for this {@link Addon} instance. Returns
-    * <code>null</code> if the {@link Addon} is not starting, {@link AddonStatus#isStarted()} or {@link AddonStatus#isFailed()}
+    * <code>null</code> if the {@link Addon} is not starting, {@link AddonStatus#isStarted()} or
+    * {@link AddonStatus#isFailed()}
     */
    public Future<Void> getFuture();
 }
diff --git a/container/src/main/java/org/jboss/forge/furnace/FurnaceImpl.java b/container/src/main/java/org/jboss/forge/furnace/FurnaceImpl.java
@@ -18,9 +18,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.jboss.forge.furnace.addons.AddonLifecycleManager;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.addons.AddonView;
-import org.jboss.forge.furnace.impl.AddonLifecycleManager;
 import org.jboss.forge.furnace.impl.AddonRegistryImpl;
 import org.jboss.forge.furnace.impl.AddonRepositoryImpl;
 import org.jboss.forge.furnace.impl.ImmutableAddonRepository;

diff --git a/container/src/main/java/org/jboss/forge/furnace/addons/AddonDependencyImpl.java b/container/src/main/java/org/jboss/forge/furnace/addons/AddonDependencyImpl.java
@@ -6,6 +6,8 @@
  */
 package org.jboss.forge.furnace.addons;
 
+import org.jboss.forge.furnace.addons.Addon;
+import org.jboss.forge.furnace.addons.AddonDependency;
 import org.jboss.forge.furnace.lock.LockManager;
 import org.jboss.forge.furnace.util.Assert;
 import org.jboss.forge.furnace.versions.Version;

diff --git a/...g/jboss/forge/furnace/impl/AddonImpl.java → ...jboss/forge/furnace/addons/AddonImpl.java b/...g/jboss/forge/furnace/impl/AddonImpl.java → ...jboss/forge/furnace/addons/AddonImpl.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.furnace.impl;
+package org.jboss.forge.furnace.addons;
 
 import java.util.Collections;
 import java.util.Set;
@@ -88,11 +88,6 @@ public Set<AddonDependency> getDependencies()
       return Collections.unmodifiableSet(state.dependencies);
    }
 
-   public Set<AddonDependency> getMutableDependencies()
-   {
-      return state.dependencies;
-   }
-
    public void setDependencies(Set<AddonDependency> dependencies)
    {
       Assert.notNull(dependencies, "Dependencies must not be null.");

diff --git a/...e/furnace/impl/AddonLifecycleManager.java → ...furnace/addons/AddonLifecycleManager.java b/...e/furnace/impl/AddonLifecycleManager.java → ...furnace/addons/AddonLifecycleManager.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.furnace.impl;
+package org.jboss.forge.furnace.addons;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -24,8 +24,6 @@
 import org.jboss.forge.furnace.addons.AddonFilter;
 import org.jboss.forge.furnace.addons.AddonId;
 import org.jboss.forge.furnace.addons.AddonView;
-import org.jboss.forge.furnace.addons.StartEnabledAddonCallable;
-import org.jboss.forge.furnace.addons.StopAddonCallable;
 import org.jboss.forge.furnace.impl.graph.CompleteAddonGraph;
 import org.jboss.forge.furnace.impl.graph.OptimizedAddonGraph;
 import org.jboss.forge.furnace.lock.LockManager;
@@ -270,7 +268,7 @@ public boolean accept(Addon addon)
       });
 
       AddonId result = null;
-      if (addons.isEmpty())
+      if (!addons.isEmpty())
       {
          for (Addon addon : addons)
          {

diff --git a/...jboss/forge/furnace/impl/AddonLoader.java → ...oss/forge/furnace/addons/AddonLoader.java b/...jboss/forge/furnace/impl/AddonLoader.java → ...oss/forge/furnace/addons/AddonLoader.java
@@ -1,16 +1,11 @@
-package org.jboss.forge.furnace.impl;
+package org.jboss.forge.furnace.addons;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jboss.forge.furnace.Furnace;
-import org.jboss.forge.furnace.addons.Addon;
-import org.jboss.forge.furnace.addons.AddonDependency;
-import org.jboss.forge.furnace.addons.AddonDependencyImpl;
-import org.jboss.forge.furnace.addons.AddonId;
-import org.jboss.forge.furnace.addons.AddonView;
 import org.jboss.forge.furnace.lock.LockManager;
 import org.jboss.forge.furnace.modules.AddonModuleLoader;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
@@ -58,11 +53,6 @@ public AddonImpl loadAddon(AddonView view, AddonId addonId)
          }
       }
 
-      if (addon == null)
-      {
-         addon = new AddonImpl(lock, addonId);
-      }
-
       return addon;
    }
 
@@ -82,29 +72,22 @@ private AddonImpl loadAddonFromRepository(AddonView view, AddonRepository reposi
 
          Set<AddonDependency> dependencies = fromAddonDependencyEntries(view, addon,
                   repository.getAddonDependencies(addonId));
-         addon.setDependencies(dependencies);
 
          if (addon.getModule() == null)
          {
             Set<AddonDependency> missingRequiredDependencies = new HashSet<AddonDependency>();
-            for (AddonDependency dependency : addon.getDependencies())
+            for (AddonDependency addonDependency : dependencies)
             {
-               AddonId dependencyId = dependency.getDependency().getId();
-
-               boolean loaded = false;
-               for (Addon a : view.getAddons())
-               {
-                  if (a.getId().equals(dependencyId) && !a.getStatus().isMissing())
-                  {
-                     loaded = true;
-                  }
-               }
-               if (!loaded && !dependency.isOptional())
+               Addon dependency = addonDependency.getDependency();
+               if (dependency == null && !addonDependency.isOptional())
                {
-                  missingRequiredDependencies.add(dependency);
+                  missingRequiredDependencies.add(addonDependency);
                }
             }
 
+            if (missingRequiredDependencies.isEmpty())
+               addon.setMissingDependencies(missingRequiredDependencies);
+
             if (!missingRequiredDependencies.isEmpty())
             {
                if (addon.getMissingDependencies().size() != missingRequiredDependencies.size())
@@ -128,10 +111,12 @@ private AddonImpl loadAddonFromRepository(AddonView view, AddonRepository reposi
                catch (Exception e)
                {
                   logger.log(Level.FINE, "Failed to load addon [" + addonId + "]", e);
-                  // throw new ContainerException("Failed to load addon [" + addonId + "]", e);
                }
             }
          }
+
+         dependencies.removeAll(addon.getMissingDependencies());
+         addon.setDependencies(dependencies);
       }
       return addon;
    }
@@ -145,7 +130,10 @@ private Set<AddonDependency> fromAddonDependencyEntries(AddonView view, AddonImp
          AddonId dependencyId = manager.resolve(view, entry.getName());
          if (dependencyId == null)
          {
-
+            if (!entry.isOptional())
+            {
+               result.add(new MissingAddonDependencyImpl(entry));
+            }
          }
          else
          {

diff --git a/...oss/forge/furnace/impl/AddonRunnable.java → ...s/forge/furnace/addons/AddonRunnable.java b/...oss/forge/furnace/impl/AddonRunnable.java → ...s/forge/furnace/addons/AddonRunnable.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.furnace.impl;
+package org.jboss.forge.furnace.addons;
 
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
@@ -18,6 +18,14 @@
 import org.jboss.forge.furnace.addons.AddonDependency;
 import org.jboss.forge.furnace.event.PostStartup;
 import org.jboss.forge.furnace.event.PreShutdown;
+import org.jboss.forge.furnace.impl.AddonProducer;
+import org.jboss.forge.furnace.impl.AddonRegistryProducer;
+import org.jboss.forge.furnace.impl.AddonRepositoryProducer;
+import org.jboss.forge.furnace.impl.ContainerServiceExtension;
+import org.jboss.forge.furnace.impl.FurnaceProducer;
+import org.jboss.forge.furnace.impl.NullServiceRegistry;
+import org.jboss.forge.furnace.impl.ServiceRegistryImpl;
+import org.jboss.forge.furnace.impl.ServiceRegistryProducer;
 import org.jboss.forge.furnace.lock.LockMode;
 import org.jboss.forge.furnace.modules.AddonResourceLoader;
 import org.jboss.forge.furnace.modules.ModularURLScanner;

diff --git a/container/src/main/java/org/jboss/forge/furnace/addons/MissingAddonDependencyImpl.java b/container/src/main/java/org/jboss/forge/furnace/addons/MissingAddonDependencyImpl.java
@@ -0,0 +1,59 @@
+package org.jboss.forge.furnace.addons;
+
+import org.jboss.forge.furnace.addons.Addon;
+import org.jboss.forge.furnace.addons.AddonDependency;
+import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
+import org.jboss.forge.furnace.versions.Version;
+
+public class MissingAddonDependencyImpl implements AddonDependency
+{
+
+   private AddonDependencyEntry entry;
+
+   public MissingAddonDependencyImpl(AddonDependencyEntry entry)
+   {
+      this.entry = entry;
+   }
+
+   @Override
+   public Addon getDependent()
+   {
+      return null;
+   }
+
+   @Override
+   public Addon getDependency()
+   {
+      return null;
+   }
+
+   @Override
+   public Version getDependencyVersion()
+   {
+      return null;
+   }
+
+   @Override
+   public boolean isExported()
+   {
+      return entry.isExported();
+   }
+
+   @Override
+   public boolean isOptional()
+   {
+      return entry.isOptional();
+   }
+
+   public String getMissingAddonName()
+   {
+      return entry.getName();
+   }
+
+   @Override
+   public String toString()
+   {
+      return "MissingAddonDependencyImpl [entry=" + entry + "]";
+   }
+
+}
diff --git a/container/src/main/java/org/jboss/forge/furnace/addons/StartEnabledAddonCallable.java b/container/src/main/java/org/jboss/forge/furnace/addons/StartEnabledAddonCallable.java
@@ -6,8 +6,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.jboss.forge.furnace.Furnace;
-import org.jboss.forge.furnace.impl.AddonImpl;
-import org.jboss.forge.furnace.impl.AddonRunnable;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/container/src/main/java/org/jboss/forge/furnace/addons/StopAddonCallable.java b/container/src/main/java/org/jboss/forge/furnace/addons/StopAddonCallable.java
@@ -10,8 +10,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.forge.furnace.impl.AddonImpl;
-import org.jboss.forge.furnace.impl.AddonRunnable;
+import org.jboss.forge.furnace.addons.Addon;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/container/src/main/java/org/jboss/forge/furnace/impl/AddonRegistryImpl.java b/container/src/main/java/org/jboss/forge/furnace/impl/AddonRegistryImpl.java
@@ -19,6 +19,7 @@
 import org.jboss.forge.furnace.addons.Addon;
 import org.jboss.forge.furnace.addons.AddonFilter;
 import org.jboss.forge.furnace.addons.AddonId;
+import org.jboss.forge.furnace.addons.AddonLifecycleManager;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.addons.AddonStatus;
 import org.jboss.forge.furnace.lock.LockManager;

diff --git a/container/src/main/java/org/jboss/forge/furnace/impl/ServiceRegistryImpl.java b/container/src/main/java/org/jboss/forge/furnace/impl/ServiceRegistryImpl.java
@@ -11,6 +11,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 
 import org.jboss.forge.furnace.addons.Addon;
+import org.jboss.forge.furnace.addons.AddonImpl;
 import org.jboss.forge.furnace.lock.LockManager;
 import org.jboss.forge.furnace.lock.LockMode;
 import org.jboss.forge.furnace.services.ExportedInstance;

diff --git a/container/src/main/java/org/jboss/forge/furnace/modules/AddonModuleLoader.java b/container/src/main/java/org/jboss/forge/furnace/modules/AddonModuleLoader.java
@@ -17,9 +17,9 @@
 
 import org.jboss.forge.furnace.Furnace;
 import org.jboss.forge.furnace.addons.AddonId;
+import org.jboss.forge.furnace.addons.AddonLifecycleManager;
 import org.jboss.forge.furnace.addons.AddonView;
 import org.jboss.forge.furnace.exception.ContainerException;
-import org.jboss.forge.furnace.impl.AddonLifecycleManager;
 import org.jboss.forge.furnace.impl.AddonRepositoryImpl;
 import org.jboss.forge.furnace.modules.providers.FurnaceContainerSpec;
 import org.jboss.forge.furnace.modules.providers.JGraphTClasspathSpec;