Author: vrubezhny Date: 2009-08-04 17:15:39 -0400 (Tue, 04 Aug 2009) New Revision: 16965 Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.settings/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/WEB-INF/lib/jsf-tlds.jar Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/pages/greeting.xhtml Log: JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied. Test project data for JsfJspJbide1641Test JUnit Test suite is updated to suite the new-style CA requirements Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath 2009-08-04 20:18:54 UTC (rev 16964) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath 2009-08-04 21:15:39 UTC (rev 16965) @@ -1,8 +1,7 @@ <?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.jdt.launching.JRE_CONTAINER"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> </classpath> Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project 2009-08-04 20:18:54 UTC (rev 16964) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project 2009-08-04 21:15:39 UTC (rev 16965) @@ -1,25 +1,48 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>JsfJbide1641Test</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> - </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.eclipse.wst.common.project.facet.core.nature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JsfJbide1641Test</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> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.settings/org.eclipse.wst.common.component 2009-08-04 21:15:39 UTC (rev 16965) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="JsfJbide1641Test"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="JsfJbide1641Test"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/pages/greeting.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/pages/greeting.xhtml 2009-08-04 20:18:54 UTC (rev 16964) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/WebContent/pages/greeting.xhtml 2009-08-04 21:15:39 UTC (rev 16965) @@ -5,10 +5,9 @@ xmlns:f="http://java.sun.com/jsf/core"> <f:loadBundle basename="resources" var="msg" /> - - <ui:composition template="/templates/common.xhtml"> + <h:commandButton a><ui:composition template="/templates/common.xhtml"> <ui:define name="pageTitle">Greeting to User</ui:define> - <ui:define name="pageHeader">Facelets Greeting Page</ui:define> + <ui:define name="pageHeader">Greeting Page</ui:define> <ui:define name="body"> #{msg.greeting} #{person.name}! </ui:define>