Author: vrubezhny Date: 2008-01-22 13:26:00 -0500 (Tue, 22 Jan 2008) New Revision: 5887 Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.jboss.tools.jst.web.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/demo/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/demo/Person.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/resources.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/demo/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/demo/Person.class trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/resources.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jsf-facelets.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jstl.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/standard.jar trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/index.jsp trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/greeting.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/inputname.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/templates/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/templates/common.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.xml Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java Log: http://jira.jboss.org/jira/browse/JBIDE-1585 Proposal list is not filtered by current input if there is no blank symbol between new entered tag and next tag, and new tag has no '>' No Seam is needed to reproduce the issue. Test Seam project is replaced by the Jsf project Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jdt.core.prefs 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,7 @@ +#Tue Jan 22 20:42:45 MSK 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 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,4 @@ +#Tue Jan 22 20:42:47 MSK 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_07/owners=jst.java\:5.0 +classpath.helper/org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.4 +eclipse.preferences.version=1 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.jst.common.project.facet.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.component 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="JsfJbide1585Test"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="JsfJbide1585Test"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.4"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.jboss.tools.jst.web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.jboss.tools.jst.web.xml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<file-systems VERSION="2.0.0" application-name="JsfJbide1585Test" + 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-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="flet001" location="%eclipse.project%" model-entity="FileSystemFolder"/> + <file-system NAME="lib-common-annotations.jar" info="hidden=yes" + location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-tlds.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> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.settings/org.jboss.tools.jst.web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/demo/Person.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/demo/Person.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/demo/Person.java 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by Red Hat Developer Studio +* + */ +public class Person { + private String name; + + public Person() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/demo/Person.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/resources.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/resources.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/resources.properties 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/JavaSource/resources.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/META-INF/MANIFEST.MF 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/demo/Person.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/demo/Person.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/resources.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/resources.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/resources.properties 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/classes/resources.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/faces-config.xml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + <managed-bean> + <managed-bean-name>person</managed-bean-name> + <managed-bean-class>demo.Person</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputname.xhtml</from-view-id> + <navigation-case> + <from-outcome>greeting</from-outcome> + <to-view-id>/pages/greeting.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + <locale-config/> + </application> + <factory/> + <lifecycle/> +</faces-config> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jsf-facelets.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jsf-facelets.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/web.xml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<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>JsfJbide1585Test</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> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/index.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/index.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/index.jsp 2008-01-22 18:26:00 UTC (rev 5887) @@ -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 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/greeting.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/greeting.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/greeting.xhtml 2008-01-22 18:26:00 UTC (rev 5887) @@ -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"> + + <f:loadBundle basename="resources" var="msg" /> + <ui:composition template="/templates/common.xhtml"> + <ui:define name="pageTitle">Greeting to User</ui:define> + <ui:define name="pageHeader">Facelets Greeting Page</ui:define> + <ui:define name="body"> + #{msg.greeting} #{person.name}! + </ui:define> + </ui:composition> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/greeting.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/inputname.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/inputname.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/inputname.xhtml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,25 @@ +<!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"> + + <f:loadBundle basename="resources" var="msg" /> + + <ui:composition template="/templates/common.xhtml"> + + <ui:define name="pageTitle">Input User Name</ui:define> + + <ui:define name="pageHeader">Facelets Hello Application</ui:define> + + <ui:define name="body"> + <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" /> + <form jsfc="h:form" id="helloForm"> + #{msg.prompt} + <input jsfc="h:inputText" required="true" id="name" value="#{person.name}" /> + <input type="submit" jsfc="h:commandButton" id="submit" + action="greeting" value="Say Hello" /> + </form> + </ui:define> + </ui:composition> +</html> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/pages/inputname.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/templates/common.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/templates/common.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/templates/common.xhtml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,26 @@ +<!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"> + + <f:loadBundle basename="resources" var="msg" /> + <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: 12px; + } + h1 { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 16px; + } + </style> + </head> + + <body> + <h1><ui:insert name="pageHeader">Page Header</ui:insert></h1> + <p><ui:insert name="body">Page Body</ui:insert></p> + </body> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/WebContent/templates/common.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.properties 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,3 @@ +# +#Tue Jan 22 20:42:43 MSK 2008 +classpath.external= Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.xml 2008-01-22 18:26:00 UTC (rev 5887) @@ -0,0 +1,87 @@ +<project name="JsfJbide1585Test" basedir="../" default="deploy"> + + <!-- Project settings --> + <property name="project.distname" value="JsfJbide1585Test"/> + + <!-- 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"/> + + + <!-- 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.external}"/> + <pathelement path ="${classpath}"/> + </path> + + <!-- define your folder for deployment --> + <property name="deploy.dir" value="deploy"/> + + <!-- Check timestamp on files --> + <target name="prepare"> + <tstamp/> + </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> + + <!-- Normal build of application --> + <target name="compile" depends="prepare,resources"> + <javac srcdir="JavaSource" destdir="${webinf.dir}/classes"> + <classpath refid="compile.classpath"/> + </javac> + </target> + + <!-- 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 entire project --> + <target name="build" depends="prepare,compile"/> + <target name="rebuild" depends="clean,prepare,compile"/> + + <!-- 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> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/ant/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-01-22 18:04:45 UTC (rev 5886) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-01-22 18:26:00 UTC (rev 5887) @@ -1,5 +1,7 @@ package org.jboss.tools.jst.jsp.test; +import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test; + import junit.framework.Test; import junit.framework.TestSuite; @@ -7,9 +9,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test"); - //$JUnit-BEGIN$ - - //$JUnit-END$ + suite.addTestSuite(JstJspJbide1585Test.class); return suite; } Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-01-22 18:04:45 UTC (rev 5886) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-01-22 18:26:00 UTC (rev 5887) @@ -36,8 +36,8 @@ TestProjectProvider provider = null; IProject project = null; boolean makeCopy = false; - private static final String PROJECT_NAME = "Jbide1585Test"; - private static final String PAGE_NAME = "/WebContent/login.xhtml"; + private static final String PROJECT_NAME = "JsfJbide1585Test"; + private static final String PAGE_NAME = "/WebContent/pages/inputname.xhtml"; private static final String TAG_OPEN_STRING = "<"; private static final String PREFIX_STRING = "ui:in"; private static final String INSERTION_STRING = TAG_OPEN_STRING + PREFIX_STRING;