Favor container classes over dependency or local resources

forge · Jul 12, 2013 · bf84625 · bf84625
1 parent 08013d2
commit bf84625
Showing 1 changed file with 20 additions and 3 deletions.
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
@@ -149,18 +149,29 @@ private ModuleSpec findAddonModule(ModuleIdentifier id)
                         PathFilters.rejectAll(), null, FurnaceContainerSpec.ID, false));
                try
                {
+                  addContainerDependencies(views, repository, found, builder);
                   addAddonDependencies(views, repository, found, builder);
                }
                catch (ContainerException e)
                {
-                  // TODO implement proper fault handling. For now, abort.
                   logger.warning(e.getMessage());
                   return null;
                }
 
                builder.addDependency(DependencySpec.createLocalDependencySpec(PathFilters.acceptAll(),
                         PathFilters.acceptAll()));
 
+               try
+               {
+                  addContainerDependencies(views, repository, found, builder);
+                  addAddonDependencies(views, repository, found, builder);
+               }
+               catch (ContainerException e)
+               {
+                  logger.warning(e.getMessage());
+                  return null;
+               }
+
                addLocalResources(repository, found, builder, id);
 
                return builder.create();
@@ -203,11 +214,11 @@ else if (file.length() > 0)
       }
    }
 
-   private void addAddonDependencies(Set<AddonView> views, AddonRepository repository, AddonId found, Builder builder)
+   private void addContainerDependencies(Set<AddonView> views, AddonRepository repository, AddonId found,
+            Builder builder)
             throws ContainerException
    {
       Set<AddonDependencyEntry> addons = repository.getAddonDependencies(found);
-
       for (AddonDependencyEntry dependency : addons)
       {
          /*
@@ -216,6 +227,12 @@ private void addAddonDependencies(Set<AddonView> views, AddonRepository reposito
          if (dependency.getName().startsWith("org.jboss.forge.furnace:container"))
             addAddonDependency(views, found, builder, dependency);
       }
+   }
+
+   private void addAddonDependencies(Set<AddonView> views, AddonRepository repository, AddonId found, Builder builder)
+            throws ContainerException
+   {
+      Set<AddonDependencyEntry> addons = repository.getAddonDependencies(found);
       for (AddonDependencyEntry dependency : addons)
       {
          if (!dependency.getName().startsWith("org.jboss.forge.furnace:container"))