Author: vrubezhny Date: 2011-09-08 14:13:40 -0400 (Thu, 08 Sep 2011) New Revision: 34586 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/.faces-config.xml.jsfdia trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jstl.jar trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/index.html trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/greeting.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/inputname.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/demo/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/demo/input.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/templates/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/templates/common.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ant/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ant/build.properties trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java Log: JBIDE-9633 Create JUnit tests to cover JBIDE-9515 issue JUnit Test is added for proposals filtering check Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.classpath 2011-09-08 18:13:40 UTC (rev 34586) @@ -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> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.project 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JSF2KickStartWithoutLibs</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/.jsdtscope 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.jdt.core.prefs 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,8 @@ +#Wed Sep 07 21:52:16 MSD 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.component 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="JSF2KickStartWithoutLibs"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> + <property name="context-root" value="JSF2KickStartWithoutLibs"/> + <property name="java-output-path" value="/JSF2KickStartWithoutLibs/WebContent/WEB-INF/classes"/> + </wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="jsf-user-library-provider"/> + </node> + </facet> +</root> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 6.x Runtime"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <fixed facet="jst.jsf"/> + <fixed facet="java"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="jst.jsf" version="2.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2010 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 demo; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; + +/** + * Created by JBoss Tools + */ +@ManagedBean(name="user") +@SessionScoped +public class User { + private String name; + + public User() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String sayHello() { + return "greeting"; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/demo/User.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/resources.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/resources.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/resources.properties 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/JavaSource/resources.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/META-INF/MANIFEST.MF 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/.faces-config.xml.jsfdia 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"> + <PROCESS-ITEM NAME="rules:#pages#greeting.xhtml" + PATH="/pages/greeting.xhtml" SHAPE="240,33,0,0" model-entity="JSFProcessGroup"/> + <PROCESS-ITEM NAME="rules:#pages#inputname.xhtml" + PATH="/pages/inputname.xhtml" SHAPE="32,17,0,0" model-entity="JSFProcessGroup"> + <PROCESS-ITEM ID="rules:#pages#inputname.xhtml:0" NAME="item" + PATH="/pages/inputname.xhtml" model-entity="JSFProcessItem"> + <PROCESS-ITEM-OUTPUT ID="greeting::#pages#greeting.xhtml" + NAME="output" PATH="/pages/greeting.xhtml" + TARGET="rules:#pages#greeting.xhtml" TITLE="greeting" model-entity="JSFProcessItemOutput"/> + </PROCESS-ITEM> + </PROCESS-ITEM> +</PROCESS> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/faces-config.xml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> + + <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> + <resource-bundle> + <base-name>resources</base-name> + <var>msgs</var> + </resource-bundle> + </application> +</faces-config> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/web.xml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0"> + <display-name>JSF2KickStartWithoutLibs</display-name> + <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> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>default.html</welcome-file> + <welcome-file>default.htm</welcome-file> + <welcome-file>default.jsp</welcome-file> + </welcome-file-list> + <context-param> + <description>State saving method: 'client' or 'server' (=default). See JSF Specification 2.5.2</description> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <context-param> + <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name> + <param-value>resources.application</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> +</web-app> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/index.html =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/index.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/index.html 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1 @@ +<html><head><meta http-equiv="Refresh" content="0; URL=pages/inputname.jsf"/></head></html> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/index.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/greeting.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/greeting.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/greeting.xhtml 2011-09-08 18:13:40 UTC (rev 34586) @@ -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="/templates/common.xhtml"> + <ui:define name="pageTitle">Greeting to User</ui:define> + <ui:define name="pageHeader">Greeting Page</ui:define> + <ui:define name="body"> + #{msgs.greeting} #{user.name}! + </ui:define> + </ui:composition> +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/greeting.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/inputname.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/inputname.xhtml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,19 @@ +<!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:ez="http://java.sun.com/jsf/composite/demo"> + + <ui:composition template="/templates/common.xhtml"> + + <ui:define name="pageTitle">Input User Name</ui:define> + + <ui:define name="pageHeader">JSF 2 Hello Application</ui:define> + + <ui:define name="body"> + <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="inputname" /> + <ez:input id="inputname" label="${msgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/> + </ui:define> + </ui:composition> +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/pages/inputname.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/demo/input.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/demo/input.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/demo/input.xhtml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:composite="http://java.sun.com/jsf/composite"> + + <composite:interface> + <composite:attribute name="label"/> + <composite:attribute name="value" required="true"/> + <composite:attribute name="action" required="true" method-signature="java.lang.String f()"/> + <composite:attribute name="submitlabel"/> + </composite:interface> + + <composite:implementation> + <h:form> + <h:outputText value="#{cc.attrs.label}" /> + <h:inputText value="#{cc.attrs.value}" /> + <h:commandButton action="#{cc.attrs.action}" value="#{cc.attrs.submitlabel}" /> + </h:form> + </composite:implementation> +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/resources/demo/input.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/templates/common.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/templates/common.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/templates/common.xhtml 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,64 @@ +<!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 Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/WebContent/templates/common.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ant/build.properties =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ant/build.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ant/build.properties 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,3 @@ +# +#Wed Sep 07 21:52:15 MSD 2011 +classpath.external= Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2KickStartWithoutLibs/ant/build.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java 2011-09-08 18:13:40 UTC (rev 34586) @@ -0,0 +1,90 @@ +package org.jboss.tools.jsf.jsp.ca.test; + +import java.util.List; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.jboss.tools.common.base.test.contentassist.CATestUtil; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; +import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ProjectImportTestSetup; + +public class CAJsfMessagesProposalsFilteringTest extends ContentAssistantTestCase { + private static final String PROJECT_NAME = "JSF2KickStartWithoutLibs"; + private static final String PAGE_NAME = "WebContent/pages/inputname.xhtml"; + + private static final String TAG_ATTRIBUTE_COMMON_PREFIX = "value=\"#{"; + private static final String TAG_ATTRIBUTE_USER_PREFIX = "value=\"#{us"; + private static final String TAG_ATTRIBUTE_MSGS_PREFIX = "label=\"${ms"; + + private static final String[] PROPOSAL_TO_COMPARE_COMMON = {"user : User", "msgs"}; + private static final String[] PROPOSAL_TO_COMPARE_USER_STRING = {"user : User"}; + private static final String[] PROPOSAL_TO_COMPARE_MSGS_STRING = {"msgs"}; + + public void setUp() throws Exception { + project = ProjectImportTestSetup.loadProject(PROJECT_NAME); + project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); + } + + public static Test suite() { + return new TestSuite(CADefaultELStartingCharTest.class); + } + + private void doTestCAJsfMessagesFilteringTest(String pageName, String attrPrefix, String[] correctProposals, String[] wrongProposals) { + String documentContent = document.get(); + int start = (documentContent == null ? -1 : documentContent.indexOf(attrPrefix)); + assertFalse("Required node '" + attrPrefix + "' not found in document", (start == -1)); + int offsetToTest = start + attrPrefix.length(); + + JobUtils.waitForIdle(); + + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + + assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); + + for (String correct : correctProposals) { + assertTrue("Proposal '" + correct +"' not found, but it should be amoung the proposals!", proposalExists(correct, res)); + } + for (String wrong : wrongProposals) { + assertFalse("Proposal '" + wrong +"' found, but it should not be amoung the proposals!", proposalExists(wrong, res)); + } + } + + private boolean proposalExists(String proposal, List<ICompletionProposal> proposals) { + for (ICompletionProposal p : proposals) { + if (!(p instanceof AutoContentAssistantProposal)) + continue; + AutoContentAssistantProposal existingProposal = (AutoContentAssistantProposal)p; + String proposalString = existingProposal.getDisplayString(); + + if (proposal.equals(proposalString)) { + return true; + } + } + return false; + } + + public void testCAJsfMessagesFiltering() { + assertNotNull("Test project '" + PROJECT_NAME + "' is not prepared", project); + + openEditor(PAGE_NAME); + try { + // Test common case were both, "user" and "msgs" proposals should exist + doTestCAJsfMessagesFilteringTest(PAGE_NAME, TAG_ATTRIBUTE_COMMON_PREFIX, PROPOSAL_TO_COMPARE_COMMON, new String[0]); + + // Test user case were the only "user" proposal should exist + doTestCAJsfMessagesFilteringTest(PAGE_NAME, TAG_ATTRIBUTE_USER_PREFIX, PROPOSAL_TO_COMPARE_USER_STRING, PROPOSAL_TO_COMPARE_MSGS_STRING); + + // Test user case were the only "msgs" proposal should exist + doTestCAJsfMessagesFilteringTest(PAGE_NAME, TAG_ATTRIBUTE_MSGS_PREFIX, PROPOSAL_TO_COMPARE_MSGS_STRING, PROPOSAL_TO_COMPARE_USER_STRING); + } finally { + closeEditor(); + } + } +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfMessagesProposalsFilteringTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-09-08 16:30:53 UTC (rev 34585) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-09-08 18:13:40 UTC (rev 34586) @@ -24,6 +24,7 @@ import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansInJavaTest; import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansTest; import org.jboss.tools.jsf.jsp.ca.test.CAForUnclosedELTest; +import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsFilteringTest; import org.jboss.tools.jsf.jsp.ca.test.CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test; import org.jboss.tools.jsf.jsp.ca.test.CASuggestsNotOnlyELProposalsJBIDE2437Test; import org.jboss.tools.jsf.jsp.ca.test.CAUnnecessaryElementsForDirAttributeInXHTMLPageJBIDE1813Test; @@ -118,8 +119,13 @@ suite.addTest(new ProjectImportTestSetup(new TestSuite( CADefaultELStartingCharTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$ new String[] { "projects/JsfJbide1704Test", }, //$NON-NLS-1$ - new String[] { "CAForCompositeComponentTest" })); //$NON-NLS-1$ + new String[] { "JsfJbide1704Test" })); //$NON-NLS-1$ + suite.addTest(new ProjectImportTestSetup(new TestSuite( + CAJsfMessagesProposalsFilteringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ + new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ + new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ + // return new TestWizardsProject(suite); return suite; }