WELD-1685 Do not enforce EjbServices in the deployment (should be a p…

…er-module service)
weld · Jun 4, 2014 · 51c07a6 · 51c07a6
1 parent df30ddc
commit 51c07a6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java b/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java
@@ -19,7 +19,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jboss.weld.ejb.spi.EjbServices;
 import org.jboss.weld.injection.spi.EjbInjectionServices;
 import org.jboss.weld.injection.spi.InjectionServices;
 import org.jboss.weld.injection.spi.JpaInjectionServices;
@@ -45,8 +44,15 @@ public enum Environments implements Environment {
      */
     EE_INJECT(new EnvironmentBuilder().addRequiredDeploymentService(TransactionServices.class)
             .addRequiredDeploymentService(SecurityServices.class)
-            .addRequiredDeploymentService(EjbServices.class)
             .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class)
+            /*
+             * EjbServices is a required bean deployment archive service in this environment.
+             * For backwards compatibility with older integrators that register EjbServices
+             * as a deployment service, this check is suppressed.
+             *
+             * @see WELD-1685
+             */
+            // .addRequiredBeanDeploymentArchiveService(EjbServices.class)
             .addRequiredBeanDeploymentArchiveService(ResourceLoader.class)
             .addRequiredBeanDeploymentArchiveService(JpaInjectionServices.class)
             .addRequiredBeanDeploymentArchiveService(ResourceInjectionServices.class)
@@ -61,9 +67,16 @@ public enum Environments implements Environment {
      */
     EE(new EnvironmentBuilder().addRequiredDeploymentService(TransactionServices.class)
             .addRequiredDeploymentService(SecurityServices.class)
-            .addRequiredDeploymentService(EjbServices.class)
-            .addRequiredBeanDeploymentArchiveService(ResourceLoader.class)
             .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class)
+            /*
+             * EjbServices is a required bean deployment archive service in this environment.
+             * For backwards compatibility with older integrators that register EjbServices
+             * as a deployment service, this check is suppressed.
+             *
+             * @see WELD-1685
+             */
+            // .addRequiredBeanDeploymentArchiveService(EjbServices.class)
+            .addRequiredBeanDeploymentArchiveService(ResourceLoader.class)
             .addRequiredBeanDeploymentArchiveService(InjectionServices.class)),
 
     /**

diff --git a/weld-spi/src/main/java/org/jboss/weld/ejb/spi/EjbServices.java b/weld-spi/src/main/java/org/jboss/weld/ejb/spi/EjbServices.java
@@ -23,7 +23,7 @@
 /**
  * A container should implement this interface to allow Weld to resolve EJB and discover EJBs
  *
- * {@link EjbServices} is a per-deployment service.
+ * {@link EjbServices} is is a per-BeanDeploymentArchive service.
  *
  * @author Pete Muir
  * @author Marius Bogoevici