October 2010 - jbosstools-commits

JBoss Tools SVN: r26112 - in workspace/mareshkau: rf4.0 and 38 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-10-28 15:24:00 -0400 (Thu, 28 Oct 2010) New Revision: 26112 Added: workspace/mareshkau/rf4.0/ workspace/mareshkau/rf4.0/.classpath workspace/mareshkau/rf4.0/.project workspace/mareshkau/rf4.0/.settings/ workspace/mareshkau/rf4.0/.settings/.jsdtscope workspace/mareshkau/rf4.0/.settings/org.eclipse.jdt.core.prefs workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.component workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.xml workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.container workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.name workspace/mareshkau/rf4.0/JavaSource/ workspace/mareshkau/rf4.0/JavaSource/demo/ workspace/mareshkau/rf4.0/JavaSource/demo/User.java workspace/mareshkau/rf4.0/JavaSource/resources.properties workspace/mareshkau/rf4.0/WebContent/ workspace/mareshkau/rf4.0/WebContent/META-INF/ workspace/mareshkau/rf4.0/WebContent/META-INF/MANIFEST.MF workspace/mareshkau/rf4.0/WebContent/WEB-INF/ workspace/mareshkau/rf4.0/WebContent/WEB-INF/.faces-config.xml.jsfdia workspace/mareshkau/rf4.0/WebContent/WEB-INF/faces-config.xml workspace/mareshkau/rf4.0/WebContent/WEB-INF/lib/ workspace/mareshkau/rf4.0/WebContent/WEB-INF/web.xml workspace/mareshkau/rf4.0/WebContent/a4j-core.xhtml workspace/mareshkau/rf4.0/WebContent/images/ workspace/mareshkau/rf4.0/WebContent/images/ai.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/ workspace/mareshkau/rf4.0/WebContent/images/capitals/alabama.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/alaska.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/arizona.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/arkansas.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/california.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/colorado.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/connecticut.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/delaware.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/florida.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/georgia.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/hawaii.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/idaho.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/illinois.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/indiana.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/iowa.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/kansas.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/kentucky.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/louisiana.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/maine.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/maryland.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/massachusetts.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/michigan.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/minnesota.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/mississippi.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/missouri.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/montana.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/nebraska.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/nevada.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/newhampshire.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/newjersey.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/newmexico.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/newyork.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/northcarolina.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/northdakota.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/ohio.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/oklahoma.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/oregon.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/pennsylvania.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/rhodeisland.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/southcarolina.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/southdakota.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/tennessee.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/texas.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/utah.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/vermont.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/virginia.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/washington.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/westvirginia.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/wisconsin.gif workspace/mareshkau/rf4.0/WebContent/images/capitals/wyoming.gif workspace/mareshkau/rf4.0/WebContent/images/icons/ workspace/mareshkau/rf4.0/WebContent/images/icons/common/ workspace/mareshkau/rf4.0/WebContent/images/icons/common/rf.png workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/ workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/arr_left.png workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/arr_right.png workspace/mareshkau/rf4.0/WebContent/images/nature/ workspace/mareshkau/rf4.0/WebContent/images/nature/pic1.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic2.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic3.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic4.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic5.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic6.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic7.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic8.jpg workspace/mareshkau/rf4.0/WebContent/images/nature/pic9.jpg workspace/mareshkau/rf4.0/WebContent/images/note_bg.gif workspace/mareshkau/rf4.0/WebContent/images/richfaces-banner.png workspace/mareshkau/rf4.0/WebContent/index.html workspace/mareshkau/rf4.0/WebContent/pages/ workspace/mareshkau/rf4.0/WebContent/pages/greeting.xhtml workspace/mareshkau/rf4.0/WebContent/pages/inputname.xhtml workspace/mareshkau/rf4.0/WebContent/resources/ workspace/mareshkau/rf4.0/WebContent/resources/demo/ workspace/mareshkau/rf4.0/WebContent/resources/demo/input.xhtml workspace/mareshkau/rf4.0/WebContent/rich-functions.xhtml workspace/mareshkau/rf4.0/WebContent/rich-input.xhtml workspace/mareshkau/rf4.0/WebContent/rich-iteration.xhtml workspace/mareshkau/rf4.0/WebContent/rich-miscellaneous.xhtml workspace/mareshkau/rf4.0/WebContent/rich-output.xhtml workspace/mareshkau/rf4.0/WebContent/rich-validation.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/ workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/ workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/samples/simple-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/simple.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/ajax/ workspace/mareshkau/rf4.0/WebContent/richfaces/ajax/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/ajax/samples/simple-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/ workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/cachedAjax.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/cachedAjax-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/simpleAjax-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/simpleAjax.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/ workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/samples/simple-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/simple.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/ workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/dataScrollerAPI.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/simpleScrolling.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/list/ workspace/mareshkau/rf4.0/WebContent/richfaces/list/lists.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/list/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/list/samples/lists-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/popup/ workspace/mareshkau/rf4.0/WebContent/richfaces/popup/modalPopup.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/modalPopup-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/simplePopup-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/popup/simplePopup.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/select/ workspace/mareshkau/rf4.0/WebContent/richfaces/select/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/select/samples/select-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/select/select.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/ workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/subTableToggleControl.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/ workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/samples/ workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/samples/simple-sample.xhtml workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/simple.xhtml workspace/mareshkau/rf4.0/WebContent/templates/ workspace/mareshkau/rf4.0/WebContent/templates/common.xhtml workspace/mareshkau/rf4.0/ant/ workspace/mareshkau/rf4.0/ant/build.properties Log: JBIDE-7434, RichFaces4 test project Added: workspace/mareshkau/rf4.0/.classpath =================================================================== --- workspace/mareshkau/rf4.0/.classpath (rev 0) +++ workspace/mareshkau/rf4.0/.classpath 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,17 @@ +<?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.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"> + <attributes> + <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/java-6-sun-1.6.0.20"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Added: workspace/mareshkau/rf4.0/.project =================================================================== --- workspace/mareshkau/rf4.0/.project (rev 0) +++ workspace/mareshkau/rf4.0/.project 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>rf4.0</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.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</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.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> + <linkedResources> + <link> + <name>lib</name> + <type>2</type> + <location>/home/mareshkau/Projects/jboss/runtime-Test_Development/rf4.0/WebContent/WEB-INF/lib</location> + </link> + </linkedResources> +</projectDescription> Added: workspace/mareshkau/rf4.0/.settings/.jsdtscope =================================================================== --- workspace/mareshkau/rf4.0/.settings/.jsdtscope (rev 0) +++ workspace/mareshkau/rf4.0/.settings/.jsdtscope 2010-10-28 19:24:00 UTC (rev 26112) @@ -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: workspace/mareshkau/rf4.0/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/mareshkau/rf4.0/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/mareshkau/rf4.0/.settings/org.eclipse.jdt.core.prefs 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,8 @@ +#Thu Oct 28 19:36:13 EEST 2010 +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 Added: workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.component =================================================================== --- workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.component (rev 0) +++ workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.component 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="rf4.0"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> + <property name="context-root" value="rf4.0"/> + <property name="java-output-path" value="/rf4.0/WebContent/WEB-INF/classes"/> + </wb-module> +</project-modules> Added: workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="jsf-user-library-provider"/> + </node> + </facet> +</root> Added: workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="Apache Tomcat v6.0"/> + <fixed facet="jst.jsf"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="2.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Added: workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ workspace/mareshkau/rf4.0/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: workspace/mareshkau/rf4.0/JavaSource/demo/User.java =================================================================== --- workspace/mareshkau/rf4.0/JavaSource/demo/User.java (rev 0) +++ workspace/mareshkau/rf4.0/JavaSource/demo/User.java 2010-10-28 19:24:00 UTC (rev 26112) @@ -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 Added: workspace/mareshkau/rf4.0/JavaSource/resources.properties =================================================================== --- workspace/mareshkau/rf4.0/JavaSource/resources.properties (rev 0) +++ workspace/mareshkau/rf4.0/JavaSource/resources.properties 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Added: workspace/mareshkau/rf4.0/WebContent/META-INF/MANIFEST.MF =================================================================== --- workspace/mareshkau/rf4.0/WebContent/META-INF/MANIFEST.MF (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/META-INF/MANIFEST.MF 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: workspace/mareshkau/rf4.0/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- workspace/mareshkau/rf4.0/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/WEB-INF/.faces-config.xml.jsfdia 2010-10-28 19:24:00 UTC (rev 26112) @@ -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: workspace/mareshkau/rf4.0/WebContent/WEB-INF/faces-config.xml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/WEB-INF/faces-config.xml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/WEB-INF/faces-config.xml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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 Added: workspace/mareshkau/rf4.0/WebContent/WEB-INF/web.xml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/WEB-INF/web.xml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/WEB-INF/web.xml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,22 @@ +<?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_2_5.xsd" version="2.5"> + <display-name>rf4.0</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> + <url-pattern>/faces/*</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> +</web-app> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/a4j-core.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/a4j-core.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/a4j-core.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,24 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<a4j:actionListener /> +<a4j:ajax /> +<a4j:attachQueue /> +<a4j:commandButton /> +<a4j:commandLink /> +<a4j:jsFunction /> +<a4j:log /> +<a4j:mediaOutput /> +<a4j:outputPanel /> +<a4j:param /> +<a4j:poll /> +<a4j:push /> +<a4j:queue /> +<a4j:repeat /> +<a4j:region /> +<a4j:status /> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/images/ai.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/ai.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/alabama.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/alabama.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/alaska.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/alaska.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/arizona.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/arizona.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/arkansas.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/arkansas.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/california.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/california.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/colorado.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/colorado.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/connecticut.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/connecticut.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/delaware.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/delaware.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/florida.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/florida.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/georgia.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/georgia.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/hawaii.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/hawaii.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/idaho.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/idaho.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/illinois.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/illinois.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/indiana.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/indiana.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/iowa.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/iowa.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/kansas.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/kansas.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/kentucky.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/kentucky.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/louisiana.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/louisiana.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/maine.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/maine.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/maryland.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/maryland.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/massachusetts.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/massachusetts.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/michigan.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/michigan.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/minnesota.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/minnesota.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/mississippi.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/mississippi.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/missouri.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/missouri.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/montana.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/montana.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/nebraska.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/nebraska.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/nevada.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/nevada.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/newhampshire.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/newhampshire.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/newjersey.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/newjersey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/newmexico.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/newmexico.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/newyork.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/newyork.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/northcarolina.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/northcarolina.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/northdakota.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/northdakota.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/ohio.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/ohio.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/oklahoma.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/oklahoma.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/oregon.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/oregon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/pennsylvania.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/pennsylvania.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/rhodeisland.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/rhodeisland.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/southcarolina.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/southcarolina.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/southdakota.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/southdakota.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/tennessee.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/tennessee.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/texas.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/texas.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/utah.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/utah.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/vermont.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/vermont.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/virginia.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/virginia.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/washington.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/washington.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/westvirginia.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/westvirginia.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/wisconsin.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/wisconsin.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/capitals/wyoming.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/capitals/wyoming.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/icons/common/rf.png =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/icons/common/rf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/arr_left.png =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/arr_left.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/arr_right.png =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/icons/scroller/arr_right.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic1.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic1.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic2.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic2.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic3.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic3.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic4.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic4.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic5.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic5.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic6.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic6.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic7.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic7.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic8.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic8.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/nature/pic9.jpg =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/nature/pic9.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/note_bg.gif =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/note_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/images/richfaces-banner.png =================================================================== (Binary files differ) Property changes on: workspace/mareshkau/rf4.0/WebContent/images/richfaces-banner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/mareshkau/rf4.0/WebContent/index.html =================================================================== --- workspace/mareshkau/rf4.0/WebContent/index.html (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/index.html 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1 @@ +<html><head><meta http-equiv="Refresh" content="0; URL=pages/inputname.jsf"/></head></html> Added: workspace/mareshkau/rf4.0/WebContent/pages/greeting.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/pages/greeting.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/pages/greeting.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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 Added: workspace/mareshkau/rf4.0/WebContent/pages/inputname.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/pages/inputname.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/pages/inputname.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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 Added: workspace/mareshkau/rf4.0/WebContent/resources/demo/input.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/resources/demo/input.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/resources/demo/input.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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 Added: workspace/mareshkau/rf4.0/WebContent/rich-functions.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/rich-functions.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/rich-functions.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<rich:clientId /> +<rich:component /> +<rich:element /> +<rich:findComponent /> +<rich:isUserInRole /> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/rich-input.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/rich-input.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/rich-input.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,16 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<rich:autocomplete /> +<rich:calendar /> +<rich:fileUpload /> +<rich:inplaceInput /> +<rich:inputNumberSlider /> +<rich:inputNumberSpinner /> +<rich:inplaceSelect /> +<rich:select /> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/rich-iteration.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/rich-iteration.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/rich-iteration.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,23 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<rich:dataScroller /> +<rich:dataTable /> +<rich:columnGroup /> +<rich:column /> +<rich:collapsibleSubtable /> +<rich:collapsibleSubtableToggleControl/> +<rich:extendedDataTable /> +<rich:dataGrid /> +<rich:list /> +<rich:tree /> +<rich:treeNode/> +<rich:treeAdapter/> +<rich:recursiveTreeAdapter/> +<rich:treeToggleListener /> +<rich:treeSelectionListener/> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/rich-miscellaneous.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/rich-miscellaneous.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/rich-miscellaneous.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<rich:componentControl /> +<rich:dragSupport /> +<rich:dndParameter /> +<rich:dropSupport /> +<rich:dndParameter /> +<rich:dragIndicator /> +<rich:hashParam /> +<rich:hotkey /> +<rich:jQuery /> +<rich:listShuttle /> +<rich:orderingList /> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/rich-output.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/rich-output.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/rich-output.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,37 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<rich:accordion /> +<rich:accordionItem/> +<rich:collapsiblePanel/> +<rich:contextMenu /> +<rich:menuItem /> +<rich:menuGroup /> +<rich:menuSeparator/> +<rich:dropDownMenu /> +<rich:menuItem /> +<rich:menuGroup /> +<rich:menuSeparator/> +<rich:message /> +<rich:messages /> +<rich:panelMenu /> +<rich:panelMenuGroup/> +<rich:panelMenuItem /> +<rich:panel /> +<rich:popupPanel/> +<rich:progressBar /> +<rich:tabPanel /> +<rich:tab /> +<rich:itemChangeListener/> +<rich:togglePanel /> +<rich:togglePanelItem /> +<rich:toggleControl /> +<rich:toolbar /> +<rich:toolbarGroup/> +<rich:toolbarSeparator /> +<rich:tooltip /> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/rich-validation.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/rich-validation.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/rich-validation.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,10 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> +<rich:clientValidator /> +<rich:graphValidator /> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/samples/simple-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/samples/simple-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/samples/simple-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,55 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.rf-ac{ + width: 500px; +} +.rf-ac-itm-c { + height: 220px; +} +</style> + <h:form> + <rich:accordion> + <rich:accordionItem header="Overview:"> + <h:graphicImage value="/images/icons/common/rf.png" + style="float:right" /> + RichFaces is a component library for JSF and an advanced framework for + easily integrating AJAX capabilities into business applications. + <ul> + <li>100+ AJAX enabled components in two libraries</li> + <li>a4j: page centric AJAX controls</li> + <li>rich: self contained, ready to use components</li> + <li>Whole set of JSF benefits while working with AJAX</li> + <li>Skinnability mechanism</li> + <li>Component Development Kit (CDK)</li> + <li>Dynamic resources handling</li> + <li>Testing facilities for components, actions, listeners, and + pages</li> + <li>Broad cross-browser support</li> + <li>Large and active community</li> + </ul> + </rich:accordionItem> + <rich:accordionItem header="JSF 2 and RichFaces 4:"> + We are working hard on RichFaces 4.0 which will have full JSF + 2 integration. That is not all though, here is a summary of updates + and features: + <ul> + <li>Redesigned modular repository and build system.</li> + <li>Simplified Component Development Kit with annotations, + faces-config extensions, advanced templates support and more..</li> + <li>Ajax framework improvements extending the JSF 2 + specification.</li> + <li>Component review for consistency, usability, and redesign + following semantic HTML principles where possible.</li> + <li>Both server-side and client-side performance optimization.</li> + <li>Strict code clean-up and review.</li> + </ul> + </rich:accordionItem> + </rich:accordion> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/simple.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/simple.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/accordion/simple.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + The Accordion (panelBar from 3.3.x) is a set of panels when one panel is expanded, + but other ones are collapsed. + + Main addition to previous 3.3.x functionality - accordion in 4.x was finally added with + different switching switchType's. So as all the switchable panels it could be used with next modes - + "client", "ajax" and "server". + + The following demo shows the simple example of usage for the Accordion in client mode: + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/ajax/samples/simple-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/ajax/samples/simple-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/ajax/samples/simple-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,33 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:panel id="psnel"> + <f:facet name="header"> + <h:outputText value="Panel with status" /> + </f:facet> + <h:panelGrid columns="2"> + <h:panelGrid columns="2"> + <a4j:ajax event="keyup"> + <h:outputText value="User name:" /> + <h:inputText value="#{userBean.name}" /> + <h:outputText value="Adress:" /> + <h:inputText value="#{userBean.address}" /> + </a4j:ajax> + </h:panelGrid> + <a4j:status> + <f:facet name="start"> + <h:graphicImage value="/images/ai.gif" /> + </f:facet> + </a4j:status> + </h:panelGrid> + <a4j:commandButton value="Submit" type="button" + action="#{userBean.store}" render="out" execute="@form" /> + <h:outputText value="#{userBean.recordStatus}" id="out" /> + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/cachedAjax.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/cachedAjax.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/cachedAjax.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + Autocomplete component - simple Input component which provides suggestions during input. + Could works using three modes: + <ul> + <li>Client - preloads data to the client side and makes suggestions according to entered prefix on the client</li> + <li>Ajax - fetches the data on every input change using ajax requests</li> + <li>Cached Ajax - loads data via ajax to make suggestions when the prefix length satisfies minchars attribute. Then all the suggestions done at client side except the case when initial prefix changed or token entered. Then loads data again.</li> + </ul> + + Here is the sample for new cachedAjax mode. + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/cachedAjax-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/cachedAjax-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/cachedAjax-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,32 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + Default autocomplete in cachedAjax mode + <h:form> + <rich:autocomplete mode="cachedAjax" + autocompleteMethod="#{autocompleteBean.autocomplete}" /> + </h:form> + Autocomplete without direct suggestions to input(autoFill="false"). Also in the sample comma and space are input tokens, so separate + autocompletion requests will be fired for different parts in input + <h:form> + <rich:autocomplete mode="cachedAjax" tokens=", " autofill="false" + autocompleteMethod="#{autocompleteBean.autocomplete}" /> + </h:form> + In that sample selectFirst set to false so pressing enter will not choose the value from list + but just submit currently entered value. + <h:form> + <rich:autocomplete mode="cachedAjax" tokens=", " autoFill="false" selectFirst="false" + autocompleteMethod="#{autocompleteBean.autocomplete}" /> + </h:form> + <fieldset> + <legend>NOTE: </legend> + The developer has full control under filtering on server side according to prefix. + But in client and cachedAjax modes - just built-in startWith method used. In near future + the component will be updated with one more attribute which will allow the developer + to define client side comparator function to customize that behavior. + </fieldset> +</ui:composition> Added: workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/simpleAjax-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/simpleAjax-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/samples/simpleAjax-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.outhello { + font-weight: bold; +} +</style> + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Name:" /> + <h:inputText value="#{userBean.name}" /> + <a4j:commandButton value="Say Hello" render="out" execute="@form" /> + </h:panelGrid> + </h:form> + + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name} !" + rendered="#{not empty userBean.name}" styleClass="outhello" /> + </a4j:outputPanel> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/simpleAjax.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/simpleAjax.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/autocomplete/simpleAjax.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + Autocomplete component - simple Input component which provides suggestions during input. + Could works using three modes: + <ul> + <li>Client - preloads data to the client side and makes suggestions according to entered prefix on the client</li> + <li>Ajax - fetches the data on every input change using ajax requests</li> + <li>Cached Ajax - loads data via ajax to make suggestions when the prefix length satisfies minchars attribute. Then all the suggestions done at client side except the case when initial prefix changed or token entered. Then loads data again.</li> + </ul> + + There you could see simple client side autocomplete: + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/samples/simple-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/samples/simple-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/samples/simple-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,51 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + Here is simple panel in client mode: + + <rich:collapsiblePanel header="Overview" switchType="client"> + <h:graphicImage value="/images/icons/common/rf.png" + style="float:right" /> + RichFaces is a component library for JSF and an advanced framework for + easily integrating AJAX capabilities into business applications. + <ul> + <li>100+ AJAX enabled components in two libraries</li> + <li>a4j: page centric AJAX controls</li> + <li>rich: self contained, ready to use components</li> + <li>Whole set of JSF benefits while working with AJAX</li> + <li>Skinnability mechanism</li> + <li>Component Development Kit (CDK)</li> + <li>Dynamic resources handling</li> + <li>Testing facilities for components, actions, listeners, and + pages</li> + <li>Broad cross-browser support</li> + <li>Large and active community</li> + </ul> + </rich:collapsiblePanel> + + And that panel switched by ajax and closed by default: + + <rich:collapsiblePanel header="JSF 2 and RichFaces 4" expanded="false" + switchType="ajax"> + We are working hard on RichFaces 4.0 which will have full JSF + 2 integration. That is not all though, here is a summary of updates + and features: + <ul> + <li>Redesigned modular repository and build system.</li> + <li>Simplified Component Development Kit with annotations, + faces-config extensions, advanced templates support and more..</li> + <li>Ajax framework improvements extending the JSF 2 + specification.</li> + <li>Component review for consistency, usability, and redesign + following semantic HTML principles where possible.</li> + <li>Both server-side and client-side performance optimization.</li> + <li>Strict code clean-up and review.</li> + </ul> + </rich:collapsiblePanel> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/simple.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/simple.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/collapsiblePanel/simple.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + collapsiblePanel representation is fully analogous to simple + rich:panel component. Additionally that component could be toggled + between two representations. In collapsed state only header shown and + in expanded state there is complete panel. + As most of switchable components it has three switch types for + switching between states - ajax, server and client + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + In ajax and server mode PanelToggleEvent queued and could be handled + using Listener defined via toggleListener attribute +</ui:composition> +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/dataScrollerAPI.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/dataScrollerAPI.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,28 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + dataScroller provides cliens side API functions in order to + provide control from your JavaScript custom handlers. List of api + methods: + <ul style="font-style: italic"> + <li>next</li> + <li>previous</li> + <li>first</li> + <li>last</li> + </ul> + This simple sample shows how the scroller could be controlled + via API from external controls(arrows images) + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.calign { + text-align: center; +} +</style> + <h:form id="form"> + <h:panelGrid columns="1" rowClasses="calign"> + <h:panelGrid columns="3" id="repeat"> + <h:graphicImage value="/images/icons/scroller/arr_left.png" + onclick="#{rich:component('ds')}.previous()" /> + <a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic" + id="pics"> + <h:graphicImage value="#{pic.uri}" style="padding:5px;" /> + </a4j:repeat> + <h:graphicImage value="/images/icons/scroller/arr_right.png" + onclick="#{rich:component('ds')}.next()" /> + </h:panelGrid> + <rich:dataScroller for="pics" id="ds" render="repeat" + stepControls="none" boundaryControls="none" fastControls="none" + maxPages="10" /> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,45 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <rich:dataScroller for="table" maxPages="6" /> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="10"> + <rich:column accept="#{carsFiteringBean.acceptVendor}"> + <f:facet name="header"> + <h:outputText value="Vendor " /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="VIN " /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + </rich:dataTable> + <rich:dataScroller for="table" maxPages="6" /> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/simpleScrolling.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/simpleScrolling.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/dataScroller/simpleScrolling.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,22 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + dataScroller component provided in order to implement Ajax + pagination for data iteration components. + Starting from 4.x version - no more additional updated should be + defined by end-developer in order to synchronize different + dataScrollers attached to the same table as in example below. + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/list/lists.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/list/lists.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/list/lists.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,22 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + rich:list component allows to build one of the HTML lists + (UL, OL, DL) dynamically from backend data + It accepts the same data types as the other iteration components + and renders them according to type attribute. + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + +</ui:composition> +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/list/samples/lists-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/list/samples/lists-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/list/samples/lists-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,40 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <h:outputText value="List Type: " style="font-weight:bold" /> + <a4j:commandLink value="ordered" render="list,form"> + <a4j:param name="t" value="ordered" assignTo="#{listBean.listType}" /> + <f:attribute name="style" + value="#{(listBean.listType=='ordered') ? 'color:orange' : ''}" /> + </a4j:commandLink> + <h:outputText value=" | " /> + <a4j:commandLink value="unordered" render="list,form"> + <a4j:param name="t" value="unordered" assignTo="#{listBean.listType}" /> + <f:attribute name="style" + value="#{(listBean.listType=='unordered') ? 'color:orange' : ''}" /> + </a4j:commandLink> + <h:outputText value=" | " /> + <a4j:commandLink value="definitions" render="list,form"> + <a4j:param name="t" value="definitions" + assignTo="#{listBean.listType}" /> + <f:attribute name="style" + value="#{(listBean.listType=='definitions') ? 'color:orange' : ''}" /> + </a4j:commandLink> + </h:form> + + <rich:list value="#{carsBean.inventoryVendorLists}" id="list" + var="vendorList" type="#{listBean.listType}"> + <f:facet name="term"> + <h:panelGroup layout="block"> + <h:outputText value="In stock: #{vendorList.count}" + style="font-weight:bold" /> + </h:panelGroup> + </f:facet> + <h:outputText value="#{vendorList.vendor}" /> + </rich:list> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/popup/modalPopup.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/popup/modalPopup.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/popup/modalPopup.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,22 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + There you could check the modal panel which blocks the main + screen for any operations defined by using popupPanel component + with modal="true" + In that sample the panel also defined as resizable so you could + change its sizes using mouse + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/modalPopup-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/modalPopup-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/modalPopup-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,27 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:commandButton value="Call the popup"> + <rich:componentControl target="popup" operation="show" /> + </h:commandButton> + <rich:popupPanel id="popup" modal="true" resizeable="true" + onmaskclick="#{rich:component('popup')}.hide()"> + <f:facet name="header"> + <h:outputText value="Simple popup panel" /> + </f:facet> + <f:facet name="controls"> + <h:outputLink value="#" + onclick="#{rich:component('popup')}.hide(); return false;"> + X + </h:outputLink> + </f:facet> + Additionally there you could check how to handle the clicks + outside the panel. + In this sample the click outside - closes the panel as well as + clicking hide control in the header + </rich:popupPanel> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/simplePopup-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/simplePopup-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/popup/samples/simplePopup-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:commandButton value="Call the popup"> + <rich:componentControl target="popup" operation="show" /> + </h:commandButton> + <rich:popupPanel id="popup" modal="false" autosized="true" + resizeable="false"> + <f:facet name="header"> + <h:outputText value="Simple popup panel" /> + </f:facet> + <f:facet name="controls"> + <h:outputLink value="#" + onclick="#{rich:component('popup')}.hide(); return false;"> + X + </h:outputLink> + </f:facet> + Any content might be inside the panel. + Consider inclusion of the form elements into the popup or + redefinition of domElementAttachment attribute. + The popup panel is open and closed from the javascript function + of component client side object. The following code <a href="#" + onclick="#{rich:component('popup')}.hide()">hide this panel</a>: <f:verbatim>#</f:verbatim>{rich:component('popup')}.hide() + </rich:popupPanel> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/popup/simplePopup.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/popup/simplePopup.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/popup/simplePopup.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,35 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + Popup panel component used to create any kind of popups on the page. + Main features: + <ul> + <li>Has two states modal and non-modal</li> + <li>Could be defined as resizable</li> + <li>Could be autosized according to content</li> + <li>Could be moved across the screen</li> + <li>Could be automatically positioned as centered or use user defined position</li> + </ul> + This sample shows simple non-modal popup which are movable but not resizable + as defined to use autosizing according to it's content + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + + Besides this sample shows two variants of working with the component JS API: + <ul> + <li>The popup is called by the rich:componentControl attached to button</li> + <li>The popup is closed by simple JS calls which defined using rich:component function</li> + </ul> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/select/samples/select-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/select/samples/select-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/select/samples/select-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,23 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + DESC + <rich:panel style="width:220px;"> + <f:facet name="header"> + <h:outputText value="Simples select"></h:outputText> + </f:facet> + <rich:select> + <f:selectItem itemValue="0" itemLabel="Option 1" /> + <f:selectItem itemValue="1" itemLabel="Option 2" /> + <f:selectItem itemValue="2" itemLabel="Option 3" /> + <f:selectItem itemValue="3" itemLabel="Option 4" /> + <f:selectItem itemValue="4" itemLabel="Option 5" /> + </rich:select> + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/select/select.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/select/select.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/select/select.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + DESC + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,65 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list"> + <f:facet name="header"> + <rich:columnGroup> + <rich:column colspan="6"> + <h:outputText value="Cars marketplace" /> + </rich:column> + <rich:column breakRowBefore="true"> + <h:outputText value="Model" /> + </rich:column> + <rich:column> + <h:outputText value="Price" /> + </rich:column> + <rich:column> + <h:outputText value="Mileage" /> + </rich:column> + <rich:column> + <h:outputText value="VIN Code" /> + </rich:column> + <rich:column> + <h:outputText value="Items stock" /> + </rich:column> + <rich:column> + <h:outputText value="Days Live" /> + </rich:column> + </rich:columnGroup> + </f:facet> + <rich:column colspan="6"> + <rich:subTableToggleControl for="sbtbl" /> + <h:outputText value="#{list.vendor}" /> + </rich:column> + <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl" + expandMode="client"> + <rich:column> + <h:outputText value="#{item.model}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.price}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.mileage}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.vin}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.stock}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.daysLive}" /> + </rich:column> + <f:facet name="footer"> + <h:outputText value="Total of #{list.vendor} Cars: #{list.count}" /> + </f:facet> + </rich:subTable> + </rich:dataTable> + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/subTableToggleControl.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/subTableToggleControl.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,28 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + This sample shows simple master-detail table implemented using + rich:dataTable and rich:subtable components + There is one feature which is completely new for 4.x - subtables + now could be collapsed/expanded by using new component rich:subTableToggleControl + Switching customization: + <ul> + <li>subTable's could be collapsed/expanded in different modes + defined via subTable expandMode attribute - "client", "ajax" + and "server"</li> + <li>The developer could get control on current states of + subTables using its expanded attribute.</li> + </ul> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/samples/simple-sample.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/samples/simple-sample.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/samples/simple-sample.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,51 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.rf-tgp-itm { + border: 1px solid #{richSkin.panelBorderColor}; + padding:5px; +} +.tabDiv { + border: 1px solid #{ richSkin.panelBorderColor}; + cursor:pointer; + width:110px; + padding-left:5px; + float:left; + } +</style> + <h:form> + <rich:togglePanel id="panel1" activeItem="item1" render="tabs"> + <rich:togglePanelItem name="item1"> + This toggle panel switches in Ajax mode. So only one active + item loaded to the client. + For now you are at Panel 1 + </rich:togglePanelItem> + <rich:togglePanelItem name="item2"> + After the second link click - panel changed active item to + the second one according to name specified in the + togglePanelBehavior + For now you are at Panel 2 + </rich:togglePanelItem> + </rich:togglePanel> + <a4j:outputPanel id="tabs"> + <a4j:outputPanel layout="block" styleClass="tabDiv"> + <rich:toggleControl event="click" targetPanel="panel1" + targetItem="item1" /> + <h:outputText value="Toggle Panel Item 1" + style="#{rich:findComponent('panel1').activeItem == 'item1' ? 'font-weight:bold' : 'font-weight:normal'}" /> + </a4j:outputPanel> + <a4j:outputPanel layout="block" styleClass="tabDiv"> + <rich:toggleControl event="click" targetPanel="panel1" + targetItem="item2" /> + <h:outputText value="Toggle Panel Item 2" + style="#{rich:findComponent('panel1').activeItem == 'item2' ? 'font-weight:bold' : 'font-weight:normal'}" /> + </a4j:outputPanel> + </a4j:outputPanel> + + </h:form> +</ui:composition> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/simple.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/simple.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/richfaces/togglePanel/simple.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,29 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> +togglePanel is a base component for all switchable panels in RichFaces. It renders +sequence of states that can be switched (toggled) by a behavior +called toggleControl. rich:togglePanel has no default appearance. You can define it using +the set of child togglePanelItem's with any given content inside. + switchType attribute defines the strategy of switching. The possible values for this attributes are: +<ul> +<li>client - switching happens on the client without any request to the server. The jsf form is not required in this mode</li> +<li>ajax - when states are switched, the content of new states comes from the server in Ajax way.</li> +<li>server - the whole page is reloaded when states are switched</li> +</ul> +As the component not provides any predefined layout it could be used for creation of any kind of switchable panels easilly. +Here is the sample of simplest tabbed pane organized using that component: + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Added: workspace/mareshkau/rf4.0/WebContent/templates/common.xhtml =================================================================== --- workspace/mareshkau/rf4.0/WebContent/templates/common.xhtml (rev 0) +++ workspace/mareshkau/rf4.0/WebContent/templates/common.xhtml 2010-10-28 19:24:00 UTC (rev 26112) @@ -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 Added: workspace/mareshkau/rf4.0/ant/build.properties =================================================================== --- workspace/mareshkau/rf4.0/ant/build.properties (rev 0) +++ workspace/mareshkau/rf4.0/ant/build.properties 2010-10-28 19:24:00 UTC (rev 26112) @@ -0,0 +1,3 @@ +# +#Thu Oct 28 19:36:11 EEST 2010 +classpath.external=

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26111 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: editor and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: tfennelly Date: 2010-10-28 12:25:29 -0400 (Thu, 28 Oct 2010) New Revision: 26111 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java Log: https://jira.jboss.org/browse/JBIDE-7428 Java source Input not being recognized by editor Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-10-28 16:04:27 UTC (rev 26110) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-10-28 16:25:29 UTC (rev 26111) @@ -25,9 +25,11 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -173,6 +175,7 @@ import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.smooks.impl.ParamTypeImpl; /** * @@ -207,7 +210,18 @@ 'F', 'g', 'G', 'h', 'H', 'i', 'I', 'j', 'J', 'k', 'K', 'l', 'L', 'm', 'M', 'n', 'N', 'o', 'O', 'p', 'P', 'q', 'Q', 'r', 'R', 's', 'S', 't', 'T', 'u', 'U', 'v', 'V', 'w', 'W', 'x', 'X', 'y', 'Y' }; + public static final Set<String> validInputSourceTypes = new LinkedHashSet<String>(); + public static final String[] SELECTOR_SPERATORS = new String[] { " ", "/" }; //$NON-NLS-1$ //$NON-NLS-2$ + + static { + validInputSourceTypes.add(SmooksModelUtils.INPUT_TYPE_CSV); + validInputSourceTypes.add(SmooksModelUtils.INPUT_TYPE_JAVA); + validInputSourceTypes.add(SmooksModelUtils.INPUT_TYPE_XML); + validInputSourceTypes.add(SmooksModelUtils.INPUT_TYPE_EDI_1_2); + validInputSourceTypes.add(SmooksModelUtils.INPUT_TYPE_XSD); + validInputSourceTypes.add(SmooksModelUtils.INPUT_TYPE_JSON_1_2); + } private static void fillBeanIdStringList(EObject model, final Collection<String> beanIdList) { EStructuralFeature beanIDFeature = getBeanIDFeature(model); @@ -3248,4 +3262,8 @@ } return null; } + + public static boolean isValidInputSourceType(String inputType) { + return validInputSourceTypes.contains(inputType); + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-10-28 16:04:27 UTC (rev 26110) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-10-28 16:25:29 UTC (rev 26111) @@ -784,28 +784,15 @@ String inputType = null; if (param != null) { inputType = param.getStringValue(); - String realInputType = SmooksUIUtils.judgeInputType(smooksModel); - if (realInputType == null) { - if (inputType != null) { - if (inputType.equals(SmooksModelUtils.INPUT_TYPE_XML) - || inputType.equals(SmooksModelUtils.INPUT_TYPE_JAVA) - || inputType.equals(SmooksModelUtils.INPUT_TYPE_XSD)) { - - } - } + if (inputType == null || !SmooksUIUtils.isValidInputSourceType(inputType)) { + this.setInputType(SmooksModelUtils.INPUT_TYPE_XML); } else { - if (!realInputType.equals(inputType)) { - param.setStringValue(realInputType); - inputType = realInputType; - } + this.setInputType(inputType); } } else { - inputType = SmooksUIUtils.judgeInputType(smooksModel); - if (inputType != null) { - SmooksUIUtils.addInputTypeParam(inputType, resourceList); - } + this.setInputType(SmooksModelUtils.INPUT_TYPE_XML); + SmooksUIUtils.addInputTypeParam(SmooksModelUtils.INPUT_TYPE_XML, resourceList); } - this.setInputType(inputType); } public EObject getSmooksResourceList() {

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26110 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-10-28 12:04:27 -0400 (Thu, 28 Oct 2010) New Revision: 26110 Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java Log: https://jira.jboss.org/browse/JBIDE-6872 Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java 2010-10-28 16:04:27 UTC (rev 26110) @@ -0,0 +1,99 @@ +/******************************************************************************* + * 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 org.jboss.tools.seam.ui.marker; + +import java.text.MessageFormat; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; +import org.jboss.tools.seam.core.ISeamProperty; +import org.jboss.tools.seam.ui.SeamGuiPlugin; +import org.jboss.tools.seam.ui.SeamUIMessages; + +/** + * @author Daniel Azarov + */ +public class AddSetterMarkerResolution implements IMarkerResolution2{ + private ISeamProperty property; + private ISeamJavaComponentDeclaration javaDeclaration; + + private String label; + + public AddSetterMarkerResolution(ISeamProperty property, ISeamJavaComponentDeclaration javaDeclaration){ + this.property = property; + this.javaDeclaration = javaDeclaration; + this.label = MessageFormat.format(SeamUIMessages.ADD_SETTER_MARKER_RESOLUTION_TITLE, new Object[]{property.getName(), javaDeclaration.getClassName()}); + } + + public String getLabel() { + return label; + } + + public void run(IMarker marker) { + IType type = (IType)javaDeclaration.getSourceMember(); + try{ + ICompilationUnit original = type.getCompilationUnit(); + ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); + IType createdType = compilationUnit.getType(type.getElementName()); + + final String lineDelim= compilationUnit.findRecommendedLineSeparator(); + + IField field = createdType.getField(property.getName()); + String propertyType=""; + if(field != null && field.exists()){ + propertyType = field.getTypeSignature(); + }else{ + propertyType = "String"; + field = createdType.createField(lineDelim+"private "+propertyType+" "+property.getName()+";", null, false, null); +// synchronized(compilationUnit) { +// compilationUnit.reconcile(ICompilationUnit.NO_AST, false, null, null); +// } + } + String setterName = GetterSetterUtil.getSetterName(field, null); + + createMethod(createdType, propertyType, setterName, lineDelim); + + compilationUnit.commitWorkingCopy(true, new NullProgressMonitor()); + }catch(CoreException ex){ + SeamGuiPlugin.getPluginLog().logError(ex); + } + } + + private IMethod createMethod(IType type, String typeName, String methodName, String lineDelim) throws CoreException{ + StringBuffer buf= new StringBuffer(); + + buf.append(lineDelim); + buf.append("public void "+methodName+"("+typeName+" "+property.getName()+") {"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + buf.append(lineDelim); + buf.append("this."+property.getName()+" = "+property.getName()+";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + buf.append(lineDelim); + buf.append("}"); //$NON-NLS-1$ + return type.createMethod(buf.toString(), null, false, null); + } + + public String getDescription() { + return null; + } + + public Image getImage() { + return null; + } + +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-10-28 15:51:28 UTC (rev 26109) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-10-28 16:04:27 UTC (rev 26110) @@ -10,11 +10,24 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.marker; +import java.util.Collection; +import java.util.Set; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IMarkerResolution; import org.eclipse.ui.IMarkerResolutionGenerator2; +import org.jboss.tools.common.text.ITextSourceReference; +import org.jboss.tools.seam.core.ISeamComponent; +import org.jboss.tools.seam.core.ISeamComponentDeclaration; +import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; +import org.jboss.tools.seam.core.ISeamProject; +import org.jboss.tools.seam.core.ISeamProperty; +import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; +import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.internal.core.SeamComponentDeclaration; import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator; import org.jboss.tools.seam.ui.SeamGuiPlugin; import org.jboss.tools.seam.ui.SeamUIMessages; @@ -22,109 +35,217 @@ /** * @author Daniel Azarov */ -public class SeamProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator2 { +public class SeamProblemMarkerResolutionGenerator implements + IMarkerResolutionGenerator2 { private static final String JAVA_EXTENSION = "java"; //$NON-NLS-1$ + private static final String XML_EXTENSION = "xml"; //$NON-NLS-1$ public IMarkerResolution[] getResolutions(IMarker marker) { - try{ + try { return findResolutions(marker); - }catch(CoreException ex){ + } catch (CoreException ex) { SeamGuiPlugin.getPluginLog().logError(ex); } - return new IMarkerResolution[]{}; + return new IMarkerResolution[] {}; } - - private IMarkerResolution[] findResolutions(IMarker marker) throws CoreException{ - Integer attribute = ((Integer)marker.getAttribute(SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME)); - if(attribute == null) - return new IMarkerResolution[]{}; - + + private IMarkerResolution[] findResolutions(IMarker marker) + throws CoreException { + Integer attribute = ((Integer) marker + .getAttribute(SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME)); + if (attribute == null) + return new IMarkerResolution[] {}; + int messageId = attribute.intValue(); - - IFile file = (IFile)marker.getResource(); - - if(!JAVA_EXTENSION.equals(file.getFileExtension())) - return new IMarkerResolution[]{}; - - attribute = ((Integer)marker.getAttribute(IMarker.CHAR_START)); - if(attribute == null) - return new IMarkerResolution[]{}; + + IFile file = (IFile) marker.getResource(); + + attribute = ((Integer) marker.getAttribute(IMarker.CHAR_START)); + if (attribute == null) + return new IMarkerResolution[] {}; int start = attribute.intValue(); - - attribute = ((Integer)marker.getAttribute(IMarker.CHAR_END)); - if(attribute == null) - return new IMarkerResolution[]{}; + + attribute = ((Integer) marker.getAttribute(IMarker.CHAR_END)); + if (attribute == null) + return new IMarkerResolution[] {}; int end = attribute.intValue(); - - if(messageId == SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID){ - return new IMarkerResolution[]{ - new RenameAnnotationMarkerResolution(SeamUIMessages.RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end), - new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name",file, start, end) - }; - } else if(messageId == SeamCoreValidator.DUPLICATE_REMOVE_MESSAGE_ID) - return new IMarkerResolution[]{new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE, "javax.ejb.Remove", file, start, end)}; - else if(messageId == SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID) - return new IMarkerResolution[]{new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)}; - else if(messageId == SeamCoreValidator.DUPLICATE_CREATE_MESSAGE_ID) - return new IMarkerResolution[]{new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Create", file, start, end)}; - else if(messageId == SeamCoreValidator.DUPLICATE_UNWRAP_MESSAGE_ID) - return new IMarkerResolution[]{new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Unwrap", file, start, end)}; - else if(messageId == SeamCoreValidator.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN_MESSAGE_ID) - return new IMarkerResolution[]{new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)}; - else if(messageId == SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID) - return new IMarkerResolution[]{ - new AddAnnotationMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end, true), - new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Create", file, start, end) - }; - else if(messageId == SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID) - return new IMarkerResolution[]{ - new AddAnnotationMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end, true), - new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Unwrap", file, start, end) - }; - else if(messageId == SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID) - return new IMarkerResolution[]{ - new AddAnnotationMarkerResolution(SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Name", file, start, end, true), - new DeleteAnnotationMarkerResolution(SeamUIMessages.DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Observer", file, start, end) - }; - else if(messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE_ID) - return new IMarkerResolution[]{new AddAnnotatedMethodMarkerResolution(SeamUIMessages.ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE, "javax.ejb.Remove", file, start, end)}; - else if(messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY_ID) - return new IMarkerResolution[]{new AddAnnotatedMethodMarkerResolution(SeamUIMessages.ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE, "org.jboss.seam.annotations.Destroy", file, start, end)}; - else if(messageId == SeamCoreValidator.STATEFUL_COMPONENT_WRONG_SCOPE_ID) - return new IMarkerResolution[]{ - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.APPLICATION", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.BUSINESS_PROCESS", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.CONVERSATION", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.EVENT", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.METHOD", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.SESSION", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.UNSPECIFIED", file, start, end) - }; - else if(messageId == SeamCoreValidator.ENTITY_COMPONENT_WRONG_SCOPE_ID) - return new IMarkerResolution[]{ - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.APPLICATION", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.BUSINESS_PROCESS", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.CONVERSATION", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.EVENT", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.METHOD", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.PAGE", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.SESSION", file, start, end), - new ChangeScopeMarkerResolution(SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, "ScopeType.UNSPECIFIED", file, start, end) - }; - - return new IMarkerResolution[]{}; + if (JAVA_EXTENSION.equals(file.getFileExtension())) { + if (messageId == SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID) { + return new IMarkerResolution[] { + new RenameAnnotationMarkerResolution( + SeamUIMessages.RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Name", file, start, + end), + new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Name", file, start, + end) }; + } else if (messageId == SeamCoreValidator.DUPLICATE_REMOVE_MESSAGE_ID) + return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE, + "javax.ejb.Remove", file, start, end) }; + else if (messageId == SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID) + return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Destroy", file, start, end) }; + else if (messageId == SeamCoreValidator.DUPLICATE_CREATE_MESSAGE_ID) + return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Create", file, start, end) }; + else if (messageId == SeamCoreValidator.DUPLICATE_UNWRAP_MESSAGE_ID) + return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Unwrap", file, start, end) }; + else if (messageId == SeamCoreValidator.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN_MESSAGE_ID) + return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Destroy", file, start, end) }; + else if (messageId == SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID) + return new IMarkerResolution[] { + new AddAnnotationMarkerResolution( + SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Name", file, start, + end, true), + new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Create", file, + start, end) }; + else if (messageId == SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID) + return new IMarkerResolution[] { + new AddAnnotationMarkerResolution( + SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Name", file, start, + end, true), + new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Unwrap", file, + start, end) }; + else if (messageId == SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID) + return new IMarkerResolution[] { + new AddAnnotationMarkerResolution( + SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Name", file, start, + end, true), + new DeleteAnnotationMarkerResolution( + SeamUIMessages.DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Observer", file, + start, end) }; + else if (messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE_ID) + return new IMarkerResolution[] { new AddAnnotatedMethodMarkerResolution( + SeamUIMessages.ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE, + "javax.ejb.Remove", file, start, end) }; + else if (messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY_ID) + return new IMarkerResolution[] { new AddAnnotatedMethodMarkerResolution( + SeamUIMessages.ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE, + "org.jboss.seam.annotations.Destroy", file, start, end) }; + else if (messageId == SeamCoreValidator.STATEFUL_COMPONENT_WRONG_SCOPE_ID) + return new IMarkerResolution[] { + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.APPLICATION", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.BUSINESS_PROCESS", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.CONVERSATION", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.EVENT", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.METHOD", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.SESSION", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.UNSPECIFIED", file, start, end) }; + else if (messageId == SeamCoreValidator.ENTITY_COMPONENT_WRONG_SCOPE_ID) + return new IMarkerResolution[] { + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.APPLICATION", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.BUSINESS_PROCESS", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.CONVERSATION", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.EVENT", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.METHOD", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.PAGE", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.SESSION", file, start, end), + new ChangeScopeMarkerResolution( + SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE, + "ScopeType.UNSPECIFIED", file, start, end) }; + }else if(XML_EXTENSION.equals(file.getFileExtension())){ + if (messageId == SeamCoreValidator.UNKNOWN_COMPONENT_PROPERTY_ID){ + ISeamProperty property = findSeamProperty(file, start, end); + if(property != null){ + if(property.getParent() != null && property.getParent() instanceof SeamComponentDeclaration){ + SeamComponentDeclaration xmlDeclaration = (SeamComponentDeclaration)property.getParent(); + if(xmlDeclaration == null){ + return new IMarkerResolution[] {}; + } + for(ISeamComponent component : xmlDeclaration.getComponents()){ + ISeamJavaComponentDeclaration javaDeclaration = component.getJavaDeclaration(); + if(javaDeclaration != null) + return new IMarkerResolution[] { new AddSetterMarkerResolution(property, javaDeclaration) }; + } + } + } + } + } + + return new IMarkerResolution[] {}; } + private ISeamProperty findSeamProperty(IFile file, int start, int end){ + if(file == null) + return null; + IProject project = file.getProject(); + if(project == null) + return null; + + ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, false); + if(seamProject == null) + return null; + + Set<ISeamComponent> components = seamProject.getComponentsByPath(file.getFullPath()); + for(ISeamComponent component : components){ + Set<ISeamXmlComponentDeclaration> declarations = component.getXmlDeclarations(); + for(ISeamXmlComponentDeclaration declaration : declarations){ + Collection<ISeamProperty> properties = declaration.getProperties(); + for(ISeamProperty property : properties){ + ITextSourceReference location = property.getLocationFor(ISeamXmlComponentDeclaration.NAME); + if(location.getStartPosition() <= start && (location.getStartPosition()+location.getLength()) >= end) + return property; + } + } + } + + return null; + } + public boolean hasResolutions(IMarker marker) { - try{ - if(findResolutions(marker).length != 0) + try { + if (findResolutions(marker).length != 0) return true; - }catch(CoreException ex){ + } catch (CoreException ex) { SeamGuiPlugin.getPluginLog().logError(ex); } return false; } - + }

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26109 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects: TestKbModel2 and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-10-28 11:51:28 -0400 (Thu, 28 Oct 2010) New Revision: 26109 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.jboss.ide.eclipse.as.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/Messages.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/User.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/.faces-config.xml.jsfdia trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/Messages.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/User.class trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jboss-seam-mail.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jboss-seam-pdf.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jsf-impl.1 trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/richfaces-ui.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/taglib2.tld trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib2.xml Log: JBIDE-7319 https://jira.jboss.org/browse/JBIDE-7319 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.classpath 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,17 @@ +<?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.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"> + <attributes> + <attribute name="owner.project.facets" value="jst.web"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="jst.java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.project 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>TestKbModel2</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.jboss.tools.jst.web.kb.kbbuilder</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> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/.jsdtscope 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.jdt.core.prefs 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,7 @@ +#Thu Jun 04 11:17:46 MSD 2009 +eclipse.preferences.version=1 +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/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.component 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="TestKbModel2"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="java-output-path"/> +<property name="context-root" value="TestKbModel2"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.web"/> + <fixed facet="jst.java"/> + <installed facet="jst.java" version="6.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.jboss.ide.eclipse.as.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.jboss.ide.eclipse.as.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.jboss.ide.eclipse.as.core.prefs 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,3 @@ +#Thu Sep 23 18:57:17 MSD 2010 +eclipse.preferences.version=1 +org.jboss.ide.eclipse.as.core.singledeployable.deployableList= Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/.settings/org.jboss.ide.eclipse.as.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/Messages.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/Messages.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/Messages.properties 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/User.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/User.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/JavaSource/demo/User.java 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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 JBoss Developer Studio + */ +public class User { + + private String name; + + /** + * @return User Name + */ + public String getName() { + return name; + } + + /** + * @param User 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.web.kb.test/projects/TestKbModel2/JavaSource/demo/User.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/.faces-config.xml.jsfdia 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"> + <PROCESS-ITEM NAME="rules:#pages#inputUserName.jsp" + PATH="/pages/inputUserName.jsp" SHAPE="32,17,0,0" model-entity="JSFProcessGroup"> + <PROCESS-ITEM ID="rules:#pages#inputUserName.jsp:0" NAME="item" + PATH="/pages/inputUserName.jsp" model-entity="JSFProcessItem"> + <PROCESS-ITEM-OUTPUT ID="hello::#pages#hello.jsp" NAME="output" + PATH="/pages/hello.jsp" TARGET="rules:#pages#hello.jsp" + TITLE="hello" model-entity="JSFProcessItemOutput"/> + </PROCESS-ITEM> + </PROCESS-ITEM> + <PROCESS-ITEM NAME="rules:#pages#hello.jsp" PATH="/pages/hello.jsp" + SHAPE="240,33,0,0" model-entity="JSFProcessGroup"/> +</PROCESS> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/Messages.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/Messages.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/Messages.properties 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/User.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/classes/demo/User.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/faces-config.xml 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,27 @@ +<?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> + <component> + <component-type>Component1</component-type> + <component-class>com.Component1</component-class> + </component> + <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> + <navigation-rule> + <from-view-id>/pages/inputUserName.jsp</from-view-id> + <navigation-case> + <from-outcome>hello</from-outcome> + <to-view-id>/pages/hello.jsp</to-view-id> + </navigation-case> + </navigation-rule> +</faces-config> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jboss-seam-mail.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jboss-seam-mail.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jboss-seam-pdf.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jboss-seam-pdf.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jsf-impl.1 =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/jsf-impl.1 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/richfaces-ui.jar =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/lib/richfaces-ui.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/taglib2.tld =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/taglib2.tld (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/taglib2.tld 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + <tlib-version>1.0</tlib-version> + <jsp-version>1.2</jsp-version> + <short-name>taglib2</short-name> + <uri>taglib2</uri> + <tag> + <name>tagA</name> + <tag-class>com.TagA</tag-class> + <body-content>empty</body-content> + <description>Tag A</description> + </tag> +</taglib> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/taglib2.tld ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/web.xml 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,23 @@ +<?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_2_5.xsd" version="2.5"> + <display-name>TestKbModel2</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> + <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> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib.xml 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "facelet-taglib_1_0.dtd"> +<facelet-taglib> + <namespace>facelet_taglib</namespace> + <tag> + <tag-name>tag1</tag-name> + <handler-class/> + </tag> + <tag> + <tag-name>tag2</tag-name> + <component> + <component-type>ctype1</component-type> + <handler-class/> + </component> + </tag> +</facelet-taglib> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib2.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib2.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib2.xml 2010-10-28 15:51:28 UTC (rev 26109) @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<facelet-taglib version="2.0" 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-facelettaglibrary_2_0.xsd"> + <namespace>facelets_taglib2</namespace> + <composite-library-name>ii</composite-library-name> + <tag> + <tag-name>tag1</tag-name> + <handler-class>k</handler-class> + <attribute> + <name>attr1</name> + <type>v</type> + </attribute> + <attribute> + <name>attr2</name> + </attribute> + <tag-extension> + <xx/> + <xx/> + </tag-extension> + <tag-extension> + <yy/> + </tag-extension> + </tag> + <tag> + <tag-name>tag2</tag-name> + <handler-class>k</handler-class> + <attribute> + <name>attr3</name> + <type>v</type> + </attribute> + <attribute> + <name>attr4</name> + </attribute> + <tag-extension> + <xx/> + <xx/> + </tag-extension> + <tag-extension> + <yy/> + </tag-extension> + </tag> +</facelet-taglib> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel2/WebContent/facelet-taglib2.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26108 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-10-28 11:49:47 -0400 (Thu, 28 Oct 2010) New Revision: 26108 Modified: trunk/build/target-platform/e361-wtp322.target Log: add org.eclipse.rap.runtime.sdk_1.3.1.20100915-2301.jar to include org.eclipse.osgi_3.6.1.R36x_v20100806 for Savara Modified: trunk/build/target-platform/e361-wtp322.target =================================================================== --- trunk/build/target-platform/e361-wtp322.target 2010-10-28 15:45:06 UTC (rev 26107) +++ trunk/build/target-platform/e361-wtp322.target 2010-10-28 15:49:47 UTC (rev 26108) @@ -98,40 +98,40 @@ </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit version="1.1.0.v20090119-79318s73533B57" id="com.ibm.icu.base.feature.group"/> - <unit version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I" id="org.eclipse.equinox.server.core.feature.group"/> - <unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/> - <unit version="1.2.0.v20100427-7e7jEQFEp4jsWdToIUAoF3" id="org.eclipse.help.feature.group"/> + <unit version="1.0.1.R36x_v20101007-7K7QErDzbb9z-yqHb56L8H" id="org.eclipse.equinox.server.core.feature.group"/> + <unit version="1.2.0.v20100427-7B77FKt90GE5h1JDK5GXEA01911" id="org.eclipse.cvs.feature.group"/> + <unit version="1.2.0.v20100427-7e7jERFEp4jsWdTqCV2nD3" id="org.eclipse.help.feature.group"/> <unit version="3.6.2.r362_v20100929-7z8XFUUFLFlmgNd019WRcD5LVkHD" id="org.eclipse.jdt.feature.group"/> <unit version="3.6.2.r362_v20100929-9gF78GrqFrD9Uh-OltlT9H_z0p1mnhRBz-PPmGWk" id="org.eclipse.platform.feature.group"/> - <unit version="3.6.1.M20100929-0800" id="org.eclipse.platform.ide"/> - <unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable.feature.group"/> - <unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable"/> - <unit version="3.6.1.M20100929-0800" id="org.eclipse.platform.sdk"/> + <unit version="3.6.2.M20101020-0925" id="org.eclipse.platform.ide"/> + <unit version="3.4.1.R36x_v20101019_1345-7M7K7aF90dnJ-WLf3cut-MXrPgx" id="org.eclipse.equinox.executable.feature.group"/> + <unit version="3.4.1.R36x_v20101019_1345-7M7K7aF90dnJ-WLf3cut-MXrPgx" id="org.eclipse.equinox.executable"/> + <unit version="3.6.2.M20101020-0925" id="org.eclipse.platform.sdk"/> <unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhET4i55adpJ" id="org.eclipse.pde.feature.group"/> - <unit version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o2z-L9LxPSe6ygafz-KKIqk1rr_3j4dn7J" id="org.eclipse.sdk.feature.group"/> - <unit version="3.6.2.r362_v20100929-9OArFLdFjY-Th_BOmHvM1fT" id="org.eclipse.rcp.feature.group"/> - <unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.id"/> - <unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.sdk.id"/> + <unit version="3.6.2.r362_v20100929-7Q7m7ADDaKh5py5C9f1kQXv_p6z-50gz09paZXCU1CV7x" id="org.eclipse.sdk.feature.group"/> + <unit version="3.6.2.r362_v20100929-9OArFLtFjY-ThlnOoBv_whoMlFVj" id="org.eclipse.rcp.feature.group"/> + <unit version="3.6.0.M20101020-0925" id="org.eclipse.rcp.id"/> + <unit version="3.6.0.M20101020-0925" id="org.eclipse.rcp.sdk.id"/> <unit version="3.3.0.v20100427-44A77w31211642" id="org.eclipse.releng.tools.feature.group"/> - <unit version="3.6.1.M20100929-0800" id="org.eclipse.sdk.ide"/> + <unit version="3.6.2.M20101020-0925" id="org.eclipse.sdk.ide"/> <unit version="3.3.1.r362_v20101014-817fFcgFE_dae7CiesDUeYc" id="org.eclipse.sdk.examples.feature.group"/> - <unit version="3.3.0.v20100527" id="org.eclipse.sdk.examples.source.feature.group"/> + <unit version="3.3.1.r362_v20101014" id="org.eclipse.sdk.examples.source.feature.group"/> <unit version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J" id="org.eclipse.equinox.compendium.sdk.feature.group"/> - <unit version="3.6.1.R36x_v20101007-7sF99FsHFTw8HQBta4g33J3F" id="org.eclipse.equinox.core.sdk.feature.group"/> + <unit version="3.6.1.R36x_v20101007-7sF99FsHFSyAVFKfV4c7B7BR" id="org.eclipse.equinox.core.sdk.feature.group"/> <unit version="1.0.0.v20100510-4--9oB5855K7P" id="org.eclipse.equinox.p2.discovery.feature.feature.group"/> <unit version="2.0.1.r361_v20100903-897HFZGFYxvZ7cEJrRz0-9_0" id="org.eclipse.equinox.p2.user.ui.feature.group"/> - <unit version="3.6.0.v20100503-9I7VGAgG7w-PNFWurwLPmgB" id="org.eclipse.equinox.p2.sdk.feature.group"/> + <unit version="3.6.1.R36x_v20101007-9I7VGAgG7w-PNFWurwLPmgB" id="org.eclipse.equinox.p2.sdk.feature.group"/> <unit version="3.6.1.R36x_v20101014-7u7NFViFN5JdPKPhDHd_6Yqc54uw" id="org.eclipse.equinox.serverside.sdk.feature.group"/> - <unit version="3.6.1.r361_v20100903-7H7R07v8rtOZz0Yax3hIIyrhnXLc" id="org.eclipse.equinox.sdk.feature.group"/> + <unit version="3.6.1.r361_v20100903-7H7R47v8rtOr0Yaw5jW85dbniBmw" id="org.eclipse.equinox.sdk.feature.group"/> <unit version="1.0.0.v20100421-79--EVVFNFFsFc" id="org.eclipse.equinox.weaving.sdk.feature.group"/> <unit version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ" id="org.eclipse.equinox.server.jetty.feature.group"/> - <unit version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L" id="org.eclipse.equinox.server.p2.feature.group"/> + <unit version="1.0.1.R36x_v20101007-7x7IFGOFQ74dz0POCNUBjA6L" id="org.eclipse.equinox.server.p2.feature.group"/> <unit version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL" id="org.eclipse.pde.api.tools.ee.fragments.feature.group"/> - <unit version="1.1.0.M20100929-0800" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/> + <unit version="1.1.0.M20101020-0925" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/> <unit version="1.0.0.v20100510-42A79oB5855K5E" id="org.eclipse.equinox.server.servletbridge.feature.group"/> <unit version="1.0.0.v20100510-44DF8s734C48662444" id="org.eclipse.equinox.server.simple.feature.group"/> - <unit version="3.6.2.r362_v20100929-9OArFLdFjY-Th_BOmHvM1fT" id="org.eclipse.rcp.feature.group"/> - <repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/> + <unit version="3.6.2.r362_v20100929-9OArFLtFjY-ThlnOoBv_whoMlFVj" id="org.eclipse.rcp.feature.group"/> + <repository location="http://download.eclipse.org/eclipse/updates/3.6/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <unit version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb" id="org.eclipse.birt.feature.group"/> @@ -158,6 +158,10 @@ <unit version="3.0.1.R30x_v201008251030-79-7I8qD6z-DtD7E6BP9D5393" id="org.eclipse.ocl.feature.group"/> <unit version="1.0.0.v20100831" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/> <unit version="2.1.0.v20100606-1530-7908_AkF7AG8KEM3CMFA" id="org.eclipse.m2m.qvt.oml.common.feature.group"/> + <unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/> + <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/> + <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> + <unit version="1.3.1.20100915-2301" id="org.eclipse.rap.runtime.sdk.feature.group"/> <repository location="http://download.eclipse.org/releases/helios/"/> </location> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26107 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-10-28 11:45:06 -0400 (Thu, 28 Oct 2010) New Revision: 26107 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelStorageTest.java Log: JBIDE-7319 https://jira.jboss.org/browse/JBIDE-7319 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelStorageTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelStorageTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelStorageTest.java 2010-10-28 15:45:06 UTC (rev 26107) @@ -0,0 +1,70 @@ +package org.jboss.tools.jst.web.kb.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.jst.web.kb.KbProjectFactory; +import org.jboss.tools.jst.web.kb.internal.KbProject; +import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; +import org.jboss.tools.test.util.JobUtils; + +public class KbModelStorageTest extends TestCase { + IProject project = null; + + public KbModelStorageTest() { + super("Kb Model Storage Test"); + } + + public void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel2"); + assertNotNull("Can't load TestKbModel2", project); //$NON-NLS-1$ + } + + public void testStorage() throws Exception { + KbProject kb = (KbProject)KbProjectFactory.getKbProject(project, true); + assertNotNull(kb); + int mod = kb.getModificationsSinceLastStore(); + System.out.println("-->" + mod); + assertTrue("Modification index after load must be greater than 0", mod > 0); + + kb.store(); + mod = kb.getModificationsSinceLastStore(); + System.out.println("-->" + mod); + assertEquals("Modification index after store must be cleared", 0, mod); + + IFile fromFile = project.getFile(new Path("WebContent/WEB-INF/lib/jsf-impl.1")); + IFile toFile = project.getFile(new Path("WebContent/WEB-INF/lib/jsf-impl.jar")); + + toFile.create(fromFile.getContents(), true, new NullProgressMonitor()); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + JobUtils.waitForIdle(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + JobUtils.waitForIdle(); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + ITagLibrary[] ls = kb.getTagLibraries("http://java.sun.com/jsf/core"); + for (ITagLibrary lb: ls) { + System.out.println(lb.getSourcePath()); + } + mod = kb.getModificationsSinceLastStore(); + System.out.println("-->" + mod); + assertTrue("Modification index after adding new library must be greater than 0", mod > 0); + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelStorageTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26106 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-10-28 11:39:28 -0400 (Thu, 28 Oct 2010) New Revision: 26106 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java Log: JBIDE-7319 https://jira.jboss.org/browse/JBIDE-7319 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2010-10-28 14:59:27 UTC (rev 26105) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2010-10-28 15:39:28 UTC (rev 26106) @@ -23,14 +23,15 @@ public static Test suite() { TestSuite suite = new TestSuite(JstWebKbAllTests.class.getName()); + suite.addTestSuite(KbModelStorageTest.class); suite.addTestSuite(KbModelTest.class); suite.addTestSuite(MyFacesKbModelTest.class); suite.addTestSuite(MyFacesKbModelWithMetadataInSourcesTest.class); suite.addTestSuite(WebKbTest.class); ProjectImportTestSetup testSetup = new XProjectImportTestSetUp(suite, "org.jboss.tools.jst.web.kb.test", - new String[]{"projects/TestKbModel", "projects/MyFaces", "projects/MyFaces2"}, - new String[]{"TestKbModel", "MyFaces", "MyFaces2"}); + new String[]{"projects/TestKbModel", "projects/MyFaces", "projects/MyFaces2", "projects/TestKbModel2"}, + new String[]{"TestKbModel", "MyFaces", "MyFaces2", "TestKbModel2"}); return testSetup; } } \ No newline at end of file

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26105 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: src/org/jboss/tools/jsf/jsp/ca/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-10-28 10:59:27 -0400 (Thu, 28 Oct 2010) New Revision: 26105 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/CAForCompositeComponentTest/WebContent/resources/sample/tag2.xhtml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForCompositeComponentTest.java Log: JBIDE-7439 https://jira.jboss.org/browse/JBIDE-7439 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/CAForCompositeComponentTest/WebContent/resources/sample/tag2.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/CAForCompositeComponentTest/WebContent/resources/sample/tag2.xhtml 2010-10-28 14:28:03 UTC (rev 26104) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/CAForCompositeComponentTest/WebContent/resources/sample/tag2.xhtml 2010-10-28 14:59:27 UTC (rev 26105) @@ -4,7 +4,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:composite="http://java.sun.com/jsf/composite"> <composite:interface> <composite:attribute name="a2"/> - <composite:attribute name="b3"/> + <composite:attribute name="b3" type="java.lang.String" /> </composite:interface> #{cc.attrs.} + #{cc.attrs.b3.} </html> Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForCompositeComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForCompositeComponentTest.java 2010-10-28 14:28:03 UTC (rev 26104) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForCompositeComponentTest.java 2010-10-28 14:59:27 UTC (rev 26105) @@ -45,4 +45,11 @@ checkProposals(TAG_NAME, "#{cc.attrs.}", 11, proposals, false); } + + public void testCAForTypedAttr() { + String[] proposals = { + "cc.attrs.b3.toString()" + }; + checkProposals(TAG_NAME, "#{cc.attrs.b3.}", 14, proposals, false); + } }

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26104 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/model and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-10-28 10:28:03 -0400 (Thu, 28 Oct 2010) New Revision: 26104 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java Log: JBIDE-7439 https://jira.jboss.org/browse/JBIDE-7439 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2010-10-28 14:26:59 UTC (rev 26103) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf2-components.meta 2010-10-28 14:28:03 UTC (rev 26104) @@ -200,6 +200,7 @@ <Editor name="List"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="applyTo" xmlname="applyTo"/> + <XModelAttribute PROPERTIES="category=general" name="type" xmlname="type"/> <XModelAttribute PROPERTIES="category=general" default="false" name="preferred" xmlname="preferred"> <Constraint loader="List"> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2010-10-28 14:26:59 UTC (rev 26103) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2010-10-28 14:28:03 UTC (rev 26104) @@ -20,14 +20,19 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine; +import org.jboss.tools.common.el.core.model.ELArgumentInvocation; import org.jboss.tools.common.el.core.model.ELExpression; import org.jboss.tools.common.el.core.model.ELInvocationExpression; import org.jboss.tools.common.el.core.model.ELObjectType; import org.jboss.tools.common.el.core.model.ELPropertyInvocation; +import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.el.core.resolver.ELContext; @@ -37,11 +42,15 @@ import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.IVariable; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegmentImpl; +import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.model.JSFELCompletionEngine.IJSFVariable; import org.jboss.tools.jst.web.kb.IXmlContext; import org.jboss.tools.jst.web.kb.PageContextFactory; @@ -252,6 +261,10 @@ resolution.setProposals(proposals); return resolution; } + + if(!resolvedVariables.isEmpty() && resolvedVariables.iterator().next() instanceof IJSFVariable) { + return buildJavaResolution(resolution, left, expr, operand, resolvedVariables, returnEqualedVariablesOnly); + } //process segments one by one if(left != null) { @@ -278,6 +291,64 @@ return resolution; } + //Method content copies code from the end AbstractELCompletionEngine.resolveELOperand + ELResolutionImpl buildJavaResolution(ELResolutionImpl resolution, ELInvocationExpression left, ELInvocationExpression expr, + ELExpression operand, List<IVariable> resolvedVariables, boolean returnEqualedVariablesOnly) { + boolean varIsUsed = false; + // First segment is found - proceed with next tokens + List<TypeInfoCollector.MemberInfo> members = new ArrayList<TypeInfoCollector.MemberInfo>(); + JavaMemberELSegmentImpl segment = new JavaMemberELSegmentImpl(); + segment.setToken(expr.getFirstToken()); + for (IVariable var : resolvedVariables) { + TypeInfoCollector.MemberInfo member = getMemberInfoByVariable(var, returnEqualedVariablesOnly); + if (member != null && !members.contains(member)) { + members.add(member); + segment.setMemberInfo(member); + segment.getVariables().add(var); + segment.setResolved(true); + } + } + resolution.addSegment(segment); + //process segments one by one + if(left != null) { + while(left != expr) { + left = (ELInvocationExpression)left.getParent(); + if (left != expr) { // inside expression + segment = new JavaMemberELSegmentImpl(); + if(left instanceof ELArgumentInvocation) { + String s = "#{" + left.getLeft().toString() + collectionAdditionForCollectionDataModel + "}"; //$NON-NLS-1$ //$NON-NLS-2$ + ELParser p = getParserFactory().createParser(); + ELInvocationExpression expr1 = (ELInvocationExpression)p.parse(s).getInstances().get(0).getExpression(); + members = resolveSegment(expr1.getLeft(), members, resolution, returnEqualedVariablesOnly, varIsUsed, segment); + members = resolveSegment(expr1, members, resolution, returnEqualedVariablesOnly, varIsUsed, segment); + if(resolution.getLastResolvedToken() == expr1) { + resolution.setLastResolvedToken(left); + } + } else { + members = resolveSegment(left, members, resolution, returnEqualedVariablesOnly, varIsUsed, segment); + } + if(!members.isEmpty()) { + segment.setResolved(true); + segment.setMemberInfo(members.get(0)); // TODO: This is a buggy way to select a member to setup in a segment + } + resolution.addSegment(segment); + } else { // Last segment + resolveLastSegment((ELInvocationExpression)operand, members, resolution, returnEqualedVariablesOnly, varIsUsed); + break; + } + } + } + + if(resolution.getProposals().isEmpty() && !resolution.getSegments().isEmpty()) { +// && status.getUnpairedGettersOrSetters()!=null) { + ELSegment lastSegment = resolution.getSegments().get(resolution.getSegments().size()-1); + if(lastSegment instanceof JavaMemberELSegmentImpl) { + ((JavaMemberELSegmentImpl)lastSegment).clearUnpairedGettersOrSetters(); + } + } + return resolution; + } + static String[] vs = {"cc.attrs", "compositeComponent.attrs"}; private IFile currentFile; private ELContext currentContext; @@ -298,16 +369,47 @@ List<IVariable> result = new ArrayList<IVariable>(); String varName = expr.toString(); + for (int i = 0; i < vs.length; i++) { String name = vs[i]; if(!isFinal || onlyEqualNames) { if(!name.equals(varName)) continue; } if(!name.startsWith(varName)) continue; + if(varName.lastIndexOf('.') > name.length()) continue; //It is the java variable case Variable v = new Variable(name, file); result.add(v); break; } + + if(currentXModelObject != null && result.isEmpty()) { + IJavaProject javaProject = EclipseResourceUtil.getJavaProject(file.getProject()); + XModelObject is = currentXModelObject.getChildByPath("Interface"); + if(is != null && javaProject != null) { + XModelObject[] cs = is.getChildren("JSF2ComponentAttribute"); + + for (int i = 0; i < cs.length; i++) { + String name = cs[i].getAttributeValue("name"); + String type = cs[i].getAttributeValue("type"); + if(type == null || type.length() == 0) continue; + String[] names = {vs[0] + "." + name, vs[1] + "." + name}; + for (String n: names) { + boolean match = (!isFinal || onlyEqualNames) ? n.equals(varName) : false; + if(!match) continue; + IType javaType = null; + try { + javaType = EclipseJavaUtil.findType(javaProject, type); + } catch (JavaModelException e) { + + } + if(javaType == null) continue; + IVariable v = new JSFELCompletionEngine.Variable(n, javaType); + result.add(v); + } + } + } + } + return result; } @@ -514,6 +616,9 @@ @Override protected MemberInfo getMemberInfoByVariable(IVariable var, boolean onlyEqualNames) { + if(var instanceof IJSFVariable) { + return TypeInfoCollector.createMemberInfo(((IJSFVariable)var).getSourceMember()); + } return null; } @@ -524,7 +629,7 @@ @Override public List<IVariable> resolveVariables(IFile file, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) { - return null; + return resolveVariablesInternal(file, expr, isFinal, onlyEqualNames); } @Override

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r26103 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-10-28 10:26:59 -0400 (Thu, 28 Oct 2010) New Revision: 26103 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java Log: Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java 2010-10-28 11:39:41 UTC (rev 26102) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/DefaultJavaRelevanceCheck.java 2010-10-28 14:26:59 UTC (rev 26103) @@ -37,6 +37,7 @@ public boolean isRelevant(String content) { if(test1 != null && content.contains(test1)) return true; if(test2 != null && content.contains(test2)) return true; + if(test3 != null && content.contains(test3)) return true; return false; }

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2010