[jbosstools-commits] JBoss Tools SVN: r43701 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn: JavaSource/demo and 3 other directories.

Author: vrubezhny Date: 2012-09-14 14:18:16 -0400 (Fri, 14 Sep 2012) New Revision: 43701 Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/jsf-api-2.0.3.jar Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml Log: JBIDE-12609 NPE when validating EL which uses java.util.Map JUnit Test Case is added Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath 2012-09-14 16:31:36 UTC (rev 43700) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/.classpath 2012-09-14 18:18:16 UTC (rev 43701) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="lib" path="lib/jsf-api-2.0.3.jar"/> <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.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> @@ -8,7 +9,7 @@ <attribute name="owner.project.facets" value="jst.web"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> <attribute name="owner.project.facets" value="jst.java"/> </attributes> Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java 2012-09-14 18:18:16 UTC (rev 43701) @@ -0,0 +1,48 @@ +package demo; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; + +@ManagedBean(name="user") +@SessionScoped +public class User { + private Map<String, User> users = new HashMap<String, User>(); + private Map<String, Collection> list = new HashMap<String, Collection>(); + + private String name; + + public User() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String sayHello() { + return "greeting"; + } + + public Map<String, User> getUsers() { + return users; + } + + public void setUsers(Map<String, User> users) { + this.users = users; + } + + public Map<String, Collection> getList() { + return list; + } + + public void setList(Map<String, Collection> list) { + this.list = list; + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/JavaSource/demo/User.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml (from rev 43624, trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname.xhtml) =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/pages/inputname3.xhtml 2012-09-14 18:18:16 UTC (rev 43701) @@ -0,0 +1,37 @@ +<!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:c="http://java.sun.com/jstl/core" + xmlns:ez="http://java.sun.com/jsf/composite/demo"> + +<f:loadBundle basename="resources" var="pageMsgs" /> + +<ui:composition template="/templates/common.xhtml" + xmlns:jar="http://java.sun.com/jsf/composite/jarPage" + xmlns:jar1="http://java.sun.com/jsf/composite/jarPage1"> + <ui:param name="group" value="#{user}" /> + + <h:outputStylesheet name="stylesheet/style.css" type="text/css"/> + + <ui:define name="pageTitle">Input User Name</ui:define> + + <ui:define name="pageHeader">Facelets Hello Application</ui:define> + + <ui:define name="body"> + <ez:input id="inputname" label="${registeredMsgs.prompt}" value="#{user.name}" action="#{user.sayHello}" submitlabel="Say Hello"/> + <h:outputText value="${registeredMsgs['demo.long.named.property']}" /> + <h:outputText value="${pageMsgs.prompt}" /> + <h:outputText value="${pageMsgs['demo.long.named.property']}" /> + <div class="info"> + <form> + <jar:echo1 echo="Hello" /> + <jar:echo echo="Hello" /> + <jar:echo anknownAttr="1" echo="Hello" /> + <jar1:echo echo="Hello" /> + </form> + </div> + </ui:define> +</ui:composition> +</html> Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml 2012-09-14 16:31:36 UTC (rev 43700) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/WebContent/templates/common.xhtml 2012-09-14 18:18:16 UTC (rev 43701) @@ -27,6 +27,9 @@ </head> <body bgcolor="#ffffff"> + +<h:outputText value="#{group.users['admin'].name}" /> + <table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400"> <tbody> Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/jsf-api-2.0.3.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/JSF2CompositeOpenOn/lib/jsf-api-2.0.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream