[richfaces-svn-commits] JBoss Rich Faces SVN: r17813 - in root/tests/metamer/trunk: src/main/assembly and 15 other directories.

Author: lfryc(a)redhat.com Date: 2010-07-10 14:08:18 -0400 (Sat, 10 Jul 2010) New Revision: 17813 Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Template.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java root/tests/metamer/trunk/src/main/webapp/components/ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/list.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css root/tests/metamer/trunk/src/main/webapp/resources/flash/ root/tests/metamer/trunk/src/main/webapp/resources/flash/text.swf root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml root/tests/metamer/trunk/src/main/webapp/templates/plain.xhtml root/tests/metamer/trunk/src/main/webapp/templates/reddiv.xhtml Removed: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/mediaOutput/text.swf root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml root/tests/metamer/trunk/src/main/webapp/commandLink/tests.xhtml root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml root/tests/metamer/trunk/src/main/webapp/resources/css/commandLink.css Modified: root/tests/metamer/trunk/pom.xml root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java root/tests/metamer/trunk/src/main/webapp/WEB-INF/web.xml root/tests/metamer/trunk/src/main/webapp/index.xhtml root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml Log: https://jira.jboss.org/jira/browse/RFPL-466 * project's structure changed * attributes of any JSF component are being obtained automatically * prepared test cases removed temporarily * simpler xhtml pages * fixed tomcat6 assembly descriptor * phase listener refactored to use logger Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/pom.xml 2010-07-10 18:08:18 UTC (rev 17813) @@ -58,13 +58,13 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.2-b10</version> + <version>2.0.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.2-b10</version> + <version>2.0.2</version> <scope>provided</scope> </dependency> <dependency> @@ -100,6 +100,17 @@ <version>2.5</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>1.0_02.CR5</version> + </dependency> </dependencies> <build> Modified: root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml =================================================================== --- root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml 2010-07-10 18:08:18 UTC (rev 17813) @@ -49,6 +49,9 @@ <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>WEB-INF/lib</outputDirectory> + <excludes> + <exclude>javax.el:el-api</exclude> + </excludes> </dependencySet> </dependencySets> Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,261 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ + +package org.richfaces.testapp; + +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import javax.el.ELContext; +import javax.el.MethodExpression; +import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; + +import org.jboss.el.ExpressionFactoryImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Representation of all attributes of a JSF component. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class Attributes implements Map<String, Object> { + + private Logger logger; + private Map<String, Object> attributes; + private Set<String> excludeSet; + + /** + * Constructor for class Attributes. + * + * @param clazz + * class object of a JSF component whose attributes will be stored + */ + public Attributes(Class<? extends UIComponentBase> clazz) { + logger = LoggerFactory.getLogger(Attributes.class); + logger.info("creating attributes map for " + clazz); + + PropertyDescriptor[] descriptors = null; + try { + descriptors = Introspector.getBeanInfo(clazz).getPropertyDescriptors(); + } catch (IntrospectionException e) { + logger.error("Could not get a list with attributes of class" + clazz); + attributes = Collections.emptyMap(); + return; + } + + attributes = new TreeMap<String, Object>(); + // not all attributes of given class are needed + excludeSet = getExcludeSet(); + + for (PropertyDescriptor descriptor : descriptors) { + if (!excludeSet.contains(descriptor.getName())) { + attributes.put(descriptor.getName(), null); + } + } + + logger.info(attributes.keySet().toString()); + } + + /** + * {@inheritDoc} + */ + public void clear() { + attributes.clear(); + + } + + /** + * {@inheritDoc} + */ + public boolean containsKey(Object key) { + return attributes.containsKey(key); + } + + /** + * {@inheritDoc} + */ + public boolean containsValue(Object value) { + return attributes.containsKey(value); + } + + /** + * {@inheritDoc} + */ + public Set<java.util.Map.Entry<String, Object>> entrySet() { + return attributes.entrySet(); + } + + /** + * {@inheritDoc} + */ + public Object get(Object key) { + return attributes.get(key); + } + + /** + * {@inheritDoc} + */ + public boolean isEmpty() { + return attributes.isEmpty(); + } + + /** + * {@inheritDoc} + */ + public Set<String> keySet() { + return attributes.keySet(); + } + + /** + * {@inheritDoc} + */ + public Object put(String key, Object value) { + return attributes.put(key, value); + } + + /** + * {@inheritDoc} + */ + public void putAll(Map<? extends String, ? extends Object> m) { + attributes.putAll(m); + } + + /** + * {@inheritDoc} + */ + public Object remove(Object key) { + return attributes.remove(key); + } + + /** + * {@inheritDoc} + */ + public int size() { + return attributes.size(); + } + + /** + * {@inheritDoc} + */ + public Collection<Object> values() { + return attributes.values(); + } + + /** + * Getter for exclude set. + * + * @return set containing all attributes of a JSF component that cannot/shouldn't be set on page. + */ + private Set<String> getExcludeSet() { + if (excludeSet != null) { + return excludeSet; + } + + Set<String> set = new HashSet<String>(); + + set.add("attributes"); + set.add("actionExpression"); + set.add("actionListeners"); + set.add("children"); + set.add("childCount"); + set.add("class"); + set.add("clientBehaviors"); + set.add("clientId"); + set.add("defaultEventName"); + set.add("eventNames"); + set.add("facetCount"); + set.add("facets"); + set.add("facetsAndChildren"); + set.add("family"); + set.add("id"); + set.add("inView"); + set.add("namingContainer"); + set.add("parent"); + set.add("rendererType"); + set.add("rendersChildren"); + set.add("resourceBundleMap"); + set.add("transient"); + return set; + } + + /** + * Determines whether given object represents an EL expression, e.g. #{bean.property}. + * + * @param value + * value of a property of tested JSF component + * @return true if object is a string representing an expression, e.g. #{bean.property}, false otherwise + */ + private boolean isStringEL(Object value) { + if (!(value instanceof String)) { + return false; + } + + return ((String) value).matches("#\\{.*\\}"); + } + + /** + * An action for tested JSF component. Can be modified dynamically. + * + * @return outcome of an action or null if no navigation should be performed + */ + public String action() { + ELContext elContext = FacesContext.getCurrentInstance().getELContext(); + MethodExpression method = null; + String outcome = (String) attributes.get("action"); + + if (isStringEL(outcome)) { + method = new ExpressionFactoryImpl().createMethodExpression(elContext, outcome, String.class, new Class[0]); + return (String) method.invoke(elContext, null); + } else { + return outcome; + } + } + + /** + * An action listener for tested JSF component. Can be modified dynamically. + * + * @param event + * event representing the activation of a user interface component + */ + public void actionListener(ActionEvent event) { + ELContext elContext = FacesContext.getCurrentInstance().getELContext(); + MethodExpression method = null; + String listener = (String) attributes.get("actionListener"); + + if (isStringEL(listener)) { + method = new ExpressionFactoryImpl().createMethodExpression(elContext, listener, void.class, + new Class[] { ActionEvent.class }); + method.invoke(elContext, new Object[] { event }); + } + } +} Deleted: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,233 +0,0 @@ -/******************************************************************************* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - *******************************************************************************/ - -package org.richfaces.testapp; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.faces.context.FacesContext; -import javax.servlet.http.HttpSession; - -/** - * - * - * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> - * @version $Revision$ - */ -@ManagedBean -@SessionScoped -public class RichBean { - - private String skin; - private String skinning; - private String skinningClasses; - private String skinningSelect; - private List<String> skins; - private boolean reDefault; - private boolean reComponent; - private boolean reAttributes; - private boolean reTests; - private boolean log; - private String component; - private String container; - - @PostConstruct - public void init() { - skins = new ArrayList<String>(); - skins.add("DEFAULT"); - skins.add("NULL"); - skins.add("blueSky"); - skins.add("classic"); - skins.add("deepMarine"); - skins.add("emeraldTown"); - skins.add("japanCherry"); - skins.add("plain"); - skins.add("ruby"); - skins.add("wine"); - component = "none"; - container = "plain"; - skin = "DEFAULT"; - skinning = "disable"; - skinningClasses = "disable"; - reTests = true; - reComponent = true; - reAttributes = true; - } - - /** - * Getter for user's skin. - * - * @return a RichFaces skin - */ - public String getSkin() { - return skin; - } - - /** - * Setter for user's skin. - * - * @param skin - * a RichFaces skin - */ - public void setSkin(String skin) { - this.skin = skin; - } - - public String getSkinning() { - if (skinningSelect.equals("skinning")) { - return "enabled"; - } else { - return "disabled"; - } - } - - public void setSkinning(String skinning) { - this.skinning = skinning; - } - - public String getSkinningClasses() { - if (skinningSelect.equals("skinning classes")) { - return "enabled"; - } else { - return "disabled"; - } - } - - public void setSkinningClasses(String skinningClasses) { - this.skinningClasses = skinningClasses; - } - - public void setSkins(List<String> skins) { - this.skins = skins; - } - - public List<String> getSkins() { - return skins; - } - - public void setReDefault(boolean reDefault) { - this.reDefault = reDefault; - } - - public boolean isReDefault() { - return reDefault; - } - - public void setReComponent(boolean reComponent) { - this.reComponent = reComponent; - } - - public boolean isReComponent() { - return reComponent; - } - - public void setReAttributes(boolean reAttributes) { - this.reAttributes = reAttributes; - } - - public boolean isReAttributes() { - return reAttributes; - } - - public void setLog(boolean log) { - this.log = log; - } - - public boolean isLog() { - return log; - } - - public void setComponent(String component) { - this.component = component; - } - - public String getComponent() { - return component; - } - - public String getContainer() { - return container; - } - - public void setContainer(String container) { - this.container = container; - } - - public boolean isReTests() { - return reTests; - } - - public void setReTests(boolean reTests) { - this.reTests = reTests; - } - - public String getSkinningSelect() { - return skinningSelect; - } - - public void setSkinningSelect(String skinningSelect) { - this.skinningSelect = skinningSelect; - } - - public String getComponentPage() { - if (component.equals("none")) { - return "/none.xhtml"; - } else { - return String.format("/%s/%s.xhtml", component, container); - } - } - - public String getTestsPage() { - if (component.equals("none")) { - return "/blank.xhtml"; - } else { - return String.format("/%s/tests.xhtml", component); - } - } - - public String getAttributesPage() { - if (component.equals("none")) { - return "/blank.xhtml"; - } else { - return String.format("/%s/attributes.xhtml", component); - } - } - - public String invalidateSession() { - Object session = FacesContext.getCurrentInstance().getExternalContext().getSession(false); - - if (session == null) { - return "/index"; - } - - if (session instanceof HttpSession) { - ((HttpSession) session).invalidate(); - return "/index"; - } - - throw new IllegalStateException(); - } -} Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichPhaseListener.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,22 +1,63 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ + package org.richfaces.testapp; -import javax.faces.context.FacesContext; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A phase listener that notifies at the beginning and ending of processing for each standard phase of the request + * processing lifecycle. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ public class RichPhaseListener implements javax.faces.event.PhaseListener { private static final long serialVersionUID = 9026842190917014131L; + private Logger logger = LoggerFactory.getLogger(RichPhaseListener.class); + /** + * {@inheritDoc} + */ public void afterPhase(PhaseEvent event) { - FacesContext.getCurrentInstance().getExternalContext().log("AFTER - " + event.getPhaseId()); + logger.info("AFTER - " + event.getPhaseId()); } + /** + * {@inheritDoc} + */ public void beforePhase(PhaseEvent event) { - FacesContext.getCurrentInstance().getExternalContext().log("BEFORE - " + event.getPhaseId()); + logger.info("BEFORE - " + event.getPhaseId()); } + /** + * {@inheritDoc} + */ public PhaseId getPhaseId() { return PhaseId.ANY_PHASE; } Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Template.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Template.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Template.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,74 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.testapp; + +/** + * Kids of templates that can be put in harness. + * @author carcasser + * + */ +public enum Template { + PLAIN ("plain", "", "Plain"), + RED_DIV ("reddiv", "", "Red div"); + + private String name; + + private String prefix; + + private String desc; + + /** + * Private constructor. + * + * @param name + * @param prefix + */ + private Template(String name, String prefix, String desc) { + this.name = name; + this.prefix = prefix; + this.desc = desc; + } + + /** + * Gets value of name field. + * @return value of name field + */ + public String getName() { + return name; + } + + /** + * Gets value of prefix field. + * @return value of prefix field + */ + public String getPrefix() { + return prefix; + } + + /** + * Gets value of desc field. + * @return value of desc field + */ + public String getDesc() { + return desc; + } + +} Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,200 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ + +package org.richfaces.testapp.bean; + +import java.io.Serializable; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; +import javax.faces.event.ActionEvent; + +import org.richfaces.component.html.HtmlCommandLink; +import org.richfaces.testapp.Attributes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Managed bean for a4j:commandLink. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@ManagedBean(name = "a4jLinkBean") +@SessionScoped +public class A4JCommandLinkBean implements Serializable { + + private static final long serialVersionUID = -2556076843426776944L; + private static final int ACTION_STRING_LENGTH = 6; + private static Logger logger; + private Attributes attributes; + private String input; + private String input2; + private String input3; + + /** + * Initializes the managed bean. + */ + @PostConstruct + public void init() { + logger = LoggerFactory.getLogger(A4JCommandLinkBean.class); + logger.debug("initializing bean"); + + attributes = new Attributes(HtmlCommandLink.class); + + attributes.put("value", "command link"); + attributes.put("rendered", "true"); + attributes.put("disabled", "false"); + attributes.put("action", "#{a4jLinkBean.first6CharsAction}"); + attributes.put("actionListener", "#{a4jLinkBean.toUpperCaseActionListener}"); + attributes.put("render", "output1 output2 output3"); + } + + /** + * Getter for attributes. + * + * @return A map containing all attributes of tested component. Name of the component is key in the map. + */ + public Attributes getAttributes() { + return attributes; + } + + /** + * Setter for attributes. + * + * @param attributes + * map containing all attributes of tested component. Name of the component is key in the map. + */ + public void setAttributes(Attributes attributes) { + this.attributes = attributes; + } + + /** + * Getter for input. + * + * @return value entered by a user + */ + public String getInput() { + return input; + } + + /** + * Getter for input2. + * + * @return value entered by a user modified by selected action + */ + public String getInput2() { + return input2; + } + + /** + * Getter for input3. + * + * @return value entered by a user modified by selected action listener + */ + public String getInput3() { + return input3; + } + + /** + * Setter for input. + * + * @param input + * value which user entered into text input on the page + */ + public void setInput(String input) { + this.input = input; + } + + /** + * An action that takes the first six characters from input and stores it to input2. + * + * @return null since no navigation should be performed + */ + public String first6CharsAction() { + int endIndex = input.length() > ACTION_STRING_LENGTH ? ACTION_STRING_LENGTH : input.length(); + input2 = (String) input.subSequence(0, endIndex); + return null; + } + + /** + * An action that takes user's input, doubles it and stores it to input2. + * + * @return null since no navigation should be performed + */ + public String doubleStringAction() { + if (input == null) { + input2 = ""; + } else { + input2 = input.concat(input); + } + + return null; + } + + /** + * An action that takes user's input, converts it to upper case and stores it to input2. + * + * @return null since no navigation should be performed + */ + public String toUpperCaseAction() { + input2 = input.toUpperCase(); + return null; + } + + /** + * An action listener that takes the first six characters from input and stores it to input3. + * + * @param event + * an event representing the activation of a user interface component (not used) + */ + public void first6CharsActionListener(ActionEvent event) { + int endIndex = input.length() > ACTION_STRING_LENGTH ? ACTION_STRING_LENGTH : input.length(); + input3 = (String) input.subSequence(0, endIndex); + } + + /** + * An action listener that takes user's input, doubles it and stores it to input3. + * + * @param event + * an event representing the activation of a user interface component (not used) + */ + public void doubleStringActionListener(ActionEvent event) { + if (input == null) { + input3 = ""; + } else { + input3 = input.concat(input); + } + } + + /** + * An action listener that takes user's input, converts it to upper case and stores it to input3. + * + * @param event + * an event representing the activation of a user interface component (not used) + */ + public void toUpperCaseActionListener(ActionEvent event) { + input3 = input.toUpperCase(); + } + +} Copied: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java (from rev 17812, root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/RichBean.java) =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,275 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ + +package org.richfaces.testapp.bean; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; +import javax.faces.context.FacesContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Managed bean storing glogal setting for the application, e.g. skin. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@ManagedBean +@SessionScoped +public class RichBean implements Serializable { + + private static final long serialVersionUID = 5590865106686406193L; + private Logger logger; + private String skin; + private String skinning; + private String skinningClasses; + private String skinningSelect; + private List<String> skins; + private boolean reDefault; + private boolean reComponent; + private boolean reAttributes; + private boolean reTests; + private boolean log; + private String component; + private Map<String, String> components; // [a4jCommandLink; A4J Command Link] + private String container; + + @PostConstruct + public void init() { + logger = LoggerFactory.getLogger(RichBean.class); + skins = createSkinList(); + components = createComponentsMap(); + + component = "none"; + container = "plain"; + skin = "blueSky"; + skinning = "disable"; + skinningClasses = "disable"; + reTests = false; + reComponent = true; + reAttributes = true; + } + + private Map<String, String> createComponentsMap() { + Map<String, String> components = new TreeMap<String, String>(); + + components.put("a4jCommandLink", "A4J Command Link"); + components.put("a4jCommandButton", "A4J Command Button"); + components.put("hCommandLink", "Command Link"); + components.put("progressBar", "Progress Bar"); + components.put("richDataTable", "Rich Data Table"); + + return components; + } + + private List<String> createSkinList() { + List<String> skins = new ArrayList<String>(); + skins.add("DEFAULT"); + skins.add("NULL"); + skins.add("blueSky"); + skins.add("classic"); + skins.add("deepMarine"); + skins.add("emeraldTown"); + skins.add("japanCherry"); + skins.add("plain"); + skins.add("ruby"); + skins.add("wine"); + return skins; + } + + /** + * Getter for user's skin. + * + * @return a RichFaces skin + */ + public String getSkin() { + return skin; + } + + /** + * Setter for user's skin. + * + * @param skin + * a RichFaces skin + */ + public void setSkin(String skin) { + this.skin = skin; + } + + public String getSkinning() { + if (skinningSelect.equals("skinning")) { + return "enabled"; + } else { + return "disabled"; + } + } + + public void setSkinning(String skinning) { + this.skinning = skinning; + } + + public String getSkinningClasses() { + if (skinningSelect.equals("skinning classes")) { + return "enabled"; + } else { + return "disabled"; + } + } + + public void setSkinningClasses(String skinningClasses) { + this.skinningClasses = skinningClasses; + } + + public void setSkins(List<String> skins) { + this.skins = skins; + } + + public List<String> getSkins() { + return skins; + } + + public void setReDefault(boolean reDefault) { + this.reDefault = reDefault; + } + + public boolean isReDefault() { + return reDefault; + } + + public void setReComponent(boolean reComponent) { + this.reComponent = reComponent; + } + + public boolean isReComponent() { + return reComponent; + } + + public void setReAttributes(boolean reAttributes) { + this.reAttributes = reAttributes; + } + + public boolean isReAttributes() { + return reAttributes; + } + + public void setLog(boolean log) { + this.log = log; + } + + public boolean isLog() { + return log; + } + + public void setComponent(String component) { + this.component = component; + } + + public String getComponent() { + return component; + } + + public Set<String> getComponentList() { + return components.keySet(); + } + + /** + * @return the components + */ + public Map<String, String> getComponents() { + return components; + } + + /** + * @param components the components to set + */ + public void setComponents(Map<String, String> components) { + this.components = components; + } + + public String getContainer() { + return container; + } + + public void setContainer(String container) { + this.container = container; + } + + public boolean isReTests() { + return reTests; + } + + public void setReTests(boolean reTests) { + this.reTests = reTests; + } + + public String getSkinningSelect() { + return skinningSelect; + } + + public void setSkinningSelect(String skinningSelect) { + this.skinningSelect = skinningSelect; + } + + public String getListPage(String component) { + if ("none".equals(component)) { + return "/index?faces-redirect=true"; + } else { + this.component = component; + return String.format("/components/%s/list.xhtml?faces-redirect=true", component); + } + } + + public String getTestsPage() { + if (component.equals("none")) { + return "/blank.xhtml"; + } else { + return String.format("/components/%s/tests.xhtml", component); + } + } + + public String invalidateSession() { + Object session = FacesContext.getCurrentInstance().getExternalContext().getSession(false); + + if (session == null) { + return "/index"; + } + + if (session instanceof HttpSession) { + ((HttpSession) session).invalidate(); + return FacesContext.getCurrentInstance().getViewRoot().getViewId(); + } + + throw new IllegalStateException(); + } +} Added: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java (rev 0) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/TemplateBean.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,154 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.testapp.bean; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.el.ELException; +import javax.el.ExpressionFactory; +import javax.el.MethodExpression; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; +import javax.faces.model.SelectItem; + +import org.richfaces.testapp.Template; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ManagedBean +@SessionScoped +public class TemplateBean implements Serializable { + + private static final long serialVersionUID = 5078700314562231363L; + + private static final Logger logger = LoggerFactory.getLogger(TemplateBean.class); + + static final List<String> dataTableModel = new ArrayList<String>(); + static { + dataTableModel.add("1"); + dataTableModel.add("2"); + } + + public static final String PARAM_NAME = "t"; + + private Template template = Template.PLAIN; + + private Template templatePath = Template.PLAIN; + + private String methodName; + + private Integer dataTableRowIndex = 0; + + public String getTemplateId() { + return template.toString(); + } + + public void setTemplateId(String template) { + this.template = Template.valueOf(template); +// if (this.template.equals(Template.DATA_TABLE)) { +// dataTableRowIndex = 0; +// } else if (this.template.equals(Template.DATA_TABLE2)) { +// dataTableRowIndex = 1; +// } + + } + + public String getParentId() { + return template.getPrefix(); + } + + /** + * @return the template + */ + public String getTemplate() { + return "/templates/" + template.getName() + ".xhtml"; + } + + /** + * @return the template + */ + public String getAutoTestTemplate() { + return "/templates/autotest/" + template.getName() + ".xhtml"; + } + + /** + * @return the template + */ + public String getTemplatePath() { + return template.getName() + ".xhtml"; + } + + /** + * @param template + * the template to set + */ + public void setTemplate(Template template) { + this.template = template; + } + + public void setTemplatePath(Template templatePath) { + this.templatePath = templatePath; + } + + public List<SelectItem> getAvailableTemplates() { + List<SelectItem> retVal = new ArrayList<SelectItem>(); + for (Template template : Template.values()) { + retVal.add(new SelectItem(template.toString(), template.getDesc())); + } + + return retVal; + } + + /** + * @return the methodName + */ + public String getMethodName() { + return methodName; + } + + /** + * @param methodName + * the methodName to set + */ + public void setMethodName(String methodName) { + this.methodName = methodName; + } + + /** + * @return the dataTableRowIndex + */ + public Integer getDataTableRowIndex() { + return dataTableRowIndex; + } + + /** + * @return the dataTableModel + */ + public List<String> getDataTableModel() { + return dataTableModel; + } + +} \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkAttributes.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,460 +0,0 @@ -package org.richfaces.testapp.commandlink; - -public class LinkAttributes { - - private String render = "output1,output2,output3,output4"; - private String value = "update"; - private boolean disabled = false; - private boolean ajaxSingle = false; - private boolean bypassUpdates = false; - private boolean rendered = true; - private String action; - private String actionListener; - private String style; - private String styleClass; - private String lang; - private String title; - private String dir; - private String hreflang; - private String charset; - private String focus; - private String accesskey; - private String target; - private String coords; - private String rel; - private String rev; - private String shape = "default"; - private String type; - private int tabindex; - - private String onbeforedomupdate; - private String onblur; - private String onclick; - private String oncomplete; - private String ondblclick; - private String onfocus; - private String onkeydown; - private String onkeypress; - private String onkeyup; - private String onmousedown; - private String onmousemove; - private String onmouseout; - private String onmouseover; - private String onmouseup; - - private boolean limitRender; - private String queue; - private int requestDelay; - private boolean ignoreDupResponses; - private String process; - private boolean immediate; - - private String onbegin; - private String onsuccess; - private String onerror; - private String data; - private String onsubmit; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getAccesskey() { - return accesskey; - } - - public void setAccessKey(String accesskey) { - this.accesskey = accesskey; - } - - public boolean isAjaxSingle() { - return ajaxSingle; - } - - public void setAjaxSingle(boolean ajaxSingle) { - this.ajaxSingle = ajaxSingle; - } - - public String getLang() { - return lang; - } - - public void setLang(String lang) { - this.lang = lang; - } - - public String getRender() { - return render; - } - - public void setRender(String render) { - this.render = render; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public boolean isLimitRender() { - return limitRender; - } - - public void setLimitRender(boolean limitRender) { - this.limitRender = limitRender; - } - - public String getQueue() { - return queue; - } - - public void setQueue(String queue) { - this.queue = queue; - } - - public int getRequestDelay() { - return requestDelay; - } - - public void setRequestDelay(int requestDelay) { - this.requestDelay = requestDelay; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public boolean isIgnoreDupResponses() { - return ignoreDupResponses; - } - - public void setIgnoreDupResponses(boolean ignoreDupResponses) { - this.ignoreDupResponses = ignoreDupResponses; - } - - public String getProcess() { - return process; - } - - public void setProcess(String process) { - this.process = process; - } - - public boolean isImmediate() { - return immediate; - } - - public void setImmediate(boolean immediate) { - this.immediate = immediate; - } - - public boolean isBypassUpdates() { - return bypassUpdates; - } - - public void setBypassUpdates(boolean bypassUpdates) { - this.bypassUpdates = bypassUpdates; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getActionListener() { - return actionListener; - } - - public void setActionListener(String actionListener) { - this.actionListener = actionListener; - } - - public String getCharset() { - return charset; - } - - public void setCharset(String charset) { - this.charset = charset; - } - - public String getCoords() { - return coords; - } - - public void setCoords(String coords) { - this.coords = coords; - } - - public String getRel() { - return rel; - } - - public void setRel(String rel) { - this.rel = rel; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public int getTabindex() { - return tabindex; - } - - public void setTabindex(int tabindex) { - this.tabindex = tabindex; - } - - public String getShape() { - return shape; - } - - public void setShape(String shape) { - this.shape = shape; - } - - public void setAccesskey(String accesskey) { - this.accesskey = accesskey; - } - - public String getOnsubmit() { - return onsubmit; - } - - public void setOnsubmit(String onsubmit) { - this.onsubmit = onsubmit; - } - - public String getOnbegin() { - return onbegin; - } - - public void setOnbegin(String onbegin) { - this.onbegin = onbegin; - } - - public String getOnclick() { - return onclick; - } - - public void setOnclick(String onclick) { - this.onclick = onclick; - } - - public String getOnsuccess() { - return onsuccess; - } - - public void setOnsuccess(String onsuccess) { - this.onsuccess = onsuccess; - } - - public String getOncomplete() { - return oncomplete; - } - - public void setOncomplete(String oncomplete) { - this.oncomplete = oncomplete; - } - - public String getOnerror() { - return onerror; - } - - public void setOnerror(String onerror) { - this.onerror = onerror; - } - - public String getOnbeforedomupdate() { - return onbeforedomupdate; - } - - public void setOnbeforedomupdate(String onbeforedomupdate) { - this.onbeforedomupdate = onbeforedomupdate; - } - - public String getOnblur() { - return onblur; - } - - public void setOnblur(String onblur) { - this.onblur = onblur; - } - - public String getOndblclick() { - return ondblclick; - } - - public void setOndblclick(String ondblclick) { - this.ondblclick = ondblclick; - } - - public String getOnfocus() { - return onfocus; - } - - public void setOnfocus(String onfocus) { - this.onfocus = onfocus; - } - - public String getOnkeydown() { - return onkeydown; - } - - public void setOnkeydown(String onkeydown) { - this.onkeydown = onkeydown; - } - - public String getOnkeypress() { - return onkeypress; - } - - public void setOnkeypress(String onkeypress) { - this.onkeypress = onkeypress; - } - - public String getOnkeyup() { - return onkeyup; - } - - public void setOnkeyup(String onkeyup) { - this.onkeyup = onkeyup; - } - - public String getOnmousedown() { - return onmousedown; - } - - public void setOnmousedown(String onmousedown) { - this.onmousedown = onmousedown; - } - - public String getOnmousemove() { - return onmousemove; - } - - public void setOnmousemove(String onmousemove) { - this.onmousemove = onmousemove; - } - - public String getOnmouseout() { - return onmouseout; - } - - public void setOnmouseout(String onmouseout) { - this.onmouseout = onmouseout; - } - - public String getOnmouseover() { - return onmouseover; - } - - public void setOnmouseover(String onmouseover) { - this.onmouseover = onmouseover; - } - - public String getOnmouseup() { - return onmouseup; - } - - public void setOnmouseup(String onmouseup) { - this.onmouseup = onmouseup; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getRev() { - return rev; - } - - public void setRev(String rev) { - this.rev = rev; - } - - public boolean isDisabled() { - return disabled; - } - - public void setDisabled(boolean disabled) { - this.disabled = disabled; - } - - public String getFocus() { - return focus; - } - - public void setFocus(String focus) { - this.focus = focus; - } - - public String getDir() { - return dir; - } - - public void setDir(String dir) { - this.dir = dir; - } - - public String getStyle() { - return style; - } - - public void setStyle(String style) { - this.style = style; - } - - public String getStyleClass() { - return styleClass; - } - - public void setStyleClass(String styleClass) { - this.styleClass = styleClass; - } - - public void setHreflang(String hreflang) { - this.hreflang = hreflang; - } - - public String getHreflang() { - return hreflang; - } - - public void setRendered(boolean rendered) { - this.rendered = rendered; - } - - public boolean isRendered() { - return rendered; - } - - public static LinkAttributes getInstanceTestDisabled() { - LinkAttributes cLinkBean = new LinkAttributes(); - cLinkBean.setDisabled(true); - return cLinkBean; - } - -} Deleted: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/commandlink/LinkBean.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,140 +0,0 @@ -/******************************************************************************* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - *******************************************************************************/ - -package org.richfaces.testapp.commandlink; - -import java.util.List; -import java.util.Set; - -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -import org.richfaces.testapp.model.People; -import org.richfaces.testapp.model.Person; - -/** - * - * - * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> - * @version $Revision$ - */ -@ManagedBean -@SessionScoped -public class LinkBean { - - private LinkAttributes attrs; - private String input; - private String input2; - private String input3; - private People people; - private int id; - - @PostConstruct - public void init() { - attrs = new LinkAttributes(); - } - - public LinkAttributes getAttrs() { - return attrs; - } - - public void setAttrs(LinkAttributes attrs) { - this.attrs = attrs; - } - - public String getInput() { - return input; - } - - public String getInput2() { - return input2; - } - - public String getInput3() { - return input3; - } - - public void setInput(String input) { - this.input = input; - } - - public List<Person> getPeople() { - if (people == null) { - people = new People(); - } - - return people.getPeople(); - } - - public void setPeople(List<Person> people) { - this.people.setPeople(people); - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public void runTestDisabled() { - attrs = LinkAttributes.getInstanceTestDisabled(); - } - - public String first6CharsAction() { - int endIndex = input.length() > 6 ? 6 : input.length(); - input2 = (String) input.subSequence(0, endIndex); - return null; - } - - public void toUpperCaseActionListener(ActionEvent e) { - input3 = input.toUpperCase(); - } - - public String first6CharsNameAction() { - for (Person p : getPeople()) { - if (p.getId() == id) { - p.setUpperCaseName(p.getName().toUpperCase()); - input = p.getName(); - int endIndex = input.length() > 6 ? 6 : input.length(); - input2 = (String) input.subSequence(0, endIndex); - p.setShortName(input2); - break; - } - } - - return null; - } - - public void toUpperCaseNameActionListener(ActionEvent e) { - for (Person p : getPeople()) { - if (p.getId() == id) { - p.setUpperCaseName(p.getName().toUpperCase()); - break; - } - } - } -} Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/model/People.java 2010-07-10 18:08:18 UTC (rev 17813) @@ -27,7 +27,6 @@ import java.util.Calendar; import java.util.List; import java.util.TimeZone; -import org.richfaces.testapp.model.Person; /** * Deleted: root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/mediaOutput/text.swf =================================================================== --- root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/mediaOutput/text.swf 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/mediaOutput/text.swf 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,50 +0,0 @@ -CWSD1 -۾���Ŧg�3fe�ǁ[���e|��¹����P�3��F�a{_�&��Y�m9�`���Xqw^�y�����/��亶��b�jMޝ�j{�c3�FQ�尼�uD��}k�L��gmr
�}��r��$y��!�b�J�5��i -ו��q��F
w��_H��a�L�����[=R��-g$�H�o]mğ�[��f;[�U6K-Mo�y��xM�Z�����n{��M٧�#��v%��Co'8/�����Z�]/�j%�����r���/�y}^5�kg�����v�ƨ����Xڻ���Q��K9�����?mr�S����/�1Y����DK�;>���/���^aR�R��w^�X�w��z~���᛻��Vz�b�#��<�5�Ə�?Y��Fʑ���Փ*�Y�'Jr�;�ly��^c\�����v��Yc��ޕ��}S�H�=�p�¥lE������D��T��j��%����)8���:��u������>-���Ǘ�LL`_��b9n=�JШ��v!���1�?�̖�Z&���v��\�=Z���~%��L�*��,տ|�!T�nSXi��̝˗�'d����%f/'�"R#Tl-�?dnP��R�f�D
��b�|��p��U�?�����'.� &z�F;i���S�&}�IL���:o��ӭrX� -��_��ڊ�U�_7Q�A�Cc�Pml3/`�k�S�4 -����n����J�ӕ�wN� �%T{�=,��7"�N�&"����u�/�=׉��7\��˱3_��ɢ������VN�8bSOz��߸Į�I�UH��j)��{|ӌ���gvB�T�@���a�LbVվΥy����;�8���m�]?2�|�� �\h��/��P�8��=��֖�o��sv;�OJ��8�~?�aW���,_΅���9S�@`!`-��g ���ƴf��G[��BE�o��֙0&�|{j�֬09�����/W���א�|�uct�������o����ă��=(Xc)z|����-�[v׳B��=�pa,�ЩvV�8��2�ek�Of �bS,%n��x�bp8M��f���u�/�ԉ'�.����bI�4��_m}g��o�S�w�g�2�a=3j祱��f_2s=;�5UE��vA��$7ABخ7F�6�X���k� -s���,����f���X;�f�F��~��t�,�3e�6�<�L���O�q�S�}lG��|�a�\f��vְ���&�M��T�$7���~ʡ�U��b����YK�>�Y�5p�G�ۚ��1�ܫXg���M��G�ґ����n�� R����[�[/�Rq��Ӎ�v���^W˽��MY\�N�BD"�3���o.�FěHU�!�ʥ��'�b��XZ|w2��5��K�:�� -�/<2��[�={I�q�ڔEq7U -b} -� �&����tSŲ���4�>�s�VmK�9�ϸ�fIj��]��� -�#�~l�
�i�-5��v]>:�qOr� -�5��I|��7��� -���-]�*�oE��fJX�%��fl[�%����eG���9#;mR@˴���E��5��p"6^�7�C�[� -gI�=6�_̰����$�`I(�K
>�[6m -�J�|���$H�SWI�#_&Uz{���?���*��K"IZ�M����[�bGT�O��Vb��7؅��^� -2�P��/j�{��l`:h�k���;�$ִ�}��%����Y힯��w4���w�|�]_[���a�4���2����+G -�i��.᷶rb^��1 -�{�������D��3G`�h�߈/��mǍ,�^��GJ��������0h�f�y��ٵ�Ri��¿m���C�*���Tzz�Lͼ�.�<�v����� -gY��tp��"C �%=����q ���ǧk��}ub�Ǵg�B�4��W�(J9�L0�l��u��A���B=]M`�!C ��Ks���� -o��L*2�����Xҵ6e � S�m����1�'#qo?�;i��ࡨ�]�s�*��n4�;�ӟS|���Y��#C �9nd�9y|��4R�*����B��Xxt�,d(�#2xɦ�c�x6:ӌ�[��f�PFzY,|+J�HW�����|���L�GC�ov�ޮ���;��[�t��{mO3^3}�G-�tW��1E>2��3F�`̗�n��l�U�H��?5���>����Q��'���l���÷��%�DJq�s��&Q��F(������A��/�z��V�?.!�����Y�?"�yZ�����[����/�� -�E ���<x�I>�k� SҲ~[��'�&˴�>� -�p�92�9�/�^Z�'��nd(Ac�����V���4����k�w��G]���[2��an�󡪣u0�43��Ŀ4߽:�xY>�֋%hh���x�#I3r�r^�dnFM�� -cџ�P�z����|�$�A��Z��r����~��_)��9�&*�u��@�X�{�н���'��npK٘c� ��z�W}#l�l:�"���'��?���h� s,D�+�>�Z� A�s,�ޮ͖���� ��hO�0�A��jv��5� -:�"+r9 -d௚�܅�>�1�At\j�Nn�_ �9y�t���\pۓ�B46�X ���,�ǽ�?�αȋRλ�=m�ùލ�@�QԄE���#���<m��$y�M�n�Z�٘c� -��V0y�t�E/�i"�m�Z��xt�P��禃O�{8��l:�"��ZbOfJg��| -󗭇%������i�K�MgY䟭��<����'�A2@�Do�*�F���4��;��,�M+�<���6B�D�����O�D�γ��ǧאw��=���� � D "�[>�xsW���D�� c,A68�7p>Ɖj�%�&��O湭;�W�3-��픭���S�� �dg#D "����<�V^�N�H������6�ܹ�>B�!J)ތL�E���+ѹ��K�[%{mߕk-v(a�BE�U��:� -�'���HU9����aq5
�t�1?�b؁��;{����3R�AF�|\���i� a~BY[��I�N���æ�3R�B�S����j�O���1?��w��� ��)S(�T~f����ғ `c~B���.�G�"C�g��!;������x5=���k�P6^�T����k�X�K,\�i��@��\���5�*�I�2:�"Y)�ݒ���L8J�k�P�D�ǭ�&��t�E�IJ�(�q<ݍQ�\�{>��:�� -1��I� ����M��-�� * ���s�]����2x��$(�&:_LP�T������uyޘ -y�-1�qQުŹ98`����dbſnL�Β6�1���s��
.�C���:b-N�`��Ǧ�-݀�M�<�A�v��f���&i8=��&�i��͗9?a�|%p/��'L\�v}�X��� -���_�$>�� �� ��%�`������O|0‰����8xd2�`8i� -1��p6�ڭ"4�y�Ù΍,(�#]|�C�k�<�͙aD��_1���o�d6"d�` N���a�8��ȆW�yψ*AD�]��"q�1��B -Ŏ��x���U(����x�Ym��J�j�6$���,Ä��b�YՁ�Mr�p�;���{�L6a��Y=�"ѩ�hZG��GPVz��w�f� -�Q�����0J\�����]�R�|Ŭ�A�k�N-�7�`�e��C�:\�Q̲T�|���"��ݠq�B����|���y+��A�/��0�Pf!�>��BO��`�����z�< -fV,�0��&�1�P�J��,�g�F����+���qG�CC�V�'��$�j�P� -ך����,�BM�G���P����S��fV��x��� �S�`���氯���0��P���ـ�I�`�| -u���׆�Ƭ�C9�;���H�`�N��u��J�̂<�ݽ�0���RV����̬�C�ߛ��_�`��-
a�q�rd�@'����&�I j1�ރ��ɃE#{f/�,x���](_0�� -��4�ۛ��)������mTT�TXS�����mT�_U�x��6�]����o -��ò]ܮ}\q��|4�maT��d����-�ń��p��1�Ϩ.3�&����;��gT_�7���Kc��Q�l�M��x�u��ܨ��o�����l������w!�#n����NG�����,�m���[�?^O��m�����p��~>fw ��[�M?�݁T�භ�!2�q�JK�����!hG�5��?��� \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/WEB-INF/web.xml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/WEB-INF/web.xml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,7 +1,7 @@ <?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" - id="richfaces-demo" version="2.5"> + version="2.5"> <display-name>testapp</display-name> <welcome-file-list> <welcome-file>faces/index.xhtml</welcome-file> Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/attributes.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,210 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - <h:outputStylesheet library="css" name="commandLink.css" /> - - <h:panelGrid id="attributes" columns="2"> - <h:outputLabel id="disabledLabel" value="disabled" for="disabledCheckbox" /> - <h:selectBooleanCheckbox id="disabledCheckbox" value="#{linkBean.attrs.disabled}"> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectBooleanCheckbox> - - <h:outputLabel id="renderedLabel" value="rendered" for="renderedCheckbox" /> - <h:selectBooleanCheckbox id="renderedCheckbox" value="#{linkBean.attrs.rendered}"> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectBooleanCheckbox> - - <h:outputLabel id="valueLabel" value="value" for="valueInput" /> - <h:inputText id="valueInput" value="#{linkBean.attrs.value}"> - <a4j:ajax event="keyup" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="renderLabel" value="render" for="renderSelect" /> - <h:selectOneRadio id="renderSelect" value="#{linkBean.attrs.render}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="output1" itemValue="output1" /> - <f:selectItem itemLabel="output2" itemValue="output2" /> - <f:selectItem itemLabel="all" itemValue="output1,output2,output3,output4" /> - <a4j:ajax even="change" render="commandLink" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="focusLabel" value="focus" for="focusInput" /> - <h:inputText id="focusInput" value="#{linkBean.attrs.focus}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="styleLabel" value="style" for="styleInput" /> - <h:inputText id="styleInput" value="#{linkBean.attrs.style}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="styleClassLabel" value="styleClass" for="styleClassSelect" /> - <h:selectOneRadio id="styleClassSelect" value="#{linkBean.attrs.styleClass}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="big" itemValue="big" /> - <f:selectItem itemLabel="red + big" itemValue="red big" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="langLabel" value="lang" for="langSelect" /> - <h:selectOneRadio id="langSelect" value="#{linkBean.attrs.lang}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="en" itemValue="en" /> - <f:selectItem itemLabel="sk" itemValue="sk" /> - <f:selectItem itemLabel="ru" itemValue="ru" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="hreflangLabel" value="hreflang" for="hreflangSelect" /> - <h:selectOneRadio id="hreflangSelect" value="#{linkBean.attrs.hreflang}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="en" itemValue="en" /> - <f:selectItem itemLabel="sk" itemValue="sk" /> - <f:selectItem itemLabel="ru" itemValue="ru" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="charsetLabel" value="charset" for="charsetSelect" /> - <h:selectOneRadio id="charsetSelect" value="#{linkBean.attrs.charset}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="utf-8" itemValue="utf-8" /> - <f:selectItem itemLabel="iso-8859-1" itemValue="iso-8859-1" /> - <f:selectItem itemLabel="iso-8859-2" itemValue="iso-8859-2" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="dirLabel" value="dir" for="dirSelect" /> - <h:selectOneRadio id="dirSelect" value="#{linkBean.attrs.dir}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="ltr" itemValue="ltr" /> - <f:selectItem itemLabel="rtl" itemValue="rtl" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="targetLabel" value="target" for="targetSelect" /> - <h:selectOneRadio id="targetSelect" value="#{linkBean.attrs.target}"> - <f:selectItem itemLabel="none" itemValue="" /> - <f:selectItem itemLabel="_self" itemValue="_self" /> - <f:selectItem itemLabel="_blank" itemValue="_blank" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="shapeLabel" value="shape" for="shapeSelect" /> - <h:selectOneRadio id="shapeSelect" value="#{linkBean.attrs.shape}"> - <f:selectItem itemLabel="default" itemValue="default" /> - <f:selectItem itemLabel="rect" itemValue="rect" /> - <f:selectItem itemLabel="circle" itemValue="circle" /> - <f:selectItem itemLabel="poly" itemValue="poly" /> - <a4j:ajax even="change" render="panel" execute="@this" /> - </h:selectOneRadio> - - <h:outputLabel id="typeLabel" value="type" for="typeInput" /> - <h:inputText id="typeInput" value="#{linkBean.attrs.type}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="titleLabel" value="title" for="titleInput" /> - <h:inputText id="titleInput" value="#{linkBean.attrs.title}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="accesskeyLabel" value="accesskey" for="accesskeyInput" /> - <h:inputText id="accesskeyInput" value="#{linkBean.attrs.accesskey}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="coordsLabel" value="coords" for="coordsInput" /> - <h:inputText id="coordsInput" value="#{linkBean.attrs.coords}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="relLabel" value="rel" for="relInput" /> - <h:inputText id="relInput" value="#{linkBean.attrs.rel}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="revLabel" value="rev" for="revInput" /> - <h:inputText id="revInput" value="#{linkBean.attrs.rev}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="tabindexLabel" value="tabindex" for="tabindexInput" /> - <h:inputText id="tabindexInput" value="#{linkBean.attrs.tabindex}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onbeforedomupdateLabel" value="onbeforedomupdate" for="onbeforedomupdateInput" /> - <h:inputText id="onbeforedomupdateInput" value="#{linkBean.attrs.onbeforedomupdate}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onblurLabel" value="onblur" for="onblurInput" /> - <h:inputText id="onblurInput" value="#{linkBean.attrs.onblur}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onclickLabel" value="onclick" for="onclickInput" /> - <h:inputText id="onclickInput" value="#{linkBean.attrs.onclick}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="oncompleteLabel" value="oncomplete" for="oncompleteInput" /> - <h:inputText id="oncompleteInput" value="#{linkBean.attrs.oncomplete}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="ondblclickLabel" value="ondblclick" for="ondblclickInput" /> - <h:inputText id="ondblclickInput" value="#{linkBean.attrs.ondblclick}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onfocusLabel" value="onfocus" for="onfocusInput" /> - <h:inputText id="onfocusInput" value="#{linkBean.attrs.onfocus}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onkeydownLabel" value="onkeydown" for="onkeydownInput" /> - <h:inputText id="onkeydownInput" value="#{linkBean.attrs.onkeydown}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onkeypressLabel" value="onkeypress" for="onkeypressInput" /> - <h:inputText id="onkeypressInput" value="#{linkBean.attrs.onkeypress}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onkeyupLabel" value="onkeyup" for="onkeyupInput" /> - <h:inputText id="onkeyupInput" value="#{linkBean.attrs.onkeyup}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onmousedownLabel" value="onmousedown" for="onmousedownInput" /> - <h:inputText id="onmousedownInput" value="#{linkBean.attrs.onmousedown}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onmousemoveLabel" value="onmousemove" for="onmousemoveInput" /> - <h:inputText id="onmousemoveInput" value="#{linkBean.attrs.onmousemove}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onmouseoutLabel" value="onmouseout" for="onmouseoutInput" /> - <h:inputText id="onmouseoutInput" value="#{linkBean.attrs.onmouseout}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onmouseoverLabel" value="onmouseover" for="onmouseoverInput" /> - <h:inputText id="onmouseoverInput" value="#{linkBean.attrs.onmouseover}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - <h:outputLabel id="onmouseupLabel" value="onmouseup" for="onmouseupInput" /> - <h:inputText id="onmouseupInput" value="#{linkBean.attrs.onmouseup}"> - <a4j:ajax event="blur" render="panel" execute="@this" /> - </h:inputText> - - </h:panelGrid> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/dataTable.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,83 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - <h:panelGrid id="panel"> - <h:dataTable id="linkDataTable" value="#{linkBean.people}" var="person" > - <f:facet name="header"> - <h:outputText value="List of famous people" /> - </f:facet> - - <h:column> - <f:facet name="header"> - <h:outputText value="Name" /> - </f:facet> - <h:inputText id="input" value="#{person.name}" style="width: 200px;" /> - </h:column> - - <h:column id="commandLink"> - <f:facet name="header"> - <h:outputText value="Update" /> - </f:facet> - <a4j:commandLink id="commandLinka" action="#{linkBean.first6CharsNameAction}" - actionListener="#{linkBean.toUpperCaseNameActionListener}" disabled="#{linkBean.attrs.disabled}" - value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" - styleClass="#{linkBean.attrs.styleClass}" lang="#{linkBean.attrs.lang}" - title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" hreflang="#{linkBean.attrs.hreflang}" - render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" onsubmit="alert('onsubmit')" - onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" onblur="#{linkBean.attrs.onblur}" - onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" - ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" - onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" - onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" - onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" - onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" - accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" - bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" - rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" - coords="#{linkBean.attrs.coords}" rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" - shape="#{linkBean.attrs.shape}" tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}"> - - <f:setPropertyActionListener target="#{linkBean.id}" value="#{person.id}"/> - </a4j:commandLink> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText value="output1" /> - </f:facet> - <h:outputText id="output1" value="#{person.name}" /> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText value="output2" /> - </f:facet> - <h:outputText id="output2" value="#{person.name}" /> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText value="action (first 6 chars)" /> - </f:facet> - <h:outputText id="output3" value="#{person.shortName}" /> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText value="action listener (upper case)" /> - </f:facet> - <h:outputText id="output4" value="#{person.upperCaseName}" /> - </h:column> - - <f:facet name="footer"> - <h:outputText value="List of famous people" /> - </f:facet> - - </h:dataTable> - - </h:panelGrid> - - <a4j:commandButton value="Rerender" render="panel" /> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/extendedDataTable.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,25 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - There will be a command link inside extended data table. - - <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" - actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" - value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" - lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" - hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" - onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" - onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" - ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" - onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" - onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" - onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" - onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" - accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" - bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" - rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" coords="#{linkBean.attrs.coords}" - rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" shape="#{linkBean.attrs.shape}" - tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/modalPanel.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,25 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - There will be a command link inside modal panel. - - <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" - actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" - value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" - lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" - hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" - onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" - onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" - ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" - onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" - onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" - onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" - onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" - accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" - bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" - rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" coords="#{linkBean.attrs.coords}" - rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" shape="#{linkBean.attrs.shape}" - tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/panel.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,25 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - There will be a command link inside panel. - - <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" - actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" - value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" - lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" - hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" - onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" - onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" oncomplete="#{linkBean.attrs.oncomplete}" - ondblclick="#{linkBean.attrs.ondblclick}" onfocus="#{linkBean.attrs.onfocus}" - onkeydown="#{linkBean.attrs.onkeydown}" onkeypress="#{linkBean.attrs.onkeypress}" - onkeyup="#{linkBean.attrs.onkeyup}" onmousedown="#{linkBean.attrs.onmousedown}" - onmousemove="#{linkBean.attrs.onmousemove}" onmouseout="#{linkBean.attrs.onmouseout}" - onmouseover="#{linkBean.attrs.onmouseover}" onmouseup="#{linkBean.attrs.onmouseup}" - accesskey="#{linkBean.attrs.accesskey}" ajaxSingle="#{linkBean.attrs.ajaxSingle}" - bypassUpdates="#{linkBean.attrs.bypassUpdates}" charset="#{linkBean.attrs.charset}" - rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" coords="#{linkBean.attrs.coords}" - rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" shape="#{linkBean.attrs.shape}" - tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/plain.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,37 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - <h:panelGrid id="panel" columns="2"> - <h:inputText id="input" value="#{linkBean.input}" /> - - <a4j:commandLink id="commandLink" action="#{linkBean.first6CharsAction}" - actionListener="#{linkBean.toUpperCaseActionListener}" disabled="#{linkBean.attrs.disabled}" - value="#{linkBean.attrs.value}" style="#{linkBean.attrs.style}" styleClass="#{linkBean.attrs.styleClass}" - lang="#{linkBean.attrs.lang}" title="#{linkBean.attrs.title}" dir="#{linkBean.attrs.dir}" - hreflang="#{linkBean.attrs.hreflang}" render="#{linkBean.attrs.render}" focus="#{linkBean.attrs.focus}" - onsubmit="alert('onsubmit')" onbeforedomupdate="#{linkBean.attrs.onbeforedomupdate}" - onblur="#{linkBean.attrs.onblur}" onclick="#{linkBean.attrs.onclick}" - oncomplete="#{linkBean.attrs.oncomplete}" ondblclick="#{linkBean.attrs.ondblclick}" - onfocus="#{linkBean.attrs.onfocus}" onkeydown="#{linkBean.attrs.onkeydown}" - onkeypress="#{linkBean.attrs.onkeypress}" onkeyup="#{linkBean.attrs.onkeyup}" - onmousedown="#{linkBean.attrs.onmousedown}" onmousemove="#{linkBean.attrs.onmousemove}" - onmouseout="#{linkBean.attrs.onmouseout}" onmouseover="#{linkBean.attrs.onmouseover}" - onmouseup="#{linkBean.attrs.onmouseup}" accesskey="#{linkBean.attrs.accesskey}" - ajaxSingle="#{linkBean.attrs.ajaxSingle}" bypassUpdates="#{linkBean.attrs.bypassUpdates}" - charset="#{linkBean.attrs.charset}" rendered="#{linkBean.attrs.rendered}" target="#{linkBean.attrs.target}" - coords="#{linkBean.attrs.coords}" rel="#{linkBean.attrs.rel}" rev="#{linkBean.attrs.rev}" - shape="#{linkBean.attrs.shape}" tabindex="#{linkBean.attrs.tabindex}" type="#{linkBean.attrs.type}" /> - - </h:panelGrid> - - <h:panelGrid id="outputs" columns="2"> - output1: <h:outputText value="#{linkBean.input}" id="output1" /> - output2: <h:outputText value="#{linkBean.input}" id="output2" /> - action (first 6 chars): <h:outputText value="#{linkBean.input2}" id="output3" /> - action listener (upper case):<h:outputText value="#{linkBean.input3}" id="output4" /> - </h:panelGrid> - - <a4j:commandButton value="Rerender" render="panel, outputs" /> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/commandLink/tests.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/commandLink/tests.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/commandLink/tests.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,10 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - <h:panelGrid columns="2"> - <a4j:commandButton id="testDisabledLink" value="Run test" action="#{linkBean.runTestDisabled}" render="componentForm"/> - disabled = true - - </h:panelGrid> -</ui:composition> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/list.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/list.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/list.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,18 @@ +<!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" xmlns:rich="http://java.sun.com/jsf/composite/rich" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> + +<h:head> + <title>A4J Command Link</title> + <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" /> + <!-- <h:outputStylesheet library="css" name="common.css" />--> +</h:head> + +<h:body> + + <h3><h:outputLink value="simple.xhtml">Simple</h:outputLink></h3> + <div>Simple page that contain command link and input boxes for all its attributes.</div> + +</h:body> +</html> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,59 @@ +<!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" xmlns:rich="http://java.sun.com/jsf/composite/rich" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> + +<ui:composition template="#{templateBean.template}"> + + <ui:define name="outOfTemplateBefore"> + </ui:define> + + <ui:define name="component"> + <!-- <h:outputStylesheet library="css" name="a4jCommandLink.css" target="head"/> --> + + <h:panelGrid id="panel" columns="2"> + <h:inputText id="input" value="#{a4jLinkBean.input}" /> + + <a4j:commandLink id="a4jCommandLink" accesskey="#{a4jLinkBean.attributes['accesskey']}" + action="#{a4jLinkBean.attributes.action}" actionListener="#{a4jLinkBean.attributes.actionListener}" + charset="#{a4jLinkBean.attributes['charset']}" coords="#{a4jLinkBean.attributes['coords']}" + dir="#{a4jLinkBean.attributes['dir']}" disabled="#{a4jLinkBean.attributes['disabled']}" + hreflang="#{a4jLinkBean.attributes['hreflang']}" immediate="#{a4jLinkBean.attributes['immediate']}" + lang="#{a4jLinkBean.attributes['lang']}" onblur="#{a4jLinkBean.attributes['onblur']}" + onclick="#{a4jLinkBean.attributes['onclick']}" ondblclick="#{a4jLinkBean.attributes['ondblclick']}" + onfocus="#{a4jLinkBean.attributes['onfocus']}" onkeydown="#{a4jLinkBean.attributes['onkeydown']}" + onkeypress="#{a4jLinkBean.attributes['onkeypress']}" onkeyup="#{a4jLinkBean.attributes['onkeyup']}" + onmousedown="#{a4jLinkBean.attributes['onmousedown']}" + onmousemove="#{a4jLinkBean.attributes['onmousemove']}" + onmouseout="#{a4jLinkBean.attributes['onmouseout']}" + onmouseover="#{a4jLinkBean.attributes['onmouseover']}" + onmouseup="#{a4jLinkBean.attributes['onmouseup']}" rel="#{a4jLinkBean.attributes['rel']}" + render="#{a4jLinkBean.attributes['render']}" rendered="#{a4jLinkBean.attributes['rendered']}" + rev="#{a4jLinkBean.attributes['rev']}" shape="#{a4jLinkBean.attributes['shape']}" + style="#{a4jLinkBean.attributes['style']}" styleClass="#{a4jLinkBean.attributes['styleClass']}" + tabindex="#{a4jLinkBean.attributes['tabindex']}" target="#{a4jLinkBean.attributes['target']}" + title="#{a4jLinkBean.attributes['title']}" type="#{a4jLinkBean.attributes['type']}" + value="#{a4jLinkBean.attributes['value']}" /> + + </h:panelGrid> + + <h:panelGrid id="outputs" columns="2"> + output: <h:outputText value="#{a4jLinkBean.input}" id="output1" /> + action: <h:outputText value="#{a4jLinkBean.input2}" id="output2" /> + action listener:<h:outputText value="#{a4jLinkBean.input3}" id="output3" /> + </h:panelGrid> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h:panelGrid id="attributes" columns="4"> + <c:forEach items="#{a4jLinkBean.attributes}" var="entry"> + <h:outputLabel id="#{entry.key}Label" value="#{entry.key}" /> + <h:inputText id="#{entry.key}Input" value="#{a4jLinkBean.attributes[entry.key]}"> + <a4j:ajax event="blur" render="panel" /> + </h:inputText> + </c:forEach> + </h:panelGrid> + </ui:define> + +</ui:composition> +</html> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/includes/components.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,24 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - <h:outputLabel id="componentLabel" for="componentSelect" value="Component:" /> - - <h:selectOneMenu id="componentSelect" value="#{richBean.component}" immediate="true" style="width: 100%;"> - <f:selectItem itemLabel="-- None --" itemValue="none" /> - <f:selectItem itemLabel="Command Link" itemValue="commandLink" /> - </h:selectOneMenu> - - <h:outputLabel id="containerLabel" for="containerSelect" value="Container:" /> - - <h:selectOneMenu id="containerSelect" value="#{richBean.container}" immediate="true"> - <f:selectItem itemLabel="-- None --" itemValue="plain" /> - <f:selectItem itemLabel="Data Table" itemValue="dataTable" /> - <f:selectItem itemLabel="Extended Data Table" itemValue="extendedDataTable" /> - <f:selectItem itemLabel="Modal Panel" itemValue="modalPanel" /> - <f:selectItem itemLabel="Panel" itemValue="panel" /> - </h:selectOneMenu> - - <h:commandButton action="/index" value="Submit" /> - -</ui:composition> \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,66 +0,0 @@ -<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://java.sun.com/jsf/composite/rich"> - - <h:form id="headerForm" style="padding-bottom: 30px;" prependId="false"> - <h:panelGrid columns="6" border="1"> - - <h:panelGrid columns="2"> - <h:outputText value="h" /> - <h:outputText value="a4j" /> - <h:commandButton id="hButton" value="submit" styleClass="button" /> - <a4j:commandButton id="a4jButton" value="submit" reRender="richGridID" styleClass="button" /> - <h:commandButton id="hButtonImmediate" value="immediate" immediate="true" styleClass="button" /> - <a4j:commandButton id="a4jButtonImmediate" value="immediate" immediate="true" reRender="richGridID" - styleClass="button" /> - </h:panelGrid> - - <h:panelGrid columns="2" style="width: 120px;"> - <h:outputLabel id="a4jLogLabel" for="a4jLogCheckbox" value="a4j:log" /> - <h:selectBooleanCheckbox id="a4jLogCheckbox" value="#{richBean.log}"> - <a4j:ajax event="change" execute="@this" render="a4jLog"/> - </h:selectBooleanCheckbox> - <h:outputLabel id="a4jStatusLabel" for="a4jStatus" value="a4j:status" /> - <a4j:status id="a4jStatus"> - <f:facet name="start"> - <h:graphicImage value="resources/images/wait.gif" /> - </f:facet> - </a4j:status> - </h:panelGrid> - - <h:panelGrid columns="2"> - <h:outputLabel id="reTestsCheckboxLabel" value="Tests" for="reTestsCheckbox" /> - <h:selectBooleanCheckbox id="reTestsCheckbox" value="#{richBean.reTests}" onchange="submit();"/> - - <h:outputLabel id="reComponentCheckboxLabel" value="Component" for="reComponentCheckbox" /> - <h:selectBooleanCheckbox id="reComponentCheckbox" value="#{richBean.reComponent}" onchange="submit();" /> - - <h:outputLabel id="reAttributesCheckboxLabel" value="Properties" for="reAttributesCheckbox" /> - <h:selectBooleanCheckbox id="reAttributesCheckbox" value="#{richBean.reAttributes}" onchange="submit();" /> - </h:panelGrid> - - <h:panelGrid columns="1"> - <h:outputLabel id="skinSelectLabel" value="Select skin: " for="skinSelect" /> - - <h:selectOneMenu id="skinSelect" value="#{richBean.skin}"> - <f:selectItems value="#{richBean.skins}" /> - </h:selectOneMenu> - - <h:selectOneMenu id="skinningSelect" value="#{richBean.skinningSelect}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="skinning" itemValue="skinning" /> - <f:selectItem itemLabel="skinningClasses" itemValue="skinning classes" /> - </h:selectOneMenu> - </h:panelGrid> - - <h:panelGrid columns="2"> - <ui:include src="/includes/components.xhtml" /> - <ui:include src="/blank.xhtml" /> - </h:panelGrid> - - <h:panelGrid columns="1"> - <h:commandButton action="#{richBean.invalidateSession}" value="Invalidate Session" /> - </h:panelGrid> - </h:panelGrid> - </h:form> -</ui:composition> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/index.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/index.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/index.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,12 +1,23 @@ -<!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" xmlns:rich="http://java.sun.com/jsf/composite/rich" - xmlns:a4j="http://richfaces.org/a4j"> - -<ui:composition template="/templates/template.xhtml"> - <ui:define name="content"> - <h1>Welcome To RichFaces 4.x Testing Application</h1> - </ui:define> -</ui:composition> - +<!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" xmlns:rich="http://java.sun.com/jsf/composite/rich" + xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> + +<h:head> + <title>Testing Application</title> + <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" /> + <!-- <h:outputStylesheet library="css" name="common.css" />--> +</h:head> + +<h:body> + + <h:form id="linksForm"> + <h:panelGrid id="attributes"> + <c:forEach items="#{richBean.components}" var="entry"> + <h:commandLink action="#{richBean.getListPage(entry.key)}" value="#{entry.key}" /> + </c:forEach> + </h:panelGrid> + </h:form> + +</h:body> </html> \ No newline at end of file Copied: root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css (from rev 17812, root/tests/metamer/trunk/src/main/webapp/resources/css/commandLink.css) =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/resources/css/a4jCommandLink.css 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,7 @@ +.red { + color: red; +} + +.big { + font-size: xx-large; +} \ No newline at end of file Deleted: root/tests/metamer/trunk/src/main/webapp/resources/css/commandLink.css =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/css/commandLink.css 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/resources/css/commandLink.css 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,7 +0,0 @@ -.red { - color: red; -} - -.big { - font-size: xx-large; -} \ No newline at end of file Copied: root/tests/metamer/trunk/src/main/webapp/resources/flash/text.swf (from rev 17812, root/tests/metamer/trunk/src/main/resources/org/richfaces/testapp/mediaOutput/text.swf) =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/flash/text.swf (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/resources/flash/text.swf 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,50 @@ +CWSD1 +۾���Ŧg�3fe�ǁ[���e|��¹����P�3��F�a{_�&��Y�m9�`���Xqw^�y�����/��亶��b�jMޝ�j{�c3�FQ�尼�uD��}k�L��gmr
�}��r��$y��!�b�J�5��i +ו��q��F
w��_H��a�L�����[=R��-g$�H�o]mğ�[��f;[�U6K-Mo�y��xM�Z�����n{��M٧�#��v%��Co'8/�����Z�]/�j%�����r���/�y}^5�kg�����v�ƨ����Xڻ���Q��K9�����?mr�S����/�1Y����DK�;>���/���^aR�R��w^�X�w��z~���᛻��Vz�b�#��<�5�Ə�?Y��Fʑ���Փ*�Y�'Jr�;�ly��^c\�����v��Yc��ޕ��}S�H�=�p�¥lE������D��T��j��%����)8���:��u������>-���Ǘ�LL`_��b9n=�JШ��v!���1�?�̖�Z&���v��\�=Z���~%��L�*��,տ|�!T�nSXi��̝˗�'d����%f/'�"R#Tl-�?dnP��R�f�D
��b�|��p��U�?�����'.� &z�F;i���S�&}�IL���:o��ӭrX� +��_��ڊ�U�_7Q�A�Cc�Pml3/`�k�S�4 +����n����J�ӕ�wN� �%T{�=,��7"�N�&"����u�/�=׉��7\��˱3_��ɢ������VN�8bSOz��߸Į�I�UH��j)��{|ӌ���gvB�T�@���a�LbVվΥy����;�8���m�]?2�|�� �\h��/��P�8��=��֖�o��sv;�OJ��8�~?�aW���,_΅���9S�@`!`-��g ���ƴf��G[��BE�o��֙0&�|{j�֬09�����/W���א�|�uct�������o����ă��=(Xc)z|����-�[v׳B��=�pa,�ЩvV�8��2�ek�Of �bS,%n��x�bp8M��f���u�/�ԉ'�.����bI�4��_m}g��o�S�w�g�2�a=3j祱��f_2s=;�5UE��vA��$7ABخ7F�6�X���k� +s���,����f���X;�f�F��~��t�,�3e�6�<�L���O�q�S�}lG��|�a�\f��vְ���&�M��T�$7���~ʡ�U��b����YK�>�Y�5p�G�ۚ��1�ܫXg���M��G�ґ����n�� R����[�[/�Rq��Ӎ�v���^W˽��MY\�N�BD"�3���o.�FěHU�!�ʥ��'�b��XZ|w2��5��K�:�� +�/<2��[�={I�q�ڔEq7U +b} +� �&����tSŲ���4�>�s�VmK�9�ϸ�fIj��]��� +�#�~l�
�i�-5��v]>:�qOr� +�5��I|��7��� +���-]�*�oE��fJX�%��fl[�%����eG���9#;mR@˴���E��5��p"6^�7�C�[� +gI�=6�_̰����$�`I(�K
>�[6m +�J�|���$H�SWI�#_&Uz{���?���*��K"IZ�M����[�bGT�O��Vb��7؅��^� +2�P��/j�{��l`:h�k���;�$ִ�}��%����Y힯��w4���w�|�]_[���a�4���2����+G +�i��.᷶rb^��1 +�{�������D��3G`�h�߈/��mǍ,�^��GJ��������0h�f�y��ٵ�Ri��¿m���C�*���Tzz�Lͼ�.�<�v����� +gY��tp��"C �%=����q ���ǧk��}ub�Ǵg�B�4��W�(J9�L0�l��u��A���B=]M`�!C ��Ks���� +o��L*2�����Xҵ6e � S�m����1�'#qo?�;i��ࡨ�]�s�*��n4�;�ӟS|���Y��#C �9nd�9y|��4R�*����B��Xxt�,d(�#2xɦ�c�x6:ӌ�[��f�PFzY,|+J�HW�����|���L�GC�ov�ޮ���;��[�t��{mO3^3}�G-�tW��1E>2��3F�`̗�n��l�U�H��?5���>����Q��'���l���÷��%�DJq�s��&Q��F(������A��/�z��V�?.!�����Y�?"�yZ�����[����/�� +�E ���<x�I>�k� SҲ~[��'�&˴�>� +�p�92�9�/�^Z�'��nd(Ac�����V���4����k�w��G]���[2��an�󡪣u0�43��Ŀ4߽:�xY>�֋%hh���x�#I3r�r^�dnFM�� +cџ�P�z����|�$�A��Z��r����~��_)��9�&*�u��@�X�{�н���'��npK٘c� ��z�W}#l�l:�"���'��?���h� s,D�+�>�Z� A�s,�ޮ͖���� ��hO�0�A��jv��5� +:�"+r9 +d௚�܅�>�1�At\j�Nn�_ �9y�t���\pۓ�B46�X ���,�ǽ�?�αȋRλ�=m�ùލ�@�QԄE���#���<m��$y�M�n�Z�٘c� +��V0y�t�E/�i"�m�Z��xt�P��禃O�{8��l:�"��ZbOfJg��| +󗭇%������i�K�MgY䟭��<����'�A2@�Do�*�F���4��;��,�M+�<���6B�D�����O�D�γ��ǧאw��=���� � D "�[>�xsW���D�� c,A68�7p>Ɖj�%�&��O湭;�W�3-��픭���S�� �dg#D "����<�V^�N�H������6�ܹ�>B�!J)ތL�E���+ѹ��K�[%{mߕk-v(a�BE�U��:� +�'���HU9����aq5
�t�1?�b؁��;{����3R�AF�|\���i� a~BY[��I�N���æ�3R�B�S����j�O���1?��w��� ��)S(�T~f����ғ `c~B���.�G�"C�g��!;������x5=���k�P6^�T����k�X�K,\�i��@��\���5�*�I�2:�"Y)�ݒ���L8J�k�P�D�ǭ�&��t�E�IJ�(�q<ݍQ�\�{>��:�� +1��I� ����M��-�� * ���s�]����2x��$(�&:_LP�T������uyޘ +y�-1�qQުŹ98`����dbſnL�Β6�1���s��
.�C���:b-N�`��Ǧ�-݀�M�<�A�v��f���&i8=��&�i��͗9?a�|%p/��'L\�v}�X��� +���_�$>�� �� ��%�`������O|0‰����8xd2�`8i� +1��p6�ڭ"4�y�Ù΍,(�#]|�C�k�<�͙aD��_1���o�d6"d�` N���a�8��ȆW�yψ*AD�]��"q�1��B +Ŏ��x���U(����x�Ym��J�j�6$���,Ä��b�YՁ�Mr�p�;���{�L6a��Y=�"ѩ�hZG��GPVz��w�f� +�Q�����0J\�����]�R�|Ŭ�A�k�N-�7�`�e��C�:\�Q̲T�|���"��ݠq�B����|���y+��A�/��0�Pf!�>��BO��`�����z�< +fV,�0��&�1�P�J��,�g�F����+���qG�CC�V�'��$�j�P� +ך����,�BM�G���P����S��fV��x��� �S�`���氯���0��P���ـ�I�`�| +u���׆�Ƭ�C9�;���H�`�N��u��J�̂<�ݽ�0���RV����̬�C�ߛ��_�`��-
a�q�rd�@'����&�I j1�ރ��ɃE#{f/�,x���](_0�� +��4�ۛ��)������mTT�TXS�����mT�_U�x��6�]����o +��ò]ܮ}\q��|4�maT��d����-�ń��p��1�Ϩ.3�&����;��gT_�7���Kc��Q�l�M��x�u��ܨ��o�����l������w!�#n����NG�����,�m���[�?^O��m�����p��~>fw ��[�M?�݁T�භ�!2�q�JK�����!hG�5��?��� \ No newline at end of file Copied: root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml (from rev 17812, root/tests/metamer/trunk/src/main/webapp/includes/header.xhtml) =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/templates/header.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,67 @@ +<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://java.sun.com/jsf/composite/rich"> + + <h:form id="headerForm" style="padding-bottom: 30px;" prependId="false"> + <h:panelGrid columns="6" border="1"> + + <h:panelGrid columns="2" style="width: 180px;"> + <h:outputLabel id="a4jLogLabel" for="a4jLogCheckbox" value="a4j:log" /> + <h:selectBooleanCheckbox id="a4jLogCheckbox" value="#{richBean.log}"> + <a4j:ajax event="change" execute="@this" render="a4jLog" /> + </h:selectBooleanCheckbox> + <h:outputLabel id="a4jStatusLabel" for="a4jStatus" value="a4j:status" /> + <a4j:status id="a4jStatus"> + <f:facet name="start"> + <h:outputText value="WORKING" style="color: red;" /> + </f:facet> + </a4j:status> + </h:panelGrid> + + <h:panelGrid columns="2"> + <h:outputLabel id="reTestsCheckboxLabel" value="Display tests" for="reTestsCheckbox" /> + <h:selectBooleanCheckbox id="reTestsCheckbox" value="#{richBean.reTests}" onchange="submit();" /> + + <h:outputLabel id="reComponentCheckboxLabel" value="Display component" for="reComponentCheckbox" /> + <h:selectBooleanCheckbox id="reComponentCheckbox" value="#{richBean.reComponent}" onchange="submit();" /> + + <h:outputLabel id="reAttributesCheckboxLabel" value="Didplay Properties" for="reAttributesCheckbox" /> + <h:selectBooleanCheckbox id="reAttributesCheckbox" value="#{richBean.reAttributes}" onchange="submit();" /> + </h:panelGrid> + + <h:panelGrid columns="1"> + <h:outputLabel id="skinSelectLabel" value="Select skin: " for="skinSelect" /> + + <h:selectOneMenu id="skinSelect" value="#{richBean.skin}" style="width: 130px;"> + <f:selectItems value="#{richBean.skins}" /> + </h:selectOneMenu> + + <h:selectOneMenu id="skinningSelect" value="#{richBean.skinningSelect}" style="width: 130px;"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="skinning" itemValue="skinning" /> + <f:selectItem itemLabel="skinningClasses" itemValue="skinning classes" /> + </h:selectOneMenu> + </h:panelGrid> + + <h:panelGrid columns="1"> + + <h:panelGroup layout="block"> + <h:outputLabel id="templateSelectMenuLabel" for="templateSelectMenu" value="Template:" /> + <h:selectOneMenu value="#{templateBean.templateId}" id="templateSelectMenu" style="width: 150px;"> + <f:selectItems value="#{templateBean.availableTemplates}" /> + <a4j:ajax event="change" action="/index" /> + </h:selectOneMenu> + <h:commandLink id="loadTemplate" value="Load" render="commonGrid" /> + </h:panelGroup> + + <h:commandLink id="goHomeLink" action="/index?faces-redirect=true" value="Home" /> + + <a4j:commandLink render="commonGrid" value="Rerender all" id="reRenderAllLink" /> + </h:panelGrid> + + <h:panelGrid columns="1"> + <h:commandButton action="#{richBean.invalidateSession}" value="Invalidate Session" /> + </h:panelGrid> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/templates/plain.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/plain.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/templates/plain.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,17 @@ +<!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" xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> + +<ui:composition template="template.xhtml"> + + <ui:define name="template"> + <div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div> + + <ui:insert name="component" /> + + <div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div> + </ui:define> + +</ui:composition> +</html> \ No newline at end of file Added: root/tests/metamer/trunk/src/main/webapp/templates/reddiv.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/reddiv.xhtml (rev 0) +++ root/tests/metamer/trunk/src/main/webapp/templates/reddiv.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -0,0 +1,17 @@ +<!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" xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> + +<ui:composition template="template.xhtml"> + + <ui:define name="template"> + <div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div> + + <div style="border: 3px red solid; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:insert name="component" /></div> + + <div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div> + </ui:define> + +</ui:composition> +</html> \ No newline at end of file Modified: root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml 2010-07-10 18:06:22 UTC (rev 17812) +++ root/tests/metamer/trunk/src/main/webapp/templates/template.xhtml 2010-07-10 18:08:18 UTC (rev 17813) @@ -1,44 +1,36 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.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" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> - -<h:head> - <title>Testing Application</title> - <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - -</h:head> - -<h:body> - <h:outputStylesheet library="css" name="common.css" /> - - <div class="header"><ui:include src="/includes/header.xhtml" /></div> - - <div class="content"><rich:messages id="msgs" /> <h:form id="contentForm"> - - <a4j:outputPanel id="testsPanel" rendered="#{richBean.reTests}" layout="block"> - <ui:include src="#{richBean.testsPage}" /> - <hr /> - </a4j:outputPanel> - - <a4j:outputPanel id="componentPanel" rendered="#{richBean.reComponent}" layout="block"> - <ui:include src="#{richBean.componentPage}" /> - <hr /> - </a4j:outputPanel> - - <a4j:outputPanel id="attributesPanel" rendered="#{richBean.reAttributes}" layout="block"> - <ui:include src="#{richBean.attributesPage}" /> - <hr /> - </a4j:outputPanel> - - </h:form></div> - - <div class="log"><a4j:log id="a4jLog" style="width: 800px; height: 300px;" popup="false" level="ALL" - rendered="#{richBean.log}" /></div> - - <div class="footer"><ui:insert name="footer"> - RichFaces #{a4j.version}</ui:insert></div> - -</h:body> -</html> \ No newline at end of file +<!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" xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> + +<h:head> + <title><ui:insert name="pageTitle">Testing Application</ui:insert></title> + <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" /> + <!-- <h:outputStylesheet library="css" name="common.css" />--> +</h:head> + +<h:body> + + <div class="header"><ui:include src="/templates/header.xhtml" /></div> + + <div class="content"> + <div id="controlPoint1">Control1</div> + + <h:panelGroup id="commonGrid" layout="block"> + <div><b>Status: </b> <input style="border: 0px; color: black; width: 700px" readonly="true" + id="statusMessage" /></div> + <br /> + <div><h:form id="componentForm"> + <ui:insert name="template" /> + </h:form></div> + </h:panelGroup> <br /> + <div id="controlPoint2">Control2</div> + </div> + + <div id="footer"><ui:insert name="footer"> + <hr /> + RichFaces #{a4j.version} + </ui:insert></div> +</h:body> + +</html>