Author: scabanovich Date: 2011-07-06 12:25:11 -0400 (Wed, 06 Jul 2011) New Revision: 32664 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/cdi-api.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/javax.inject.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/jboss-interceptor-api.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/seam-config-xml.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/lib/ 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/web.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/AlternativeBean.class trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/BeanA.class trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/ 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/BeanA.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java Log: JBIDE-9289 https://issues.jboss.org/browse/JBIDE-9289 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_21"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>TwoWebContentFolders</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> + </natures> +</projectDescription> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/.jsdtscope 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,8 @@ +#Tue Jul 05 11:41:26 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.component 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="TwoWebContentFolders"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/" source-path="/WebContent2"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="TwoWebContentFolders"/> + <property name="java-output-path" value="/TwoWebContentFolders/build/classes"/> + </wb-module> +</project-modules> Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="Apache Tomcat v6.0"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,7 @@ +<?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.AlternativeBean</class> +</alternatives> +</beans> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/beans.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/cdi-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/cdi-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/javax.inject.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/javax.inject.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/jboss-interceptor-api.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/jboss-interceptor-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/seam-config-xml.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/lib/seam-config-xml.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> + <display-name>TwoWebContentFolders</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,12 @@ +<?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> Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/seam-beans.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> + <display-name>TwoWebContentFolders</display-name> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> +</web-app> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/WebContent2/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/AlternativeBean.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/AlternativeBean.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/BeanA.class =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/build/classes/test/BeanA.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,8 @@ +package test; + +import javax.enterprise.inject.Alternative; + +@Alternative +public class AlternativeBean { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/AlternativeBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,10 @@ +package test; + +public class BeanA { + String s = "#{myBeanA.s}"; + + public String getS() { + return s; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TwoWebContentFolders/src/test/BeanA.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 16:19:13 UTC (rev 32663) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 16:25:11 UTC (rev 32664) @@ -99,6 +99,7 @@ suite.addTestSuite(CoreValidationTest.class); suite.addTestSuite(ELValidationTest.class); + suiteAll.addTestSuite(TwoWebContentFoldersTest.class); suiteAll.addTestSuite(RemoveJarFromClasspathTest.class); suiteAll.addTestSuite(ExtensionFactoryTest.class); suiteAll.addTestSuite(ExtensionManagerTest.class); Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java 2011-07-06 16:25:11 UTC (rev 32664) @@ -0,0 +1,54 @@ +package org.jboss.tools.cdi.core.test; + +import java.io.IOException; +import java.util.Set; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * + * @author V.Kabanovich + * + */ +public class TwoWebContentFoldersTest extends TestCase { + protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; + IProject project = null; + + public TwoWebContentFoldersTest() {} + + public void setUp() throws Exception { + project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/TwoWebContentFolders"); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + } + + public void testBeansXML() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + Set<IBean> bs = cdi.getBeans("myBeanA", false); + assertEquals(1, bs.size()); + } + + public void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TwoWebContentFoldersTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain