WELD-1792 Enable relaxed construction by default in weld-se

weld · Feb 16, 2015 · cf70d83 · cf70d83
1 parent 75938cf
commit cf70d83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/docs/reference/src/main/asciidoc/configure.asciidoc b/docs/reference/src/main/asciidoc/configure.asciidoc
@@ -28,9 +28,10 @@ This mode is not enabled by default. It can be enabled using the following confi
 [cols=",,",options="header",]
 |=======================================================================
 |Configuration key |Default value |Description
-|`org.jboss.weld.construction.relaxed` |false|If set to `true`, then requirements on bean constructors are relaxed.
+|`org.jboss.weld.construction.relaxed` |false (true in weld-se)|If set to `true`, then requirements on bean constructors are relaxed.
 |=======================================================================
 
+Note that relaxed construction is enabled by default in <<weld-se,Weld SE>>.
 
 ==== Concurrent deployment configuration
 

diff --git a/docs/reference/src/main/asciidoc/environments.asciidoc b/docs/reference/src/main/asciidoc/environments.asciidoc
@@ -206,6 +206,7 @@ In general, an implicit bean archive does not have to contain a beans.xml descri
 
 NOTE: The bean discovery mode of `annotated` is supported from version 2.2.5.Final. Previous versions processed implicit bean archives in the same way as explicit bean archives.
 
+[[weld-se]]
 === Java SE
 
 In addition to improved integration of the Enterprise Java stack, the

diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java
@@ -41,6 +41,7 @@
 import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
 import org.jboss.weld.bootstrap.spi.Deployment;
 import org.jboss.weld.bootstrap.spi.Metadata;
+import org.jboss.weld.config.ConfigurationKey;
 import org.jboss.weld.configuration.spi.ExternalConfiguration;
 import org.jboss.weld.configuration.spi.helpers.ExternalConfigurationBuilder;
 import org.jboss.weld.environment.deployment.WeldBeanDeploymentArchive;
@@ -138,8 +139,12 @@ public WeldContainer initialize() {
         final CDI11Bootstrap bootstrap = new WeldBootstrap();
         final Deployment deployment = createDeployment(resourceLoader, bootstrap);
 
-        // weld-se uses CommonForkJoinPoolExecutorServices by default
-        ExternalConfiguration configuration = new ExternalConfigurationBuilder().add(EXECUTOR_THREAD_POOL_TYPE.get(), COMMON.toString()).build();
+        ExternalConfiguration configuration = new ExternalConfigurationBuilder()
+            // weld-se uses CommonForkJoinPoolExecutorServices by default
+            .add(EXECUTOR_THREAD_POOL_TYPE.get(), COMMON.toString())
+            // weld-se uses relaxed construction by default
+            .add(ConfigurationKey.RELAXED_CONSTRUCTION.get(), true)
+            .build();
         deployment.getServices().add(ExternalConfiguration.class, configuration);
 
         // Set up the container