[jbosstools-commits] JBoss Tools SVN: r10672 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template and 15 other directories.

Author: yradtsevich Date: 2008-10-03 13:35:32 -0400 (Fri, 03 Oct 2008) New Revision: 10672 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.classpath trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/classes/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jsf-api.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jsf-impl.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputScript.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/images/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/images/image.gif trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f1.js trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f2.js trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.properties trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java Log: Support of new JSF 2.0 tags added to VPE. Added tests for these tags. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2008-10-03 17:14:47 UTC (rev 10671) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2008-10-03 17:35:32 UTC (rev 10672) @@ -13,7 +13,8 @@ org.jboss.tools.jst.jsp, org.eclipse.wst.sse.core, org.eclipse.jst.jsp.core, - org.eclipse.wst.html.core + org.eclipse.wst.html.core, + org.jboss.tools.vpe.html Eclipse-LazyStart: true Export-Package: org.jboss.tools.jsf.vpe.jsf.template Bundle-Localization: plugin Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,66 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.html.template.HtmlBodyTemplate; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * A wrapper of VpeAbstractTemplate. Does the same, but ignores all attributes except id. + * @author yradtsevich + * @see HtmlBodyTemplate + */ +public class JsfBodyTemplate extends VpeAbstractTemplate { + public static final String ID_ID = "id"; //$NON-NLS-1$ + + private final HtmlBodyTemplate htmlBodyTemplate = new HtmlBodyTemplate(); + + /** + * @see org.jboss.tools.vpe.html.template.HtmlBodyTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument) + */ + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + sourceNode = sourceNode.cloneNode(true); + NamedNodeMap attributes = sourceNode.getAttributes(); + int length = attributes.getLength(); + for (int i = 0; i < length; i++) { + Node attribute = attributes.item(i); + + if(!attribute.getNodeName().equalsIgnoreCase(ID_ID)) { + attributes.removeNamedItem(attribute.getNodeName()); + } + } + + return htmlBodyTemplate.create(pageContext, sourceNode, visualDocument); + } + + // TODO: change to default implementation (remove) + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String) + */ + @Override + public boolean isRecreateAtAttrChange(VpePageContext pageContext, + Element sourceElement, nsIDOMDocument visualDocument, + nsIDOMElement visualNode, Object data, String name, String value) { + // TODO: change to false + return true; + } + + + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-03 17:14:47 UTC (rev 10671) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -60,8 +60,7 @@ <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jsf.template.JsfInputTextAreaTemplate"> <!-- <textarea class="{@styleClass}" style="{@style}" rows="{@rows}" cols="{@cols}" title="{tagstring()}" dir="{@dir}"> - <vpe:value expr="{jsfvalue(@value)}" /> - + <vpe:value expr="{jsfvalue(@value)}" /> </textarea>--> <vpe:resize> <vpe:width width-attr="style.width" /> @@ -797,9 +796,62 @@ </vpe:template> </vpe:tag> + <!-- JSF 2.0 Tags --> + <vpe:tag name="h:body" case-sensitive="yes"> + <!-- The tag cannot have any attribute. --> + <vpe:if test="tld_version('min=2.0')"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.jsf.template.JsfBodyTemplate"> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="no"></vpe:drop> + </vpe:dnd> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="h:head" case-sensitive="yes"> + <!-- The tag cannot have any attribute. --> + <vpe:if test="tld_version('min=2.0')"> + <vpe:template children="yes" modify="no"> + <div style="display:none;" /> + <vpe:dnd> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:if> + </vpe:tag> + + <!-- + Tag h:outputScript can have any of next attributes: name, library, target. + Mojarra 2.0 EDR1 implementation of JSF 2.0 includes a script as follows: + <script type="text/javascript" + src="{facesContext.getApplication().getResourceHandler().createResource(name, library).getRequestPath()}"/> + --> + <vpe:tag name="h:outputScript" case-sensitive="yes"> + <vpe:if test="tld_version('min=2.0')"> + <vpe:template children="no" modify="no"/> + </vpe:if> + </vpe:tag> + + <!-- + Tag h:outputStylesheet can have any of next attributes: name, library, target. + Value of target could be either 'head' or 'body'. + Mojarra 2.0 EDR1 implementation of JSF 2.0 links a stylesheet as follows: + <link type="text/css" rel="stylesheet" + href="{facesContext.getApplication().getResourceHandler().createResource(name, library).getRequestPath()}"/> + --> + <vpe:tag name="h:outputStylesheet" case-sensitive="yes"> + <vpe:if test="tld_version('min=2.0')"> + <vpe:template children="no" modify="no"> + <vpe:link rel="stylesheet" href="{href(@name)}" /> + </vpe:template> + </vpe:if> + </vpe:tag> + <!-- End of JSF 2.0 Tags --> + <!-- Default template --> <vpe:template children="yes" modify="no"> <vpe:any value="{name()}" title="{tagstring()}"/> </vpe:template> - </vpe:templates> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.classpath 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jsf2Test</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.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/META-INF/MANIFEST.MF 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/faces-config.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,11 @@ +<?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"> + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> +</faces-config> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/WEB-INF/web.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,26 @@ +<?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> + JavaServer Faces 2.0 Test Application + </display-name> + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/jsf2test/*</url-pattern> + </servlet-mapping> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,13 @@ +<html> +<head> + <title>JavaServer Faces 2.0 Test Pages</title> +</head> +<body> + <a href="jsf2test/pages/components/head1.xhtml">h:head (1st)</a><br> + <a href="jsf2test/pages/components/head2.xhtml">h:head (2nd)</a><br> + <a href="jsf2test/pages/components/body1.xhtml">h:body (1st)</a><br> + <a href="jsf2test/pages/components/body2.xhtml">h:body (2st)</a><br> + <a href="jsf2test/pages/components/outputScript.xhtml">h:outputScript</a><br> + <a href="jsf2test/pages/components/outputStylesheet.xhtml">h:outputStylesheet</a><br> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,7 @@ +<!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"> +<h:head /> +<h:body id="body1"></h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body1.xhtml.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,7 @@ +<tests> + <test id="body1"> + <div> + <br/> + </div> + </test> +</tests> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,9 @@ +<!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"> +<h:head/> +<h:body id="body1"> + JSF 2.0 Test +</h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/body2.xhtml.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,9 @@ +<tests> + <test id="body1"> + <div> + <span> + JSF 2.0 Test + </span> + </div> + </test> +</tests> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,8 @@ +<!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"> +<h:head id="head1"/> +<h:body> +</h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head1.xhtml.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,7 @@ +<tests> + <test id="head1"> + <div> + <br/> + </div> + </test> +</tests> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,8 @@ +<!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"> +<h:head id="head1"><title>JSF 2.0 Test</title></h:head> +<h:body> +</h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/head2.xhtml.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,7 @@ +<tests> + <test id="head1"> + <div> + <h1>JSF 2.0 Test</h1> + </div> + </test> +</tests> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputScript.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputScript.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputScript.xhtml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,9 @@ +<!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"> +<h:head /> +<h:body> + Invisi<h:outputScript name="/resources/scripts/f1.js" id="outputScript1"/>ble tag +</h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,11 @@ +<!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"> +<h:head /> +<h:body> + <h:outputStylesheet name="/resources/css/stylesRed.css" id="outputStylesheetRed"/> + <h:outputStylesheet name="/resources/css/stylesBlue.css" id="outputStylesheetBlue"/> + Blue text +</h:body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/components/outputStylesheet.xhtml.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,12 @@ +<tests> + <test id="outputStylesheetRed"> + <style> + span { color: red;} + </style> + </test> + <test id="outputStylesheetBlue"> + <style> + span { color: blue;} + </style> + </test> +</tests> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesBlue.css 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,4 @@ +span { + color: blue; + +} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,4 @@ +span { + color: red; + +} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/images/image.gif =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/images/image.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f1.js =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f1.js (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f1.js 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1 @@ +function f1{} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f2.js =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f2.js (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/scripts/f2.js 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1 @@ +function f2{} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.properties 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,3 @@ +# +#Fri Dec 28 13:39:43 GMT+02:00 2007 +classpath.external= Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/ant/build.xml 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,74 @@ +<project name="jsf2testDemo" default="deploy" basedir="../"> + + <!-- Project settings --> + <property file="${basedir}/ant/build.properties" /> + + <property name="project.name" value="jsf2testDemo" /> + <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 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2008-10-03 17:35:32 UTC (rev 10672) @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test; + +import org.jboss.tools.vpe.ui.test.ComponentContentTest; + +/** + * Performs tests for JavaServer Faces 2.0 + * + * @author yradtsevich + * + */ +public class Jsf20ComponentContentTest extends ComponentContentTest { + public static final String OUTPUT_SCRIPT_ID = "outputScript1"; //$NON-NLS-1$ + + + public Jsf20ComponentContentTest(String name) { + super(name); + setCheckWarning(false); + } + + public void testBody1() throws Throwable { + performContentTest("components/body1.xhtml"); //$NON-NLS-1$ + } + + public void testBody2() throws Throwable { + performContentTest("components/body2.xhtml"); //$NON-NLS-1$ + } + + public void testHead1() throws Throwable { + performContentTest("components/head1.xhtml"); //$NON-NLS-1$ + } + + public void testHead2() throws Throwable { + performContentTest("components/head2.xhtml"); //$NON-NLS-1$ + } + + public void testOutputScript() throws Throwable { + performInvisibleTagTest("components/outputScript.xhtml", OUTPUT_SCRIPT_ID); //$NON-NLS-1$ + } + + public void testOutputStylesheet() throws Throwable { + performContentTest("components/outputStylesheet.xhtml"); //$NON-NLS-1$ + } + + protected String getTestProjectName() { + return Jsf20AllTests.IMPORT_PROJECT_NAME; + } +} Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-10-03 17:14:47 UTC (rev 10671) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-10-03 17:35:32 UTC (rev 10672) @@ -66,6 +66,7 @@ TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); // $NON-NLS-1$ //$NON-NLS-1$ // $JUnit-BEGIN$ suite.addTestSuite(JsfComponentTest.class); + suite.addTestSuite(Jsf20ComponentContentTest.class); suite.addTestSuite(JsfJbide1467Test.class); suite.addTestSuite(JsfJbide1501Test.class); suite.addTestSuite(JBIDE1484Test.class); @@ -103,10 +104,15 @@ // added by Max Areshkau // add here projects which should be imported for junit tests List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(JsfAllTests.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(importBean); + ImportBean importBeanJsf1 = new ImportBean(); + importBeanJsf1.setImportProjectName(JsfAllTests.IMPORT_PROJECT_NAME); + importBeanJsf1.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); + projectToImport.add(importBeanJsf1); + + ImportBean importBeanJsf20 = new ImportBean(); + importBeanJsf20.setImportProjectName(Jsf20AllTests.IMPORT_PROJECT_NAME); + importBeanJsf20.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); + projectToImport.add(importBeanJsf20); return new VpeTestSetup(suite, projectToImport);