Author: scabanovich Date: 2011-07-06 19:17:43 -0400 (Wed, 06 Jul 2011) New Revision: 32680 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java Log: JBIDE-9289 https://issues.jboss.org/browse/JBIDE-9289 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml 2011-07-06 23:17:43 UTC (rev 32680) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> +<alternatives> + <class>test.AlternativeBean2</class> +</alternatives> +</beans> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/beans.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml 2011-07-06 23:08:07 UTC (rev 32679) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml 2011-07-06 23:17:43 UTC (rev 32680) @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<beans xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:s="urn:java:ee" - xmlns:test="urn:java:test" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> - -<test:BeanA> - <s:Named>myBeanA</s:Named> -</test:BeanA> - -</beans> Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java 2011-07-06 23:08:07 UTC (rev 32679) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java 2011-07-06 23:17:43 UTC (rev 32680) @@ -1,7 +1,9 @@ package test; import javax.enterprise.inject.Alternative; +import javax.inject.Named; +@Named("bean1") @Alternative public class AlternativeBean { Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java 2011-07-06 23:17:43 UTC (rev 32680) @@ -0,0 +1,10 @@ +package test; + +import javax.enterprise.inject.Alternative; +import javax.inject.Named; + +@Named("bean2") +@Alternative +public class AlternativeBean2 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java 2011-07-06 23:08:07 UTC (rev 32679) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java 2011-07-06 23:17:43 UTC (rev 32680) @@ -1,10 +0,0 @@ -package test; - -public class BeanA { - String s = "#{myBeanA.s}"; - - public String getS() { - return s; - } - -} Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-06 23:08:07 UTC (rev 32679) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-06 23:17:43 UTC (rev 32680) @@ -37,10 +37,15 @@ JobUtils.waitForIdle(); } - public void testBeansXML() throws CoreException, IOException { + public void testBeansXMLInDifferentWebContentFolders() throws CoreException, IOException { ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); - Set<IBean> bs = cdi.getBeans("myBeanA", false); + Set<IBean> bs = cdi.getBeans("bean1", false); assertEquals(1, bs.size()); + assertTrue(bs.iterator().next().isSelectedAlternative()); + + bs = cdi.getBeans("bean2", false); + assertEquals(1, bs.size()); + assertTrue(bs.iterator().next().isSelectedAlternative()); } public void tearDown() throws Exception {