Author: dsakovich Date: 2008-01-17 10:19:49 -0500 (Thu, 17 Jan 2008) New Revision: 5768 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.jboss.tools.jst.web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-absolute.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-related.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/sample.groovy trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/META-INF/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.classpath trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.project trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/.faces-config.xml.jsfdia trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/index.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.properties trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java Log: Add junit test for http://jira.jboss.com/jira/browse/JBIDE-1614 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.classpath 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.classpath 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,8 +1,9 @@ -<?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.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/> - <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> -</classpath> +<?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="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.project 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.project 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,36 +1,36 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>test</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> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>richFacesTest</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.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jdt.core.prefs 2008-01-17 15:19:49 UTC (rev 5768) @@ -0,0 +1,7 @@ +#Thu Jan 17 15:59:03 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.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-01-17 15:19:49 UTC (rev 5768) @@ -0,0 +1,4 @@ +#Thu Jan 17 15:59:04 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.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.component 2008-01-17 15:19:49 UTC (rev 5768) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="richFacesTest"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="richFacesTest"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-17 15:19:49 UTC (rev 5768) @@ -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.richfaces.test/resources/richFacesTest/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.jboss.tools.jst.web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/.settings/org.jboss.tools.jst.web.xml 2008-01-17 15:19:49 UTC (rev 5768) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<file-systems VERSION="2.0.0" application-name="richFacesTest" + 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="build" location="%workspace.home%/../../ant" model-entity="FileSystemFolder"/> + <file-system NAME="lib-commons-collections.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-tlds.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-commons-logging.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-logging.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-beanutils.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-beanutils.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.4" 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> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/.faces-config.xml.jsfdia 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/.faces-config.xml.jsfdia 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PROCESS ENTITY="JSFProcess"/> +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"/> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/faces-config.xml 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/faces-config.xml 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,9 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> -</faces-config> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <description>User Name Bean</description> + <managed-bean-name>user</managed-bean-name> + <managed-bean-class>demo.User</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <property-class>java.lang.String</property-class> + <value/> + </managed-property> + </managed-bean> + </faces-config> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/web.xml 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/WEB-INF/web.xml 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,56 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - <description>Facelets StarterKit</description> - <display-name>test</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> - - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>Faces Servlet</servlet-name> - <dispatcher>REQUEST</dispatcher> - <dispatcher>FORWARD</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> -</web-app> +<?xml version="1.0"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>richFacesTest</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + <!-- Faces Servlet --> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <!-- Faces Servlet Mapping --> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/index.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/index.jsp 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/index.jsp 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,7 +1,7 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + <html> -<head></head> <body> - <jsp:forward page="pages/richFacesTest.jsf" /> + <jsp:forward page="/pages/inputUserName.jsf" /> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-absolute.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-absolute.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-absolute.xhtml 2008-01-17 15:19:49 UTC (rev 5768) @@ -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" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<head> +</head> + +<body> +<rich:insert src="/pages/JBIDE/1614/sample.groovy" highlight="groovy" /> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-related.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-related.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/JBIDE-1614-related.xhtml 2008-01-17 15:19:49 UTC (rev 5768) @@ -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" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<head> +</head> + +<body> +<rich:insert src="./sample.groovy" highlight="groovy" /> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/sample.groovy =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/sample.groovy (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1614/sample.groovy 2008-01-17 15:19:49 UTC (rev 5768) @@ -0,0 +1,9 @@ +double[] values = new double[8] + +i = 0 +[1, 2, 3, 4, 5, 6, 7, 8].each { + println it + values[i++] = it + // uncomment the next line and it works fine!! + //println it +} \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.properties 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.properties 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,3 +1,3 @@ -# -#Wed Sep 26 14:10:18 EEST 2007 -classpath.external=D\:\\workspaces\\runtime-New_configuration\\.metadata\\.plugins\\org.jboss.tools.common.projecttemplates\\lib\\servlet\\2.4\\jsp-api.jar;D\:\\workspaces\\runtime-New_configuration\\.metadata\\.plugins\\org.jboss.tools.common.projecttemplates\\lib\\servlet\\2.4\\servlet-api.jar; +# +#Thu Jan 17 15:59:03 GMT+02:00 2008 +classpath.external=/home/dsakovich/work/runtimeVpe/.metadata/.plugins/org.jboss.tools.common.projecttemplates/lib/servlet/2.4/servlet-api.jar;/home/dsakovich/work/runtimeVpe/.metadata/.plugins/org.jboss.tools.common.projecttemplates/lib/servlet/2.4/jsp-api.jar; Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.xml 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/ant/build.xml 2008-01-17 15:19:49 UTC (rev 5768) @@ -1,88 +1,74 @@ -<project name="jsf12KickStart" basedir="../" default="deploy"> +<project name="KickStart" default="deploy" basedir="../"> + <!-- Project settings --> + <property file="${basedir}/ant/build.properties" /> - <!-- define your folder for deployment --> - <property name="deploy.dir" value="deploy"/> + <property name="project.name" value="KickStart" /> + <property name="web.content.dir" value="${basedir}/WebContent" /> + <property name="web-inf.dir" value="${web.content.dir}/WEB-INF" /> + <property name="build.dir" value="build" /> + <property name="war.name" value="${build.dir}/${project.name}.war" /> + <!-- Define a folder for deployment --> + <property name="deploy.dir" value="deploy" /> - <!-- Project settings --> - <property name="project.distname" value="jsf12KickStart"/> + <!-- 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> - <!-- Local system paths --> - <property file="${basedir}/ant/build.properties"/> - <property name="webroot.dir" value="${basedir}/WebContent"/> - <property name="webinf.dir" value="${webroot.dir}/WEB-INF"/> - <property name="build.dir" value="build"/> + <!-- 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> - <!-- classpath for JSF 1.0 --> - <path id="compile.classpath"> - <pathelement path ="${webinf.dir}/lib/commons-beanutils.jar"/> - <pathelement path ="${webinf.dir}/lib/commons-collections.jar"/> - <pathelement path ="${webinf.dir}/lib/commons-digester.jar"/> - <pathelement path ="${webinf.dir}/lib/commons-logging.jar"/> - <pathelement path ="${webinf.dir}/lib/jsf-api.jar"/> - <pathelement path ="${webinf.dir}/lib/jsf-impl.jar"/> - <pathelement path ="${webinf.dir}/lib/jstl.jar"/> - <pathelement path ="${webinf.dir}/lib/standard.jar"/> - <pathelement path ="${webinf.dir}/classes"/> - <pathelement path ="${classpath}"/> - </path> + <!-- 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> - <!-- Check timestamp on files --> - <target name="prepare"> - <tstamp/> - </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> - <!-- Copy any resource or configuration files --> - <target name="resources"> - <copy todir="${webinf.dir}/classes" includeEmptyDirs="no"> - <fileset dir="JavaSource"> - <patternset> - <include name="**/*.conf"/> - <include name="**/*.properties"/> - <include name="**/*.xml"/> - </patternset> - </fileset> - </copy> - </target> + <!-- Build Project --> + <target name="build" depends="prepare, compile" /> - <!-- Normal build of application --> - <target name="compile" depends="prepare,resources"> - <javac srcdir="JavaSource" destdir="${webinf.dir}/classes"> - <classpath refid="compile.classpath"/> - </javac> - </target> + <!-- Rebuild Project --> + <target name="rebuild" depends="clean, prepare, compile" /> - <!-- Remove classes directory for clean build --> - <target name="clean" - description="Prepare for clean build"> - <delete dir="${webinf.dir}/classes"/> - <mkdir dir="${webinf.dir}/classes"/> - </target> + <!-- Build 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> - <!-- Build entire project --> - <target name="build" depends="prepare,compile"/> - <target name="rebuild" depends="clean,prepare,compile"/> + <target name="deploy" depends="war"> + <delete dir="${deploy.dir}/${project.name}" failonerror="false"/> + <copy file="${war.name}" todir="${deploy.dir}" /> + </target> - <!-- Create binary distribution --> - <target name="war" depends="build"> - <mkdir dir="${build.dir}"/> - <war - basedir="${webroot.dir}" - warfile="${build.dir}/${project.distname}.war" - webxml="${webinf.dir}/web.xml"> - <exclude name="WEB-INF/${build.dir}/**"/> - <exclude name="WEB-INF/src/**"/> - <exclude name="WEB-INF/web.xml"/> - </war> - - </target> - - <target name="deploy" depends="war"> - <delete file="${deploy.dir}/${project.distname}.war"/> - <delete dir="${deploy.dir}/${project.distname}"/> - <copy file="${build.dir}/${project.distname}.war" todir="${deploy.dir}"/> - </target> - -</project> +</project> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-01-17 15:19:49 UTC (rev 5768) @@ -18,10 +18,10 @@ import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1579Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1613Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1580Test; +import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1614Test; import org.jboss.tools.vpe.ui.test.VpeTestSetup; import org.jboss.tools.vpe.ui.test.beans.ImportBean; - /** * Class for testing all RichFaces components * @@ -29,29 +29,30 @@ * */ -public class RichFacesAllTests { +public class RichFacesAllTests { - public static Test suite() { - TestSuite suite = new TestSuite("Tests for Vpe RichFaces components"); // $NON-NLS-1$ - // $JUnit-BEGIN$ + public static Test suite() { + TestSuite suite = new TestSuite("Tests for Vpe RichFaces components"); // $NON-NLS-1$ + // $JUnit-BEGIN$ - suite.addTestSuite(RichFacesComponentTest.class); - suite.addTestSuite(JBIDE1579Test.class); - suite.addTestSuite(Jbide1580Test.class); - suite.addTestSuite(JBIDE1613Test.class); + suite.addTestSuite(RichFacesComponentTest.class); + suite.addTestSuite(JBIDE1579Test.class); + suite.addTestSuite(Jbide1580Test.class); + suite.addTestSuite(JBIDE1613Test.class); + suite.addTestSuite(Jbide1614Test.class); - // $JUnit-END$ + // $JUnit-END$ - List<ImportBean> projectToImport = new ArrayList<ImportBean>(); - ImportBean importBean = new ImportBean(); - importBean - .setImportProjectName(RichFacesComponentTest.IMPORT_PROJECT_NAME); - importBean.setImportProjectPath(RichFacesTestPlugin - .getPluginResourcePath()); - projectToImport.add(importBean); + List<ImportBean> projectToImport = new ArrayList<ImportBean>(); + ImportBean importBean = new ImportBean(); + importBean + .setImportProjectName(RichFacesComponentTest.IMPORT_PROJECT_NAME); + importBean.setImportProjectPath(RichFacesTestPlugin + .getPluginResourcePath()); + projectToImport.add(importBean); - return new VpeTestSetup(suite, projectToImport); + return new VpeTestSetup(suite, projectToImport); - } + } } Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java 2008-01-17 15:19:49 UTC (rev 5768) @@ -0,0 +1,131 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.jsf.vpe.richfaces.test.jbide; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; + +import org.eclipse.core.resources.IFile; +import org.eclipse.ui.IEditorInput; +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; + +/** + * + * + * @author dsakovich(a)exadel.com + * + */ +public class Jbide1614Test extends VpeTest { + + public static final String IMPORT_PROJECT_NAME = "richFacesTest"; + + public static final String FILE_NAME1 = "JBIDE/1614/JBIDE-1614-absolute.xhtml"; + public static final String FILE_NAME2 = "JBIDE/1614/JBIDE-1614-related.xhtml"; + + public Jbide1614Test(String name) { + super(name); + } + + public void testAbsolutePath() throws Throwable { + + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + + // get test page path + IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME1, + IMPORT_PROJECT_NAME); + + IEditorInput input = new FileEditorInput(file); + + // open and get editor + JSPMultiPageEditor part = openEditor(input); + + // get dom document + nsIDOMDocument document = getVpeVisualDocument(part); + assertNotNull(document); + + // get dom element + nsIDOMElement element = document.getDocumentElement(); + assertNotNull(element); + + // get root node + nsIDOMNode node = (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + + List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); + + // find "code" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_CODE); + + Assert.assertEquals(1, elements.size()); + + // check exception + if (getException() != null) { + throw getException(); + } + + } + + public void testRelatedPath() throws Throwable { + + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + + // get test page path + IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME2, + IMPORT_PROJECT_NAME); + + IEditorInput input = new FileEditorInput(file); + + // open and get editor + JSPMultiPageEditor part = openEditor(input); + + // get dom document + nsIDOMDocument document = getVpeVisualDocument(part); + assertNotNull(document); + + // get dom element + nsIDOMElement element = document.getDocumentElement(); + assertNotNull(element); + + // get root node + nsIDOMNode node = (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + + List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); + + // find "code" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_CODE); + + Assert.assertEquals(1, elements.size()); + + // check exception + if (getException() != null) { + throw getException(); + } + + } + +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-01-17 15:17:10 UTC (rev 5767) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-01-17 15:19:49 UTC (rev 5768) @@ -13,58 +13,58 @@ /** * @author Sergey Vasilyev (svasilyev(a)exadel.com) - * + * */ public final class HTML { - private HTML() {} + private HTML() { + } - public static final String TAG_HTML = "HTML"; - public static final String TAG_HEAD = "HEAD"; - public static final String TAG_BODY = "BODY"; - public static final String TAG_IMG = "IMG"; - public static final String TAG_LINK = "LINK"; - public static final String TAG_SELECT = "SELECT"; - public static final String TAG_OPTION = "OPTION"; - public static final String TAG_STYLE = "STYLE"; - public static final String TAG_TABLE = "TABLE"; - public static final String TAG_TBODY = "TBODY"; - public static final String TAG_THEAD = "THEAD"; - public static final String TAG_TFOOT = "TFOOT"; - public static final String TAG_TH = "TH"; - public static final String TAG_TR = "TR"; - public static final String TAG_TD = "TD"; - public static final String TAG_DL = "DL"; - public static final String TAG_DT = "DT"; - public static final String TAG_COL = "COL"; - public static final String TAG_COLS = "COLS"; - public static final String TAG_COLGROUP = "COLGROUP"; - public static final String TAG_BR = "BR"; - public static final String TAG_LI = "LI"; - public static final String TAG_DIV = "DIV"; - public static final String TAG_SPAN = "SPAN"; - public static final String TAG_P = "P"; - public static final String TAG_TEXTAREA = "TEXTAREA"; - public static final String TAG_INPUT = "INPUT"; - public static final String TAG_BUTTON = "BUTTON"; - public static final String TAG_OL = "OL"; - public static final String TAG_UL = "UL"; - - - - public static final String ATTR_ID = "ID"; - public static final String ATTR_TYPE ="TYPE"; - public static final String ATTR_TEXT ="TEXT"; - public static final String ATTR_CLASS ="CLASS"; - public static final String ATTR_TITLE ="TITLE"; - public static final String ATTR_NAME ="NAME"; - public static final String ATTR_VALUE ="VALUE"; - public static final String ATTR_STYLE ="STYLE"; - public static final String ATTR_SIZE ="SIZE"; - public static final String ATTR_MULTIPLE = "MULTIPLE"; - public static final String ATTR_COLSPAN = "colspan"; - public static final String ATTR_CELLSPACING = "cellspacing"; - public static final String ATTR_CELLPADDING = "cellpadding"; - public static final String ATTR_WIDTH = "WIDTH"; - public static final String ATTR_HEIGHT = "HEIGHT"; + public static final String TAG_HTML = "HTML"; + public static final String TAG_HEAD = "HEAD"; + public static final String TAG_BODY = "BODY"; + public static final String TAG_IMG = "IMG"; + public static final String TAG_LINK = "LINK"; + public static final String TAG_SELECT = "SELECT"; + public static final String TAG_OPTION = "OPTION"; + public static final String TAG_STYLE = "STYLE"; + public static final String TAG_TABLE = "TABLE"; + public static final String TAG_TBODY = "TBODY"; + public static final String TAG_THEAD = "THEAD"; + public static final String TAG_TFOOT = "TFOOT"; + public static final String TAG_TH = "TH"; + public static final String TAG_TR = "TR"; + public static final String TAG_TD = "TD"; + public static final String TAG_DL = "DL"; + public static final String TAG_DT = "DT"; + public static final String TAG_COL = "COL"; + public static final String TAG_COLS = "COLS"; + public static final String TAG_COLGROUP = "COLGROUP"; + public static final String TAG_BR = "BR"; + public static final String TAG_LI = "LI"; + public static final String TAG_DIV = "DIV"; + public static final String TAG_SPAN = "SPAN"; + public static final String TAG_P = "P"; + public static final String TAG_TEXTAREA = "TEXTAREA"; + public static final String TAG_INPUT = "INPUT"; + public static final String TAG_BUTTON = "BUTTON"; + public static final String TAG_OL = "OL"; + public static final String TAG_UL = "UL"; + public static final String TAG_CODE = "CODE"; + + public static final String ATTR_ID = "ID"; + public static final String ATTR_TYPE = "TYPE"; + public static final String ATTR_TEXT = "TEXT"; + public static final String ATTR_CLASS = "CLASS"; + public static final String ATTR_TITLE = "TITLE"; + public static final String ATTR_NAME = "NAME"; + public static final String ATTR_VALUE = "VALUE"; + public static final String ATTR_STYLE = "STYLE"; + public static final String ATTR_SIZE = "SIZE"; + public static final String ATTR_MULTIPLE = "MULTIPLE"; + public static final String ATTR_COLSPAN = "colspan"; + public static final String ATTR_CELLSPACING = "cellspacing"; + public static final String ATTR_CELLPADDING = "cellpadding"; + public static final String ATTR_WIDTH = "WIDTH"; + public static final String ATTR_HEIGHT = "HEIGHT"; } \ No newline at end of file