FURNACE-34: Upgrade to Weld 2.2.15.Final

forge · Aug 4, 2015 · e226048 · e226048
1 parent e807a3e
commit e226048
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 75 deletions.
diff --git a/...va/org/jboss/forge/furnace/container/cdi/impl/PerformanceTunedBootstrapConfiguration.java b/...va/org/jboss/forge/furnace/container/cdi/impl/PerformanceTunedBootstrapConfiguration.java
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(scanResult);
+         weld = new ModularWeld(addon.getId().getName(), scanResult);
          weld.addExtension(serviceExtension);
          weld.addExtension(registrantExtension);
          WeldContainer container = weld.initialize();
@@ -95,7 +95,8 @@ public void start(Addon addon) throws Exception
 
          ServiceRegistryProducer serviceRegistryProducer = BeanManagerUtils.getContextualInstance(manager,
                   ServiceRegistryProducer.class);
-         serviceRegistry = new WeldServiceRegistry(furnace.getLockManager(), addon, manager, serviceExtension.getServices());
+         serviceRegistry = new WeldServiceRegistry(furnace.getLockManager(), addon, manager,
+                  serviceExtension.getServices());
          serviceRegistryProducer.setServiceRegistry(serviceRegistry);
          Assert.notNull(BeanManagerUtils.getContextualInstance(manager, ServiceRegistry.class),
                   "InboundEvent registry was null.");

diff --git a/impl/src/main/java/org/jboss/forge/furnace/container/cdi/weld/ModularURLScanner.java b/impl/src/main/java/org/jboss/forge/furnace/container/cdi/weld/ModularURLScanner.java
@@ -14,7 +14,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.jboss.weld.environment.se.discovery.url.ClasspathScanningException;
 import org.jboss.weld.resources.spi.ResourceLoader;
 
 /**
@@ -88,7 +87,7 @@ public ModuleScanResult scan()
             }
             catch (UnsupportedEncodingException ex)
             {
-               throw new ClasspathScanningException("Error decoding URL using UTF-8");
+               throw new RuntimeException("Error decoding URL using UTF-8");
             }
 
             paths.add(urlPath);

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
@@ -6,12 +6,10 @@
  */
 package org.jboss.forge.furnace.container.cdi.weld;
 
-import org.jboss.forge.furnace.container.cdi.impl.PerformanceTunedBootstrapConfiguration;
 import org.jboss.weld.bootstrap.api.CDI11Bootstrap;
-import org.jboss.weld.bootstrap.api.SingletonProvider;
-import org.jboss.weld.bootstrap.api.helpers.TCCLSingletonProvider;
-import org.jboss.weld.bootstrap.spi.BootstrapConfiguration;
 import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.configuration.spi.ExternalConfiguration;
+import org.jboss.weld.configuration.spi.helpers.ExternalConfigurationBuilder;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.resources.spi.ResourceLoader;
 
@@ -20,26 +18,22 @@
  */
 public class ModularWeld extends Weld
 {
-   static
-   {
-      /*
-       * This must happen once per JVM
-       */
-      SingletonProvider.initialize(new TCCLSingletonProvider());
-   }
-
    private final ModuleScanResult scanResult;
 
-   public ModularWeld(ModuleScanResult scanResult)
+   public ModularWeld(String containerId, ModuleScanResult scanResult)
    {
+      super(containerId);
       this.scanResult = scanResult;
    }
 
    @Override
    protected Deployment createDeployment(ResourceLoader loader, CDI11Bootstrap bootstrap)
    {
       Deployment deployment = super.createDeployment(scanResult.getResourceLoader(), bootstrap);
-      deployment.getServices().add(BootstrapConfiguration.class, new PerformanceTunedBootstrapConfiguration());
+      ExternalConfiguration config = new ExternalConfigurationBuilder()
+               .add("org.jboss.weld.bootstrap.preloaderThreadPoolSize", 0)
+               .add("org.jboss.weld.bootstrap.concurrentDeployment", false).build();
+      deployment.getServices().add(ExternalConfiguration.class, config);
       return deployment;
    }
 }
diff --git a/pom.xml b/pom.xml
@@ -43,12 +43,11 @@
       <forge.scm.url>http://github.com/forge/furnace-cdi</forge.scm.url>
       <!-- This version is bound to the Weld version -->
       <version.annotations>1.0.0.Alpha1</version.annotations>
-      <version.cdi>1.1</version.cdi>
+      <version.cdi>1.2</version.cdi>
       <version.furnace>${project.version}</version.furnace>
       <version.javax.el>2.2.4</version.javax.el>
-      <version.jboss.spec>3.0.2.Final</version.jboss.spec>
       <version.slf4j>1.7.2</version.slf4j>
-      <version.weld>2.2.1.Final</version.weld>
+      <version.weld>2.2.15.Final</version.weld>
       <version.junit>4.11</version.junit>
    </properties>