Author: dazarov Date: 2010-03-05 10:13:59 -0500 (Fri, 05 Mar 2010) New Revision: 20689 Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jstl.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/standard.jar trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-4876 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-03-05 15:13:37 UTC (rev 20688) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-03-05 15:13:59 UTC (rev 20689) @@ -12,7 +12,8 @@ org.jboss.tools.common.model.ui, org.jboss.tools.common.model.ui.test, org.jboss.tools.common.model.test, - org.jboss.tools.tests;bundle-version="2.0.0" + org.jboss.tools.tests;bundle-version="2.0.0", + org.eclipse.ui.ide;bundle-version="3.5.0" Export-Package: org.jboss.tools.jst.web.ui.test Bundle-ClassPath: jst-web-ui.jar Bundle-Localization: plugin Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.5.0_10"> + <attributes> + <attribute name="owner.project.facets" value="jst.java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.project 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>test_jsf_project</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <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> + <buildCommand> + <name>org.jboss.tools.common.verification.verifybuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</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.ui.test/projects/test_jsf_project/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/.jsdtscope 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,7 @@ +#Thu Mar 04 15:11:11 MSK 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.component 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="test_jsf_project"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="test_jsf_project"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.web"/> + <fixed facet="jst.java"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xi="http://www.w3.org/2001/XInclude" + 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_1_2.xsd"> + <application> + <locale-config/> + </application> + <factory/> + <lifecycle/> +</faces-config> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<web-app version="2.5" 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-app_2_5.xsd"> + <display-name>test_jsf_project</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + <!-- Faces Servlet --> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <!-- Faces Servlet Mapping --> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,11 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + <h:commandButton value="" action=""/> + </f:view> + </body> +</html> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page1.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,47 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <f:loadBundle basename="resources" var="msg" /> + <head> + <title><ui:insert name="pageTitle">Page Title</ui:insert></title> + </head> + +<body bgcolor="#ffffff"> +<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400"> +<tbody> + + <tr> + <td class="header" height="42" align="center" valign="middle" width="100%" bgcolor="#E4EBEB"> + <ui:insert name="pageHeader">Page Header</ui:insert> + </td> + </tr> + <tr> + <td height="1" width="100%" bgcolor="#CAD6E0"></td> + </tr> + + <tr> + <td width="100%" colspan="2"> + <table width="100%" style="height:150px" align="left" cellpadding="0" cellspacing="0" border="0"> + <tbody> + <tr> + <td align="center" width="100%" valign="middle"> + + <ui:insert name="body">Page Body</ui:insert> + + </td> + </tr> + </tbody> + </table> + </td> + </tr> + + <tr> + <td colspan="2" valign="bottom" height="1" width="100%" bgcolor="#CAD6E0"></td> + </tr> +</tbody> +</table> +</body> + +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/WebContent/pages/test_page2.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,3 @@ +# +#Thu Mar 04 15:11:09 MSK 2010 +classpath.external= Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,87 @@ +<project name="test_jsf_project" basedir="../" default="deploy"> + + <!-- Project settings --> + <property name="project.distname" value="test_jsf_project"/> + + <!-- Local system paths --> + <property file="${basedir}/ant/build.properties"/> + <property name="webroot.dir" value="${basedir}/WebContent"/> + <property name="webinf.dir" value="${webroot.dir}/WEB-INF"/> + <property name="build.dir" value="build"/> + + <!-- classpath for JSF 1.1.01 --> + <path id="compile.classpath"> + <pathelement path ="${webinf.dir}/lib/commons-beanutils.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-collections.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-digester.jar"/> + <pathelement path ="${webinf.dir}/lib/commons-logging.jar"/> + <pathelement path ="${webinf.dir}/lib/jsf-api.jar"/> + <pathelement path ="${webinf.dir}/lib/jsf-impl.jar"/> + <pathelement path ="${webinf.dir}/lib/jstl.jar"/> + <pathelement path ="${webinf.dir}/lib/standard.jar"/> + <pathelement path ="${webinf.dir}/classes"/> + <pathelement path ="${classpath.external}"/> + <pathelement path ="${classpath}"/> + </path> + + <!-- define your folder for deployment --> + <property name="deploy.dir" value="deploy"/> + + + <!-- Check timestamp on files --> + <target name="prepare"> + <tstamp/> + </target> + + <!-- Copy any resource or configuration files --> + <target name="resources"> + <copy todir="${webinf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.conf"/> + <include name="**/*.properties"/> + <include name="**/*.xml"/> + </patternset> + </fileset> + </copy> + </target> + + <!-- Normal build of application --> + <target name="compile" depends="prepare,resources"> + <javac srcdir="JavaSource" destdir="${webinf.dir}/classes"> + <classpath refid="compile.classpath"/> + </javac> + </target> + + <!-- Remove classes directory for clean build --> + <target name="clean" + description="Prepare for clean build"> + <delete dir="${webinf.dir}/classes"/> + <mkdir dir="${webinf.dir}/classes"/> + </target> + + <!-- Build entire project --> + <target name="build" depends="prepare,compile"/> + <target name="rebuild" depends="clean,prepare,compile"/> + + <!-- Create binary distribution --> + <target name="war" depends="build"> + <mkdir dir="${build.dir}"/> + <war + basedir="${webroot.dir}" + warfile="${build.dir}/${project.distname}.war" + webxml="${webinf.dir}/web.xml"> + <exclude name="WEB-INF/${build.dir}/**"/> + <exclude name="WEB-INF/src/**"/> + <exclude name="WEB-INF/web.xml"/> + </war> + + </target> + + <target name="deploy" depends="war"> + <delete file="${deploy.dir}/${project.distname}.war"/> + <delete dir="${deploy.dir}/${project.distname}"/> + <copy file="${build.dir}/${project.distname}.war" todir="${deploy.dir}"/> + </target> + +</project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_jsf_project/ant/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java 2010-03-05 15:13:59 UTC (rev 20689) @@ -0,0 +1,99 @@ +package org.jboss.tools.jst.web.ui.test; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +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.eclipse.ui.IMarkerResolution; +import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.tests.AbstractResourceMarkerTest; +import org.jboss.tools.tests.IMarkerFilter; + +public class JSPProblemMarkerResolutionTest extends AbstractResourceMarkerTest{ + IProject project = null; + + public JSPProblemMarkerResolutionTest() { + super("JSP Problem Marker Resolution Tests"); + } + + public JSPProblemMarkerResolutionTest(String name) { + super(name); + } + + protected void setUp() throws Exception { + JobUtils.waitForIdle(); + IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("test_jsf_project"); + if(project == null) { + ProjectImportTestSetup setup = new ProjectImportTestSetup( + this, + "org.jboss.tools.jst.web.ui.test", + "projects/test_jsf_project", + "test_jsf_project"); + project = setup.importProject(); + } + this.project = project.getProject(); + JobUtils.waitForIdle(); + } + + public void testProblemMarkerResolutionInJSP() throws CoreException { + IFile jspFile = project.getFile("WebContent/pages/test_page1.jsp"); + + assertMarkerIsCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*"); + + IMarker[] markers = findMarkers(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*"); + + assertEquals(1, markers.length); + + JSPProblemMarkerResolutionGenerator generator = new JSPProblemMarkerResolutionGenerator(); + + for(IMarker marker : markers){ + generator.hasResolutions(marker); + IMarkerResolution[] resolutions = generator.getResolutions(marker); + for(IMarkerResolution resolution : resolutions){ + resolution.run(marker); + } + } + + refreshProject(project); + + assertMarkerIsNotCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*"); + } + + public void testProblemMarkerResolutionInXHTML() throws CoreException { + IFile jspFile = project.getFile("WebContent/pages/test_page2.xhtml"); + + assertMarkerIsCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*"); + + IMarker[] markers = findMarkers(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*"); + + assertEquals(3, markers.length); + + JSPProblemMarkerResolutionGenerator generator = new JSPProblemMarkerResolutionGenerator(); + + for(IMarker marker : markers){ + generator.hasResolutions(marker); + IMarkerResolution[] resolutions = generator.getResolutions(marker); + for(IMarkerResolution resolution : resolutions){ + resolution.run(marker); + } + } + + refreshProject(project); + + assertMarkerIsNotCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*"); + } + + private void refreshProject(IProject project){ + try { + project.refreshLocal(IResource.DEPTH_INFINITE, null); + JobUtils.waitForIdle(); + JobUtils.delay(2000); + } catch (CoreException e) { + // ignore + } + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-03-05 15:13:37 UTC (rev 20688) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-03-05 15:13:59 UTC (rev 20689) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.test; +import org.jboss.tools.test.util.ProjectImportTestSetup; + import junit.framework.Test; import junit.framework.TestSuite; @@ -25,6 +27,11 @@ suite.addTestSuite(WebViewsTest.class); suite.addTestSuite(WebWizardsTest.class); suite.addTestSuite(JstWebUiPreferencesPagesTest.class); + suite.addTest(new ProjectImportTestSetup(new TestSuite(JSPProblemMarkerResolutionTest.class), + "org.jboss.tools.jst.web.ui.test", + new String[]{"projects/test_jsf_project"}, + new String[]{"test_jsf_project"})); + return suite; } }