[jbosstools-commits] JBoss Tools SVN: r5569 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test: META-INF and 12 other directories.

Author: dsakovich Date: 2008-01-09 16:00:20 -0500 (Wed, 09 Jan 2008) New Revision: 5569 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.project trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/JavaSource/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/.faces-config.xml.jsfdia trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/classes/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/classes/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/common-annotations.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-collections.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-digester.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-logging.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/el-api.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/el-ri.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-api.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-facelets.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-impl.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jstl.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/standard.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/index.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/component.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/composition.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/debug.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/define.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/fragment.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/include.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/remove.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/repeat.xhtml Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletstest.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/ImportFaceletsComponents.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1504 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF 2008-01-09 19:05:11 UTC (rev 5568) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF 2008-01-09 21:00:20 UTC (rev 5569) @@ -10,5 +10,9 @@ org.junit, org.eclipse.core.resources, org.eclipse.ui.ide, - org.jboss.tools.common + org.jboss.tools.common, + org.jboss.tools.jsf.vpe.ui.test, + org.jboss.tools.jst.jsp, + org.jboss.tools.vpe.xulrunner, + org.mozilla.xpcom Eclipse-LazyStart: true Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties 2008-01-09 19:05:11 UTC (rev 5568) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/build.properties 2008-01-09 21:00:20 UTC (rev 5569) @@ -1,4 +1,9 @@ -source.. = src/ -output.. = bin/ +source.facelets-tests.jar = src/ +output.facelets-tests.jar = bin/ bin.includes = META-INF/,\ - . + facelets-tests.jar,\ + resources/ +src.includes = META-INF/,\ + build.properties,\ + resources/,\ + src/ Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.classpath 2008-01-09 21:00:20 UTC (rev 5569) @@ -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.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.project 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>faceletsTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.common.verification.verifybuilder</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.facelets.test/resources/faceletsTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jdt.core.prefs 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,7 @@ +#Fri Jan 04 16:25:56 GMT+02:00 2008 +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 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,4 @@ +#Fri Jan 04 16:25:56 GMT+02:00 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v6.0/owners=jst.web\:2.4 +eclipse.preferences.version=1 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.component 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="faceletsTest"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="faceletsTest"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="Apache Tomcat v6.0"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.4"/> +</faceted-project> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<file-systems VERSION="2.0.0" application-name="faceletsTest" + model-entity="FileSystems" workspace-home="./WebContent/WEB-INF"> + <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/> + <file-system NAME="WEB-ROOT" info="Content-Type=Web" + location="%workspace.home%/.." model-entity="FileSystemFolder"/> + <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/> + <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/> + <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/> + <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-collections.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-digester.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-logging.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-api.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-api.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-impl.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-impl.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jstl.jar" info="hidden=yes" + location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-standard.jar" info="hidden=yes" + location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-facelets.jar" + location="%workspace.home%/lib/jsf-facelets.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-el-api.jar" + location="%workspace.home%/lib/el-api.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-el-ri.jar" + location="%workspace.home%/lib/el-ri.jar" model-entity="FileSystemJar"/> + <file-system NAME="flet001" location="%eclipse.project%" model-entity="FileSystemFolder"/> + <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-tlds.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-common-annotations.jar" info="hidden=yes" + location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/> + <web SERVLET_VERSION="2.5" model-entity="JstWeb" model-path="/web.xml"> + <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" + model-path="/faces-config.xml" root="WEB-ROOT" src="src"/> + </web> +</file-systems> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/JavaSource/resources.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/JavaSource/resources.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/JavaSource/resources.properties 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/META-INF/MANIFEST.MF 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/.faces-config.xml.jsfdia 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"> + <PROCESS-ITEM NAME="rules:" SHAPE="32,17,0,0" model-entity="JSFProcessGroup"> + <PROCESS-ITEM ID="rules::0" NAME="item" model-entity="JSFProcessItem"/> + </PROCESS-ITEM> +</PROCESS> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/classes/resources.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/classes/resources.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/classes/resources.properties 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/faces-config.xml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,9 @@ +<?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"> + <navigation-rule/> + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> +</faces-config> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/el-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/el-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/el-ri.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/el-ri.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-facelets.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-facelets.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/WEB-INF/web.xml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,42 @@ +<?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"> + <description>Facelets StarterKit</description> + <display-name>faceletsTest</display-name> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/index.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/index.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/index.jsp 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<html> +<head></head> + <body> + <jsp:forward page="pages/inputname.jsf" /> + </body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/component.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/component.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/component.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,18 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Component Test</title> +</head> + +<body bgcolor="#ffffff"> +<ui:component binding="#{backingBean.menu}"> + <ul id="mainMenu"> + <li><a href="#{link.uri}">#{link.text}</a></li> + </ul> +</ui:component> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/composition.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/composition.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/composition.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,14 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <ui:composition template="insert.xhtml"> + + <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat. KickStart Application</ui:define> + + <ui:define name="pageHeader">JSF 1.2 Hello Application</ui:define> + + </ui:composition> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/debug.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/debug.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/debug.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,14 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Debug Test</title> +</head> + +<body bgcolor="#ffffff"> + <ui:debug hotkey="d" rendered="#{initParam.debugMode}"/> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/decorate.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,14 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + + <ui:decorate template="insert.xhtml"> + + <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat. KickStart Application</ui:define> + + <ui:define name="pageHeader">JSF 1.2 Hello Application</ui:define> + + </ui:decorate> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/define.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/define.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/define.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,13 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + <ui:composition template="insert.xhtml"> + <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat. KickStart Application</ui:define> + <ui:define name="pageHeader">Greeting Page</ui:define> + <ui:define name="body"> + #{person.name}! + </ui:define> + </ui:composition> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/fragment.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/fragment.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/fragment.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,18 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Fragment Test</title> +</head> + +<body bgcolor="#ffffff"> + <ui:fragment binding="#{uiCache['searchResult']}"> + <ul id="mainMenu"> + <li><a href="#{link.uri}">#{link.text}</a></li> + </ul> +</ui:fragment> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/include.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/include.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/include.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,15 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Debug Test</title> +</head> + +<body bgcolor="#ffffff"> + <h3 align="center">ui:include test page</h3> + <ui:include src="insert.xhtml" /> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/insert.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,66 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title><ui:insert name="pageTitle">Page Title</ui:insert></title> +<style type="text/css"> +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.header { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 18px; +} + +.bottom { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 9px; + text-align: center; + vertical-align: middle; + color: #8E969D; +} +</style> +</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 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/param.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,17 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Param Test</title> +</head> + +<body bgcolor="#ffffff"> + <ui:include src="insert.xhtml"> + <ui:param name="user" value="#{currentUser}" /> + <ui:param name="page" value="home"/> + </ui:include> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/remove.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/remove.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/remove.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,18 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Remove Test</title> +</head> + +<body bgcolor="#ffffff"> +<ui:remove> + This will be removed. +</ui:remove> +<span jsfc="ui:remove"> This won't be compiled either <h:outputText + value="#{foo.bar}" /> </span> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/repeat.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/repeat.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/repeat.xhtml 2008-01-09 21:00:20 UTC (rev 5569) @@ -0,0 +1,20 @@ +<!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:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + +<head> +<title>Repeat Test</title> +</head> +<body bgcolor="#ffffff"> + <dl> + <ui:repeat value="#{company.departments}" var="dept"> + <dt>#{dept.name}</dt> + <ui:repeat value="#{dept.employees}" var="emp"> + <dd>#{emp.lastName}, #{emp.firstName}</dd> + </ui:repeat> + </ui:repeat> +</dl> +</body> +</html> \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletstest.jar =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-09 19:05:11 UTC (rev 5568) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-09 21:00:20 UTC (rev 5569) @@ -7,7 +7,7 @@ public static Test suite() { - TestSuite suite = new TestSuite("Tests for Vpe Facelets components"); // $NON-NLS-1$ + TestSuite suite = new TestSuite("Tests for Vpe Facelets components"); // $JUnit-BEGIN$ suite.addTestSuite(FaceletsComponentTest.class); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-09 19:05:11 UTC (rev 5568) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-09 21:00:20 UTC (rev 5569) @@ -10,20 +10,19 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.facelets.test; -import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.List; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.ILogListener; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; /** * Class for testing all Seam components @@ -31,187 +30,79 @@ * @author dsakovich(a)exadel.com * */ -public class FaceletsComponentTest extends TestCase implements ILogListener { +public class FaceletsComponentTest extends VpeTest { - private final static String EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; // $NON-NLS-1$ - private final static String TEST_PROJECT_JAR_PATH = "/faceletstest.jar"; // $NON-NLS-1$ + // import project name + private static final String IMPORT_PROJECT_NAME = "faceletsTest"; - // check warning log - private final static boolean checkWarning = false; - private Throwable exception; - public FaceletsComponentTest(String name) { - super(name); + super(name, IMPORT_PROJECT_NAME, FaceletsTestPlugin + .getPluginResourcePath()); } - /** - * Perform pre-test initialization. - * - * @throws Exception - * - * @see TestCase#setUp() - */ - protected void setUp() throws Exception { - super.setUp(); - - // TODO: Use TestSetup to create and remove project once for all tests - // not for every one - if (ResourcesPlugin.getWorkspace().getRoot().findMember("faceletsTest") == null) { - - ImportFaceletsComponents.importFaceletsPages(FaceletsTestPlugin - .getPluginResourcePath() - + TEST_PROJECT_JAR_PATH); - - waitForJobs(); - delay(5000); - } - Platform.addLogListener(this); + public void testDebug() throws Throwable { + performTestForJsfComponent("components/debug.xhtml"); // $NON-NLS-1$ } - /** - * Perform post-test cleanup. - * - * @throws Exception - * - * @see TestCase#tearDown() - */ - protected void tearDown() throws Exception { - super.tearDown(); - if (ResourcesPlugin.getWorkspace().getRoot().findMember("faceletsTest") != null) { - ImportFaceletsComponents.removeProject(); - } - Platform.removeLogListener(this); - } + public void testDefine() throws Throwable { + TestUtil.waitForJobs(); + // set exception + setException(null); - /** - * Process UI input but do not return for the specified time interval. - * - * @param waitTimeMillis - * the number of milliseconds - */ - private void delay(long waitTimeMillis) { - Display display = Display.getCurrent(); - if (display != null) { - long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; - while (System.currentTimeMillis() < endTimeMillis) { - if (!display.readAndDispatch()) - display.sleep(); - } - display.update(); - } - // Otherwise, perform a simple sleep. - else { - try { - Thread.sleep(waitTimeMillis); - } catch (InterruptedException e) { - // Ignored. - } - } - } + // get test page path + IFile file = (IFile) TestUtil.getComponentPath( + "components/define.xhtml", getImportProjectName()); - /** - * Wait until all background tasks are complete. - */ - public void waitForJobs() { - while (Job.getJobManager().currentJob() != null) - delay(5000); - } + assertNotNull("Could not open specified file " + file.getFullPath(), + file); - public void testInsert() throws PartInitException, Throwable { - performTestForFaceletComponent("insert.xhtml"); // $NON-NLS-1$ - } + IEditorInput input = new FileEditorInput(file); - public void testDefine() throws PartInitException, Throwable { - performTestForFaceletComponent("define.xhtml"); // $NON-NLS-1$ - // TODO check that content from ui:defime element is shown - assertTrue("Defined content is not shown",false); - } + assertNotNull("Editor input is null", input); + // open and get editor + JSPMultiPageEditor part = openEditor(input); - public void testComposite() throws PartInitException, Throwable { - performTestForFaceletComponent("composition.xhtml"); // $NON-NLS-1$ - // TODO check that related and absolute path is processed - assertTrue("Template with absolute path is not included",false); - assertTrue("Template with related path is not included",false); - } + // get dom document + nsIDOMDocument document = getVpeVisualDocument(part); + nsIDOMElement element = document.getDocumentElement(); - public void testComponent() throws PartInitException, Throwable { - performTestForFaceletComponent("component.xhtml"); // $NON-NLS-1$ - // TODO check that content from ui:defime element is shown - //assertTrue("Component's content is not shown",false); - } - - public void testRemove() throws PartInitException, Throwable { - performTestForFaceletComponent("remove.xhtml"); // $NON-NLS-1$ - // TODO check that content in ui:remove isn't shown in VPE - assertTrue("Content inside ui:remove tag shouldn't be shown",false); - } - - public void testDecorate() throws PartInitException, Throwable { - performTestForFaceletComponent("decorate.xhtml"); // $NON-NLS-1$ - // TODO check that related and absolute path is processed - assertTrue("Template with absolute path is not included",false); - assertTrue("Template with related path is not included",false); - } + // check that element is not null + assertNotNull(element); - public void testRepeat() throws PartInitException, Throwable { - performTestForFaceletComponent("repeat.xhtml"); // $NON-NLS-1$ - assertTrue("Component's content is not shown",false); - } - - public void testDebug() throws PartInitException, Throwable { - performTestForFaceletComponent("debug.xhtml"); // $NON-NLS-1$ - } - - public void testInclude() throws PartInitException, Throwable { - performTestForFaceletComponent("include.xhtml"); // $NON-NLS-1$ - // TODO check that absolute and related path is processed - assertTrue("Template with absolute path is not included",false); - assertTrue("Template with related path is not included",false); - } - - public void testFragment() throws PartInitException, Throwable { - performTestForFaceletComponent("fragment.xhtml"); // $NON-NLS-1$ - // TODO check that fragment's content is showed - assertTrue("Fragment's content is not sown",false); - } - private void performTestForFaceletComponent(String componentPage) - throws PartInitException, Throwable { - waitForJobs(); + // get root node + nsIDOMNode node = (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); - exception = null; - IPath componentPath = ImportFaceletsComponents - .getComponentPath(componentPage); + List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile( - componentPath); - IEditorInput input = new FileEditorInput(file); + // find "span" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .openEditor(input, EDITOR_ID, true); + assertEquals(2, elements.size()); - waitForJobs(); - delay(5000); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .closeAllEditors(true); + nsIDOMElement elementSpan0 = (nsIDOMElement) elements.get(0) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement elementSpan1 = (nsIDOMElement) elements.get(1) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - if (exception != null) { - throw exception; + /* + * nsIDOMText text0 = (nsIDOMText) elementSpan0.getFirstChild(); + * nsIDOMText text1 = (nsIDOMText) elementSpan1.getFirstChild(); + * System.out.println(text0.getNodeValue()); + * assertEquals(elementInput0.getAttribute("value"), ""); + * assertNotNull(elementInput1.getAttribute("value"), ""); + * assertNotNull(elementInput2.getAttribute("value"), "test"); + */ + + // TODO Dzmitry Sakovich Test not complete + assertTrue("Defined content is not shown", false); + if (getException() != null) { + throw getException(); } } - public void logging(IStatus status, String plugin) { - switch (status.getSeverity()) { - case IStatus.ERROR: - exception = status.getException(); - break; - case IStatus.WARNING: - if (checkWarning) - exception = status.getException(); - break; - default: - break; - } - + public void testInsert() throws Throwable { + performTestForJsfComponent("components/insert.xhtml"); // $NON-NLS-1$ } } Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/ImportFaceletsComponents.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/ImportFaceletsComponents.java 2008-01-09 19:05:11 UTC (rev 5568) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/ImportFaceletsComponents.java 2008-01-09 21:00:20 UTC (rev 5569) @@ -1,92 +0,0 @@ -package org.jboss.tools.jsf.vpe.facelets.test; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.zip.ZipFile; - -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.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.IOverwriteQuery; -import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider; -import org.eclipse.ui.wizards.datatransfer.ImportOperation; - -/** - * Class for importing project from jar file - * - * @author dsakovich(a)exadel.com - * - */ -public class ImportFaceletsComponents { - private static final String PROJECT_NAME = "faceletsTest"; // $NON-NLS-1$ - private static final String COMPONENTS_PATH = "WebContent/pages"; // $NON-NLS-1$ - - @SuppressWarnings("restriction") - static void importFaceletsPages(String path) { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - PROJECT_NAME); - ZipLeveledStructureProvider zipStructureProvider; - try { - zipStructureProvider = new ZipLeveledStructureProvider(new ZipFile( - path)); - - IOverwriteQuery overwrite = new IOverwriteQuery() { - public String queryOverwrite(String pathString) { - return ALL; - } - }; - - ImportOperation importOp = new ImportOperation(project - .getFullPath(), zipStructureProvider.getRoot(), - zipStructureProvider, overwrite); - - importOp.setContext(PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getShell()); - - importOp.run(new NullProgressMonitor()); - } catch (InvocationTargetException ite) { - FaceletsTestPlugin.getPluginLog().logError(ite.getCause()); - } catch (InterruptedException ie) { - FaceletsTestPlugin.getPluginLog().logError(ie); - } catch (IOException e) { - FaceletsTestPlugin.getPluginLog().logError(e); - } - } - - /** - * - * @return - * @throws CoreException - */ - static IPath getComponentPath(String componentPage) throws CoreException { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - PROJECT_NAME); - if (project != null) { - IResource resource = project.getFolder(COMPONENTS_PATH).findMember( - componentPage); - if (resource != null) { - return resource.getFullPath(); - } - - } - - return null; - } - - /** - * - * @throws CoreException - */ - static void removeProject() throws CoreException { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( - PROJECT_NAME); - if (project != null) { - project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT, - new NullProgressMonitor()); - } - } -}