svn commit: r1617112 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Aug 10 14:49:02 2014
New Revision: 1617112

URL: http://svn.apache.org/r1617112
Log:
merging beans.xml...but we'll need to break it all to keep a beans.xml by jar to at least respect bean-discovery-mode

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1617112&r1=1617111&r2=1617112&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Sun Aug 10 14:49:02 2014
@@ -1083,6 +1083,7 @@ public class DeploymentLoader implements
                 current.getAlternativeStereotypes().addAll(beans.getAlternativeStereotypes());
                 current.getDecorators().addAll(beans.getDecorators());
                 current.getInterceptors().addAll(beans.getInterceptors());
+                current.getScan().getExclude().addAll(beans.getScan().getExclude());
             }
             // check is done here since later we lost the data of the origin
             ReadDescriptors.checkDuplicatedByBeansXml(beans, returnValue);