Branch: refs/heads/2.1
Home:
https://github.com/weld/core
Commit: 25d549acdbacc6f8cd960d7716993b64f9130e3b
https://github.com/weld/core/commit/25d549acdbacc6f8cd960d7716993b64f9130e3b
Author: Matej Briskar <mbriskar(a)redhat.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)
Changed paths:
M
environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java
M environments/servlet/tests/base/pom.xml
A
environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/duplicates/DuplicateBeansXmlMergingTestBase.java
A
environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/duplicates/SimpleBinding.java
A
environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/bootstrap/duplicates/SimpleInterceptor.java
A
environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/bootstrap/duplicates/DuplicateBeansXmlMergingTest.java
A
environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/bootstrap/duplicates/DuplicateBeansXmlMergingTest.java
Log Message:
-----------
WELD-1543: Weld Servlet should remove duplicate entries when merging multiple beans.xml
files