[weld-commits] [weld/core] a98b0d: WELD-1188 Weld SE should remove duplicate entries ...
Branch: refs/heads/2.0
Home: https://github.com/weld/core
Commit: a98b0de3998adb666bd06f47027bb3deaefd9a92
https://github.com/weld/core/commit/a98b0de3998adb666bd06f47027bb3deaefd9a92
Author: Marko Luksa <marko.luksa(a)gmail.com>
Date: 2012-10-23 (Tue, 23 Oct 2012)
Changed paths:
M environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java
M
environments/se/core/src/main/java/org/jboss/weld/environment/se/discovery/url/URLScanner.java
M impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
M impl/src/main/java/org/jboss/weld/xml/BeansXmlParser.java
A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/BeansXmlMergingTest.java
A tests/src/test/java/org/jboss/weld/tests/unit/bootstrap/xml/Stereo.java
A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/beans1.xml
A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/beans2.xml
A tests/src/test/resources/org/jboss/weld/tests/unit/bootstrap/xml/beans3.xml
Log Message:
-----------
WELD-1188 Weld SE should remove duplicate entries when merging multiple beans.xml files
Conflicts:
pom.xml