ModularWeld just needs ResourceLoader

forge · Aug 5, 2015 · 46c6a62 · 46c6a62
1 parent 51cb67f
commit 46c6a62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...main/java/org/jboss/forge/furnace/container/cdi/lifecycle/WeldAddonLifecycleProvider.java b/...main/java/org/jboss/forge/furnace/container/cdi/lifecycle/WeldAddonLifecycleProvider.java
@@ -71,7 +71,7 @@ public void start(Addon addon) throws Exception
          ContainerServiceExtension serviceExtension = new ContainerServiceExtension(container, addon);
          ContainerBeanRegistrant registrantExtension = new ContainerBeanRegistrant();
 
-         weld = new ModularWeld(addon.getId().getName(), scanResult);
+         weld = new ModularWeld(addon.getId().getName(), resourceLoader);
          weld.addExtension(serviceExtension);
          weld.addExtension(registrantExtension);
          WeldContainer container = weld.initialize();

diff --git a/impl/src/main/java/org/jboss/forge/furnace/container/cdi/weld/ModularWeld.java b/impl/src/main/java/org/jboss/forge/furnace/container/cdi/weld/ModularWeld.java
@@ -18,13 +18,13 @@
  */
 public class ModularWeld extends Weld
 {
-   private final ModuleScanResult scanResult;
+   private final ResourceLoader resourceLoader;
    private final ExternalConfiguration config;
 
-   public ModularWeld(String containerId, ModuleScanResult scanResult)
+   public ModularWeld(String containerId, ResourceLoader resourceLoader)
    {
       super(containerId);
-      this.scanResult = scanResult;
+      this.resourceLoader = resourceLoader;
       this.config = new ExternalConfigurationBuilder()
                .add("org.jboss.weld.bootstrap.preloaderThreadPoolSize", 0)
                .add("org.jboss.weld.bootstrap.concurrentDeployment", false).build();
@@ -33,7 +33,7 @@ public ModularWeld(String containerId, ModuleScanResult scanResult)
    @Override
    protected Deployment createDeployment(ResourceLoader loader, CDI11Bootstrap bootstrap)
    {
-      Deployment deployment = super.createDeployment(scanResult.getResourceLoader(), bootstrap);
+      Deployment deployment = super.createDeployment(resourceLoader, bootstrap);
       deployment.getServices().add(ExternalConfiguration.class, config);
       return deployment;
    }