Author: scabanovich Date: 2011-07-28 17:07:02 -0400 (Thu, 28 Jul 2011) New Revision: 33325 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/Dummy.class trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/test/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/DummyChild.class trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java Log: JBIDE-9420 https://issues.jboss.org/browse/JBIDE-9420 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>utility</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</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.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,12 @@ +#Thu Jul 28 12:55:22 CEST 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.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="utility"> + <wb-resource deploy-path="/" source-path="/src"/> + <wb-resource deploy-path="/" source-path="/test"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="java"/> + <fixed facet="jst.utility"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.utility" version="1.0"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/Dummy.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/Dummy.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,5 @@ +package foo.bar; + +public class Dummy { + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </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 combineaccessrules="false" kind="src" path="/utility"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>webapp</name> + <comment></comment> + <projects> + <project>utility</project> + </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.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> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope 2011-07-28 21:07:02 UTC (rev 33325) @@ -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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,8 @@ +#Thu Jul 28 12:54:47 CEST 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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="webapp"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <dependent-module archiveName="utility.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/utility/utility"> + <dependency-type>uses</dependency-type> + </dependent-module> + <property name="context-root" value="webapp"/> + <property name="java-output-path" value="/webapp/build/classes"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="java"/> + <fixed facet="jst.web"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config + 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://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> + +</faces-config> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,13 @@ +<?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_3_0.xsd" version="3.0"> + <display-name>webapp</display-name> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/DummyChild.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/DummyChild.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,5 @@ +package foo.bar; + +public class DummyChild extends Dummy { + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-07-28 20:58:42 UTC (rev 33324) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -53,6 +53,13 @@ new String[]{"projects/TestBrokenBuilderOrder"}, new String[]{"TestBrokenBuilderOrder"}); suiteAll.addTest(testSetup); + suite = new TestSuite(WebWithModuleTest.class.getName()); + suite.addTestSuite(WebWithModuleTest.class); + testSetup = new XProjectImportTestSetUp(suite, + "org.jboss.tools.jst.web.kb.test", + new String[]{"projects/utility", "projects/webapp"}, + new String[]{"utility", "webapp"}); + suiteAll.addTest(testSetup); return suiteAll; } } \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.kb.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.filesystems.FileSystemsHelper; +import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl; +import org.jboss.tools.common.model.filesystems.impl.Libs; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.kb.IKbProject; +import org.jboss.tools.jst.web.kb.KbProjectFactory; +import org.jboss.tools.test.util.JUnitUtils; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class WebWithModuleTest extends TestCase { + + protected IProject project = null; + protected boolean makeCopy = true; + + public WebWithModuleTest() { + super("MyFaces Kb Model Test"); + } + + public void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("webapp"); + assertNotNull("Can't load webapp", project); //$NON-NLS-1$ + } + + /** + * webapp project has kb nature, and depends on utility project without kb nature. + * In this case we add sources of 'utility' to file systems of 'webapp'. + * + * Check that file systems created but no links added to 'webapp'. + * + * Warning: If we decide to stop adding sources of one project to other project, + * this test should be removed. + * + * @throws CoreException + */ + public void testWebProject() throws CoreException { + KbProjectFactory.getKbProject(project, true); + XModelObject o = EclipseResourceUtil.createObjectForResource(project); + XModelObject libsrc = null; + XModelObject f = FileSystemsHelper.getFileSystems(o.getModel()); + Libs libs = ((FileSystemsImpl)f).getLibs(); + libs.requestForUpdate(); + libs.update(); + + //Check that sources of 'utility' are loaded by model of 'webapp'. + XModelObject[] fs = f.getChildren(); + for (XModelObject s: fs) { + String name = s.getAttributeValue("name"); + if(name.equals("lib-src")) { + libsrc = s; + } + } + assertNotNull(libsrc); + XModelObject q = libsrc.getChildByPath("foo/bar/Dummy.java"); + assertNotNull(q); + + //Check that no links is added to 'webapp' + IResource[] ms = project.members(); + for (IResource m: ms) { + assertFalse(m.isLinked()); + } + + } + +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain