Author: scabanovich Date: 2010-10-15 06:10:38 -0400 (Fri, 15 Oct 2010) New Revision: 25856 Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.classpath trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/Messages.properties trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/User.java trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/Messages.properties trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/User.class trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/index.jsp trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/hello.jsp trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/inputUserName.jsp trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.properties trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JsfVerificationAllTests.java Log: JBIDE-7340 https://jira.jboss.org/browse/JBIDE-7340 Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2010-10-15 09:26:54 UTC (rev 25855) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2010-10-15 10:10:38 UTC (rev 25856) @@ -14,6 +14,7 @@ org.jboss.tools.common.verification, org.jboss.tools.jsf, org.jboss.tools.jsf.verification, + org.jboss.tools.jst.web.verification, org.jboss.tools.common.model.ui, org.jboss.tools.common.test, org.jboss.tools.common.verification.test Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.classpath 2010-10-15 10:10:38 UTC (rev 25856) @@ -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.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.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="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Test</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.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.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/.jsdtscope 2010-10-15 10:10:38 UTC (rev 25856) @@ -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/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.jdt.core.prefs 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,8 @@ +#Fri Oct 15 13:22:22 MSD 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +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/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.component 2010-10-15 10:10:38 UTC (rev 25856) @@ -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"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="Test"/> +<property name="java-output-path" value="/Test/WebContent/WEB-INF/classes"/> +</wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="jsf-user-library-provider"/> + </node> + </facet> +</root> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="Apache Tomcat v6.0"/> + <fixed facet="jst.jsf"/> + <fixed facet="jst.web"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="java"/> + <installed facet="java" version="1.5"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/Messages.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/Messages.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/Messages.properties 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/User.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/User.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/User.java 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by JBoss Developer Studio + */ +public class User { + + private String name; + + /** + * @return User Name + */ + public String getName() { + return name; + } + + /** + * @param User Name + */ + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/JavaSource/demo/User.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/META-INF/MANIFEST.MF 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/Messages.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/Messages.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/Messages.properties 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/User.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/classes/demo/User.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/faces-config.xml 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,28 @@ +<?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"> + <managed-bean> + <description>User Name Bean</description> + <managed-bean-name>user</managed-bean-name> + <managed-bean-class>demo.User</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <property-class>java.lang.String</property-class> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputUserName.jsp</from-view-id> + <navigation-case> + <from-outcome>hello</from-outcome> + <to-view-id>/pages/hello.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <application> + <locale-config/> + </application> + <factory/> + <lifecycle/> +</faces-config> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name> + <param-value>resources.application</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>Error 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>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.faces</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Error Servlet</servlet-name> + <url-pattern>/error</url-pattern> + </servlet-mapping> + <error-page> + <exception-type>java.lang.Throwable</exception-type> + <location>/error</location> + </error-page> + <error-page> + <exception-type>java.lang.Exception</exception-type> + <location>/error2</location> + </error-page> +</web-app> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/index.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/index.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/index.jsp 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + <body> + <jsp:forward page="/pages/inputUserName.jsf" /> + </body> +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/hello.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/hello.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/hello.jsp 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,20 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + +<f:loadBundle var="Message" basename="demo.Messages" /> + +<html> + <head> + <title>Hello!</title> + </head> + + <body> + <f:view> + <h3> + <h:outputText value="#{Message.hello_message}" />, + <h:outputText value="#{user.name}" />! + </h3> + </f:view> + </body> + +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/hello.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/inputUserName.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/inputUserName.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/inputUserName.jsp 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,28 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<f:loadBundle var="Message" basename="demo.Messages"/> + +<html> + <head> + <title>Input User Name Page</title> + </head> + <body> + + <f:view> + <h1><h:outputText value="#{Message.header}"/></h1> + + <h:messages style="color: red"/> + + <h:form id="greetingForm"> + <h:outputText value="#{Message.prompt_message}"/> + <h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText> + + <h:commandButton action="hello" value="Say Hello!" /> + + </h:form> + </f:view> + </body> +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/inputUserName.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.properties 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,3 @@ +# +#Fri Oct 15 13:22:21 MSD 2010 +classpath.external= Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.xml 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,74 @@ +<project name="KickStart" default="deploy" basedir="../"> + + <!-- Project settings --> + <property file="${basedir}/ant/build.properties" /> + + <property name="project.name" value="KickStart" /> + <property name="web.content.dir" value="${basedir}/WebContent" /> + <property name="web-inf.dir" value="${web.content.dir}/WEB-INF" /> + <property name="build.dir" value="build" /> + <property name="war.name" value="${build.dir}/${project.name}.war" /> + + <!-- Define a folder for deployment --> + <property name="deploy.dir" value="deploy" /> + + <!-- Compile classpath --> + <path id="compile.classpath"> + <fileset dir="${webinf.dir}/lib"> + <include name="**/*.jar" /> + </fileset> + <pathelement path="${classpath}" /> + <pathelement path="${classpath.external}" /> + <pathelement path="${webinf.dir}/classes" /> + </path> + + <!-- Copy any resource or configuration files --> + <target name="copyResources"> + <copy todir="${web-inf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.*" /> + <exclude name="**/*.java" /> + </patternset> + </fileset> + </copy> + </target> + + <!-- Check timestamp on files --> + <target name="prepare"> + <tstamp /> + </target> + + <!-- Remove classes directory for clean build --> + <target name="clean" description="Prepare for clean build"> + <delete dir="${web-inf.dir}/classes" failonerror="false"/> + <mkdir dir="${web-inf.dir}/classes" /> + </target> + + <!-- Normal build of application --> + <target name="compile" depends="prepare, copyResources"> + <javac srcdir="JavaSource" destdir="${web-inf.dir}/classes"> + <classpath refid="compile.classpath" /> + </javac> + </target> + + <!-- Build Project --> + <target name="build" depends="prepare, compile" /> + + <!-- Rebuild Project --> + <target name="rebuild" depends="clean, prepare, compile" /> + + <!-- Build WAR --> + <target name="war" depends="build"> + <mkdir dir="${build.dir}" /> + <war warfile="${war.name}" basedir="${web.content.dir}" webxml="${web-inf.dir}/web.xml"> + <exclude name="WEB-INF/web.xml" /> + </war> + </target> + + <target name="deploy" depends="war"> + <delete dir="${deploy.dir}/${project.name}" failonerror="false"/> + <copy file="${war.name}" todir="${deploy.dir}" /> + </target> + +</project> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/ant/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JsfVerificationAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JsfVerificationAllTests.java 2010-10-15 09:26:54 UTC (rev 25855) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JsfVerificationAllTests.java 2010-10-15 10:10:38 UTC (rev 25856) @@ -21,6 +21,7 @@ //$JUnit-BEGIN$ suite.addTestSuite(JSFVerificationTest.class); + suite.addTestSuite(WebVerificationTest.class); //$JUnit-END$ return suite; Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java 2010-10-15 10:10:38 UTC (rev 25856) @@ -0,0 +1,75 @@ +/******************************************************************************* + * Copyright (c) 2010 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.jsf.verification.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.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.test.util.TestProjectProvider; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +import junit.framework.TestCase; + +public class WebVerificationTest extends TestCase { + public static final String TEST_PROJECT_NAME = "Test"; + static String MARKER_TYPE = "org.jboss.tools.jst.web.ui.strutsmarker"; + + public static final String TEST_PROJECT_PATH = "/projects/" + TEST_PROJECT_NAME; + + TestProjectProvider prjProvider = null; + IProject project = null; + + protected void setUp() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(TEST_PROJECT_NAME); + if(project==null) { + prjProvider = new TestProjectProvider("org.jboss.tools.jsf.verification.test", TEST_PROJECT_PATH, TEST_PROJECT_NAME, true); + project = prjProvider.getProject(); + } + + project.build(IncrementalProjectBuilder.FULL_BUILD, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + + public void testWebVerification() throws CoreException { + IFile web = (IFile)project.getFile(new Path("WebContent/WEB-INF/web.xml")); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(web, MARKER_TYPE, "error: Attribute location references to /error that does not exist in web content", 40); + AbstractResourceMarkerTest.assertMarkerIsCreated(web, MARKER_TYPE, "error: Attribute location references to /error2 that does not exist in web content", 44); + + IMarker[] markers = web.findMarkers(null, true, IResource.DEPTH_INFINITE); + for (IMarker marker: markers) { + int line = marker.getAttribute(IMarker.LINE_NUMBER, -1); + int start = marker.getAttribute(IMarker.CHAR_START, -1); + int end = marker.getAttribute(IMarker.CHAR_END, -1); + + System.out.println(marker.getType() + " " + line + " " + start + " " + end); + System.out.println(marker.getAttribute(IMarker.MESSAGE)); + } + System.out.println(markers.length); + } + + @Override + protected void tearDown() throws Exception { + if(prjProvider!=null) { + prjProvider.dispose(); + } + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain