richfaces-svn-commits
October 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 409 discussions
JBoss Rich Faces SVN: r19425 - in modules/tests/metamer/trunk/application/src/main: webapp/components and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-04 10:30:28 -0400 (Mon, 04 Oct 2010)
New Revision: 19425
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml
Log:
https://jira.jboss.org/browse/RFPL-857
* added one page for rich:inputNumberSpinner
* added spinner to h:dataTable, rich:dataTable, rich:extendedDataTable and rich:subTable
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-10-04 13:28:04 UTC (rev 19424)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-10-04 14:30:28 UTC (rev 19425)
@@ -124,6 +124,7 @@
components.put("richFunctions", "Rich Functions");
components.put("richInplaceInput", "Rich Inplace Input");
components.put("richInputNumberSlider", "Rich Input Number Slider");
+ components.put("richInputNumberSpinner", "Rich Input Number Spinner");
components.put("richJQuery", "Rich jQuery");
components.put("richList", "Rich List");
components.put("richPanel", "Rich Panel");
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2010-10-04 14:30:28 UTC (rev 19425)
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * 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.tests.metamer.bean;
+
+import java.io.Serializable;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ViewScoped;
+
+import org.richfaces.component.html.HtmlInputNumberSpinner;
+import org.richfaces.tests.metamer.Attributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:inputNumberSpinner.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "richInputNumberSpinnerBean")
+@ViewScoped
+public class RichInputNumberSpinnerBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getUIComponentAttributes(HtmlInputNumberSpinner.class, getClass());
+
+ attributes.setAttribute("enableManualInput", true);
+ attributes.setAttribute("maxValue", 100);
+ attributes.setAttribute("minValue", 0);
+ attributes.setAttribute("rendered", true);
+ attributes.setAttribute("step", 1);
+
+ // TODO has to be tested in another way
+ attributes.remove("validator");
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2010-10-04 13:28:04 UTC (rev 19424)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2010-10-04 14:30:28 UTC (rev 19425)
@@ -173,7 +173,10 @@
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSpinner" />
</f:facet>
- <h:outputText value="#{record.numberOfKids}" />
+ <rich:inputNumberSpinner id="spinner" value="#{record.numberOfKids}" maxValue="5">
+ <a4j:ajax/>
+ </rich:inputNumberSpinner>
+
<f:facet name="footer">
<h:outputText id="columnFooterNumberOfKids" value="Number of Kids" />
</f:facet>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2010-10-04 13:28:04 UTC (rev 19424)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2010-10-04 14:30:28 UTC (rev 19425)
@@ -159,7 +159,9 @@
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSpinner" />
</f:facet>
- <h:outputText value="#{record.numberOfKids}" />
+ <rich:inputNumberSpinner id="spinner" value="#{record.numberOfKids}" maxValue="5">
+ <a4j:ajax/>
+ </rich:inputNumberSpinner>
<f:facet name="footer">
<h:outputText id="columnFooterNumberOfKids" value="Number of Kids" />
</f:facet>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-10-04 13:28:04 UTC (rev 19424)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-10-04 14:30:28 UTC (rev 19425)
@@ -159,7 +159,10 @@
<h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSpinner" />
</f:facet>
- <h:outputText value="#{record.numberOfKids}" />
+ <rich:inputNumberSpinner id="spinner" value="#{record.numberOfKids}" maxValue="5">
+ <a4j:ajax/>
+ </rich:inputNumberSpinner>
+
<f:facet name="footer">
<h:outputText id="columnFooterNumberOfKids" value="Number of Kids" />
</f:facet>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/list.xhtml 2010-10-04 14:30:28 UTC (rev 19425)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <!--
+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.
+ -->
+
+ <ui:composition template="/templates/list.xhtml">
+
+ <ui:define name="pageTitle">Rich Input Number Spinner</ui:define>
+
+ <ui:define name="links">
+
+ <metamer:testPageLink id="simple" outcome="simple" value="Simple">
+ Page containing <b>rich:inputNumberSpinner</b> and input boxes for all its attributes.
+ </metamer:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2010-10-04 14:30:28 UTC (rev 19425)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html">
+
+ <!--
+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.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+ <rich:inputNumberSpinner id="spinner"
+ accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}"
+ converter="#{richInputNumberSpinnerBean.attributes['converter'].value}"
+ converterMessage="#{richInputNumberSpinnerBean.attributes['converterMessage'].value}"
+ cycled="#{richInputNumberSpinnerBean.attributes['cycled'].value}"
+ disabled="#{richInputNumberSpinnerBean.attributes['disabled'].value}"
+ enableManualInput="#{richInputNumberSpinnerBean.attributes['enableManualInput'].value}"
+ immediate="#{richInputNumberSpinnerBean.attributes['immediate'].value}"
+ inputClass="#{richInputNumberSpinnerBean.attributes['inputClass'].value}"
+ inputSize="#{richInputNumberSpinnerBean.attributes['inputSize'].value}"
+ localValue="#{richInputNumberSpinnerBean.attributes['localValue'].value}"
+ localValueSet="#{richInputNumberSpinnerBean.attributes['localValueSet'].value}"
+ maxValue="#{richInputNumberSpinnerBean.attributes['maxValue'].value}"
+ minValue="#{richInputNumberSpinnerBean.attributes['minValue'].value}"
+ onblur="#{richInputNumberSpinnerBean.attributes['onblur'].value}"
+ onchange="#{richInputNumberSpinnerBean.attributes['onchange'].value}"
+ onclick="#{richInputNumberSpinnerBean.attributes['onclick'].value}"
+ ondblclick="#{richInputNumberSpinnerBean.attributes['ondblclick'].value}"
+ ondownclick="#{richInputNumberSpinnerBean.attributes['ondownclick'].value}"
+ onfocus="#{richInputNumberSpinnerBean.attributes['onfocus'].value}"
+ oninputclick="#{richInputNumberSpinnerBean.attributes['oninputclick'].value}"
+ oninputdblclick="#{richInputNumberSpinnerBean.attributes['oninputdblclick'].value}"
+ oninputkeydown="#{richInputNumberSpinnerBean.attributes['oninputkeydown'].value}"
+ oninputkeypress="#{richInputNumberSpinnerBean.attributes['oninputkeypress'].value}"
+ oninputkeyup="#{richInputNumberSpinnerBean.attributes['oninputkeyup'].value}"
+ oninputmousedown="#{richInputNumberSpinnerBean.attributes['oninputmousedown'].value}"
+ oninputmousemove="#{richInputNumberSpinnerBean.attributes['oninputmousemove'].value}"
+ oninputmouseout="#{richInputNumberSpinnerBean.attributes['oninputmouseout'].value}"
+ oninputmouseover="#{richInputNumberSpinnerBean.attributes['oninputmouseover'].value}"
+ oninputmouseup="#{richInputNumberSpinnerBean.attributes['oninputmouseup'].value}"
+ onmousedown="#{richInputNumberSpinnerBean.attributes['onmousedown'].value}"
+ onmousemove="#{richInputNumberSpinnerBean.attributes['onmousemove'].value}"
+ onmouseout="#{richInputNumberSpinnerBean.attributes['onmouseout'].value}"
+ onmouseover="#{richInputNumberSpinnerBean.attributes['onmouseover'].value}"
+ onmouseup="#{richInputNumberSpinnerBean.attributes['onmouseup'].value}"
+ onselect="#{richInputNumberSpinnerBean.attributes['onselect'].value}"
+ onupclick="#{richInputNumberSpinnerBean.attributes['onupclick'].value}"
+ rendered="#{richInputNumberSpinnerBean.attributes['rendered'].value}"
+ required="#{richInputNumberSpinnerBean.attributes['required'].value}"
+ requiredMessage="#{richInputNumberSpinnerBean.attributes['requiredMessage'].value}"
+ step="#{richInputNumberSpinnerBean.attributes['step'].value}"
+ style="#{richInputNumberSpinnerBean.attributes['style'].value}"
+ styleClass="#{richInputNumberSpinnerBean.attributes['styleClass'].value}"
+ submittedValue="#{richInputNumberSpinnerBean.attributes['submittedValue'].value}"
+ tabindex="#{richInputNumberSpinnerBean.attributes['tabindex'].value}"
+ valid="#{richInputNumberSpinnerBean.attributes['valid'].value}"
+ validatorMessage="#{richInputNumberSpinnerBean.attributes['validatorMessage'].value}"
+ validators="#{richInputNumberSpinnerBean.attributes['validators'].value}"
+ value="#{richInputNumberSpinnerBean.attributes['value'].value}"
+ valueChangeListener="#{richInputNumberSpinnerBean.attributes['valueChangeListener'].value}"
+ valueChangeListeners="#{richInputNumberSpinnerBean.attributes['valueChangeListeners'].value}">
+
+ <a4j:ajax render="output"/>
+
+ </rich:inputNumberSpinner>
+
+ <br/><br/>
+
+ output: <h:outputText id="output" value="#{richInputNumberSpinnerBean.attributes['value'].value}"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richInputNumberSpinnerBean.attributes}" id="attributes" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml 2010-10-04 13:28:04 UTC (rev 19424)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components1.xhtml 2010-10-04 14:30:28 UTC (rev 19425)
@@ -133,7 +133,9 @@
<h:outputText value="#{item.favoriteColor}" />
</rich:column>
<rich:column>
- <h:outputText value="#{item.numberOfKids}" />
+ <rich:inputNumberSpinner id="spinner" value="#{item.numberOfKids}" maxValue="5">
+ <a4j:ajax/>
+ </rich:inputNumberSpinner>
</rich:column>
<f:facet name="footer">
<h:outputText value="Total of #{list[0].sex == 'MALE' ? 'men' : 'women'}: #{list.size()}" />
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19424 - modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-04 09:28:04 -0400 (Mon, 04 Oct 2010)
New Revision: 19424
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
Log:
https://jira.jboss.org/browse/RFPL-759
* added a4j:ajax to component
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-10-04 11:48:06 UTC (rev 19423)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-10-04 13:28:04 UTC (rev 19424)
@@ -83,9 +83,9 @@
value="#{richInputNumberSliderBean.attributes['value'].value}"
valueChangeListener="#{richInputNumberSliderBean.attributes['valueChangeListener'].value}"
valueChangeListeners="#{richInputNumberSliderBean.attributes['valueChangeListeners'].value}">
- <ui:remove>
- <a4j:ajax id="sliderAjax" render="output"/>
- </ui:remove>
+
+ <a4j:ajax render="output" execute="@form"/>
+
</rich:inputNumberSlider>
<br/><br/>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19423 - in modules/tests/metamer/trunk: ftest and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-04 07:48:06 -0400 (Mon, 04 Oct 2010)
New Revision: 19423
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
* added JBoss public repository group to pom.xml
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2010-10-04 10:44:32 UTC (rev 19422)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2010-10-04 11:48:06 UTC (rev 19423)
@@ -20,408 +20,419 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>functional-test-jboss-ci-template</artifactId>
- <groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.2.Final</version>
- </parent>
+ <parent>
+ <artifactId>functional-test-jboss-ci-template</artifactId>
+ <groupId>org.jboss.test.richfaces-selenium</groupId>
+ <version>1.5.2.Final</version>
+ </parent>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer-ftest</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <name>Metamer: RichFaces Testing Application - Functional Test</name>
- <packaging>pom</packaging>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer-ftest</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>Metamer: RichFaces Testing Application - Functional Test</name>
+ <packaging>pom</packaging>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
+ </scm>
- <licenses>
- <license>
- <name>GNU Lesser General Public License, Version 2.1</name>
- <distribution>repo</distribution>
- <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License, Version 2.1</name>
+ <distribution>repo</distribution>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+ </license>
+ </licenses>
- <distributionManagement>
- <snapshotRepository>
- <id>jboss-qa-snapshots</id>
- <name>JBoss QA snapshot repository</name>
- <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url>
- </snapshotRepository>
- <repository>
- <id>jboss-qa-releases</id>
- <name>JBoss QA selease repository</name>
- <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url>
- </repository>
- </distributionManagement>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>jboss-qa-snapshots</id>
+ <name>JBoss QA snapshot repository</name>
+ <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url>
+ </snapshotRepository>
+ <repository>
+ <id>jboss-qa-releases</id>
+ <name>JBoss QA selease repository</name>
+ <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url>
+ </repository>
+ </distributionManagement>
- <developers>
- <developer>
- <name>Pavol Pitonak</name>
- <email>ppitonak(a)redhat.com</email>
- </developer>
- <developer>
- <name>Lukas Fryc</name>
- <email>lfryc(a)redhat.com</email>
- </developer>
- </developers>
+ <developers>
+ <developer>
+ <name>Pavol Pitonak</name>
+ <email>ppitonak(a)redhat.com</email>
+ </developer>
+ <developer>
+ <name>Lukas Fryc</name>
+ <email>lfryc(a)redhat.com</email>
+ </developer>
+ </developers>
- <issueManagement>
- <system>jira</system>
- <url>https://jira.jboss.org/jira/browse/RFPL</url>
- </issueManagement>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://jira.jboss.org/jira/browse/RFPL</url>
+ </issueManagement>
- <properties>
- <context.path>/metamer/</context.path>
- <deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.0.0-SNAPSHOT</deployable.version>
- <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version>
- <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
- <container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
- </properties>
+ <properties>
+ <context.path>/metamer/</context.path>
+ <deployable.classifier>mojarra</deployable.classifier>
+ <deployable.version>4.0.0-SNAPSHOT</deployable.version>
+ <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version>
+ <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
+ <container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
+ </properties>
- <repositories>
- <repository>
- <id>jboss-qa-repository</id>
- <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>jboss-qa-repository</id>
+ <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url>
+ </repository>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer</artifactId>
- <classifier>${deployable.classifier}</classifier>
- <type>${deployable.type}</type>
- <version>${deployable.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer-ftest-source</artifactId>
- <version>${ftest.source.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer</artifactId>
+ <classifier>${deployable.classifier}</classifier>
+ <type>${deployable.type}</type>
+ <version>${deployable.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer-ftest-source</artifactId>
+ <version>${ftest.source.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>container-deploy-artifact</id>
- <activation>
- <property>
- <name>containerId</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <deployer>
- <type>installed</type>
- <deployables>
- <deployable>
- <groupId>org.richfaces.tests</groupId>
- <artifactId>metamer</artifactId>
- <type>${deployable.type}</type>
- <classifier>${deployable.classifier}</classifier>
- <properties>
- <context>${context.deploy.path}</context>
- </properties>
- </deployable>
- </deployables>
- </deployer>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>clean-tomcat-exploded-war</id>
- <activation>
- <property>
- <name>containerId</name>
- <value>tomcat6x</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <id>clean-tomcat-exploded-war</id>
- <phase>initialize</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeDefaultDirectories>true</excludeDefaultDirectories>
- <filesets>
- <fileset>
- <directory>${container.home}/webapps/${context.deploy.path}</directory>
- <includes>
- <include>**</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profiles>
+ <profile>
+ <id>container-deploy-artifact</id>
+ <activation>
+ <property>
+ <name>containerId</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <deployer>
+ <type>installed</type>
+ <deployables>
+ <deployable>
+ <groupId>org.richfaces.tests</groupId>
+ <artifactId>metamer</artifactId>
+ <type>${deployable.type}</type>
+ <classifier>${deployable.classifier}</classifier>
+ <properties>
+ <context>${context.deploy.path}</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </deployer>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>clean-tomcat-exploded-war</id>
+ <activation>
+ <property>
+ <name>containerId</name>
+ <value>tomcat6x</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-tomcat-exploded-war</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${container.home}/webapps/${context.deploy.path}</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- <profile>
- <id>unpack-test-source</id>
- <activation>
- <property>
- <name>!eclipse</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-test-source</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.richfaces.tests</includeGroupIds>
- <includeArtifactIds>metamer-ftest-source</includeArtifactIds>
- <includes>**</includes>
- <outputDirectory>target/test-classes</outputDirectory>
- <overWriteReleases>true</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
+ <profile>
+ <id>unpack-test-source</id>
+ <activation>
+ <property>
+ <name>!eclipse</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-test-source</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeGroupIds>org.richfaces.tests</includeGroupIds>
+ <includeArtifactIds>metamer-ftest-source</includeArtifactIds>
+ <includes>**</includes>
+ <outputDirectory>target/test-classes</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!--
activate when debugging in Eclipse and use internal dependencies
resolution
-->
- <id>copy-test-source</id>
- <activation>
- <property>
- <name>eclipse</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-test-classes</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="target/test-classes/">
- <fileset dir="../ftest-source/target/classes/">
- <include name="**/*.*" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>container-jboss6x</id>
- <activation>
- <property>
- <name>containerId</name>
- <value>jboss6x-snapshot</value>
- </property>
- </activation>
- <properties>
- <container.short.version>6.0.0-SNAPSHOT</container.short.version>
- <container.version>6.0.0-SNAPSHOT</container.version>
- <container.dir.deflatted>jboss-6.0.x</container.dir.deflatted>
- <container.dir.unflatted>jboss-${container.version}</container.dir.unflatted>
- <container.installer.url>http://hudson.qa.jboss.com/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/last...</container.installer.url>
- <container.dir>jboss-${container.version}</container.dir>
- <container.configuration>default</container.configuration>
- <container.configuration.home>${container.home}/server/${container.configuration}</container.configuration.home>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>undeploy-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <container>
- <containerId>jboss6x</containerId>
- <append>false</append>
- <timeout>${cargo.timeout.deploy}</timeout>
- <zipUrlInstaller>
- <url>${container.installer.url}</url>
- <installDir>${project.build.directory}/installs</installDir>
- </zipUrlInstaller>
- </container>
- <configuration>
- <home>${container.home}/server/${container.configuration}</home>
- <type>existing</type>
- <properties>
- <cargo.jboss.configuration>${container.configuration}</cargo.jboss.configuration>
- <cargo.rmi.port>1099</cargo.rmi.port>
- </properties>
- </configuration>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tomcat6x-mojarra</id>
- <properties>
- <deployable.classifier>mojarra</deployable.classifier>
- </properties>
- </profile>
- <profile>
- <id>tomcat6x-myfaces</id>
- <properties>
- <deployable.classifier>myfaces</deployable.classifier>
- </properties>
- </profile>
- <profile>
- <id>jboss6x-mojarra</id>
- <properties>
- <deployable.classifier>jee6</deployable.classifier>
- <jsf.config>Mojarra-2.0</jsf.config>
- </properties>
- </profile>
- <profile>
- <id>jboss6x-myfaces</id>
- <properties>
- <deployable.classifier>myfaces</deployable.classifier>
- </properties>
- </profile>
- <profile>
- <id>jboss6x-snapshot-mojarra</id>
- <properties>
- <deployable.classifier>jee6</deployable.classifier>
- <jsf.config>Mojarra-2.0</jsf.config>
- </properties>
- </profile>
- <profile>
- <id>jboss6x-snapshot-myfaces</id>
- <properties>
- <deployable.classifier>jee6</deployable.classifier>
- <jsf.config>MyFaces-2.0</jsf.config>
- </properties>
- </profile>
- <profile>
- <id>jboss6x-snapshot-rewrite-default-jsf-config</id>
- <activation>
- <property>
- <name>containerId</name>
- <value>jboss6x-snapshot</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>maven-replacer-plugin</artifactId>
- <version>1.3.2</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- <configuration>
- <file>${container.home}/server/${container.configuration}/deployers/jsf.deployer/META-INF/jsf-integration-deployer-jboss-beans.xml</file>
- <regex>true</regex>
- <regexFlags>
- <regexFlag>MULTILINE</regexFlag>
- </regexFlags>
- <token><property name="defaultJSFConfig">\s*<value>[a-zA-Z0-9\.\-]+</value></token>
- <value><property name="defaultJSFConfig"><value>${jsf.config}</value></value>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <id>copy-test-source</id>
+ <activation>
+ <property>
+ <name>eclipse</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-test-classes</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="target/test-classes/">
+ <fileset dir="../ftest-source/target/classes/">
+ <include name="**/*.*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>container-jboss6x</id>
+ <activation>
+ <property>
+ <name>containerId</name>
+ <value>jboss6x-snapshot</value>
+ </property>
+ </activation>
+ <properties>
+ <container.short.version>6.0.0-SNAPSHOT</container.short.version>
+ <container.version>6.0.0-SNAPSHOT</container.version>
+ <container.dir.deflatted>jboss-6.0.x</container.dir.deflatted>
+ <container.dir.unflatted>jboss-${container.version}</container.dir.unflatted>
+ <container.installer.url>http://hudson.qa.jboss.com/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/last...</container.installer.url>
+ <container.dir>jboss-${container.version}</container.dir>
+ <container.configuration>default</container.configuration>
+ <container.configuration.home>${container.home}/server/${container.configuration}</container.configuration.home>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>undeploy-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <container>
+ <containerId>jboss6x</containerId>
+ <append>false</append>
+ <timeout>${cargo.timeout.deploy}</timeout>
+ <zipUrlInstaller>
+ <url>${container.installer.url}</url>
+ <installDir>${project.build.directory}/installs</installDir>
+ </zipUrlInstaller>
+ </container>
+ <configuration>
+ <home>${container.home}/server/${container.configuration}</home>
+ <type>existing</type>
+ <properties>
+ <cargo.jboss.configuration>${container.configuration}</cargo.jboss.configuration>
+ <cargo.rmi.port>1099</cargo.rmi.port>
+ </properties>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tomcat6x-mojarra</id>
+ <properties>
+ <deployable.classifier>mojarra</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>tomcat6x-myfaces</id>
+ <properties>
+ <deployable.classifier>myfaces</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>jboss6x-mojarra</id>
+ <properties>
+ <deployable.classifier>jee6</deployable.classifier>
+ <jsf.config>Mojarra-2.0</jsf.config>
+ </properties>
+ </profile>
+ <profile>
+ <id>jboss6x-myfaces</id>
+ <properties>
+ <deployable.classifier>myfaces</deployable.classifier>
+ </properties>
+ </profile>
+ <profile>
+ <id>jboss6x-snapshot-mojarra</id>
+ <properties>
+ <deployable.classifier>jee6</deployable.classifier>
+ <jsf.config>Mojarra-2.0</jsf.config>
+ </properties>
+ </profile>
+ <profile>
+ <id>jboss6x-snapshot-myfaces</id>
+ <properties>
+ <deployable.classifier>jee6</deployable.classifier>
+ <jsf.config>MyFaces-2.0</jsf.config>
+ </properties>
+ </profile>
+ <profile>
+ <id>jboss6x-snapshot-rewrite-default-jsf-config</id>
+ <activation>
+ <property>
+ <name>containerId</name>
+ <value>jboss6x-snapshot</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <version>1.3.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <file>${container.home}/server/${container.configuration}/deployers/jsf.deployer/META-INF/jsf-integration-deployer-jboss-beans.xml</file>
+ <regex>true</regex>
+ <regexFlags>
+ <regexFlag>MULTILINE</regexFlag>
+ </regexFlags>
+ <token><property name="defaultJSFConfig">\s*<value>[a-zA-Z0-9\.\-]+</value></token>
+ <value><property name="defaultJSFConfig"><value>${jsf.config}</value></value>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>functional-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${testng.suite.xml}</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Dtemplates='${templates}'</argLine>
- <properties>
- <property>
- <name>listener</name>
- <value>org.richfaces.tests.metamer.ftest.MatrixConfigurator,org.richfaces.tests.metamer.ftest.MetamerSeleniumLoggingTestListener,org.richfaces.tests.metamer.ftest.MetamerFailureLoggingTestListener,org.richfaces.tests.metamer.ftest.MetamerConsoleStatusTestListener</value>
- </property>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>functional-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${testng.suite.xml}</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Dtemplates='${templates}'</argLine>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.richfaces.tests.metamer.ftest.MatrixConfigurator,org.richfaces.tests.metamer.ftest.MetamerSeleniumLoggingTestListener,org.richfaces.tests.metamer.ftest.MetamerFailureLoggingTestListener,org.richfaces.tests.metamer.ftest.MetamerConsoleStatusTestListener</value>
+ </property>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2010-10-04 10:44:32 UTC (rev 19422)
+++ modules/tests/metamer/trunk/pom.xml 2010-10-04 11:48:06 UTC (rev 19423)
@@ -99,9 +99,7 @@
<snapshots>
<updatePolicy>never</updatePolicy>
</snapshots>
-
</repository>
-
</repositories>
<properties>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19422 - in trunk: ui/output/ui/src/main/java/org/richfaces/component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-10-04 06:44:32 -0400 (Mon, 04 Oct 2010)
New Revision: 19422
Modified:
trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js
Log:
RF-9401 Tab panel: classes for tab are not set
RF-9352 Collapsible panel: facet headerCollapsed doesn't work
RFPL-674 Accordion: class attribute is not set for headers and content
Modified: trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-10-04 10:44:32 UTC (rev 19422)
@@ -15,8 +15,8 @@
<p>Page</p>
<h:form id="f">
- <pn:tabPanel id="panel" switchType="ajax" tabHeaderClassActive="myClass_01">
- <pn:tab header="tab1 header" headerClassActive="myClass_02">
+ <pn:tabPanel id="panel" switchType="ajax" tabHeaderClassDisabled="myClass_01">
+ <pn:tab header="tab1 header" headerClassDisabled="myClass_02">
Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here.
</pn:tab>
<pn:tab header="tab2 header">
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2010-10-04 10:44:32 UTC (rev 19422)
@@ -41,7 +41,7 @@
public enum HeaderStates {
active("act"),
inactive("inact"),
- disable("dis");
+ disabled("dis");
private final String abbreviation;
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-10-04 10:44:32 UTC (rev 19422)
@@ -25,6 +25,7 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorContext;
+import javax.faces.context.FacesContext;
import org.ajax4jsf.component.behavior.ClientBehavior;
import org.richfaces.component.AbstractTogglePanel;
@@ -97,17 +98,26 @@
+ comp.getClientId(getFacesContext()) + ") has not been found.");
}
} else {
- UIComponent control = comp;
- while (control != null) {
- if (control instanceof AbstractTogglePanel) {
- return (AbstractTogglePanel) control;
- }
+ return getEnclosedPanel(comp);
+ }
+ }
- control = control.getParent();
+ public static AbstractTogglePanel getEnclosedPanel(UIComponent comp) {
+ if (comp == null) {
+ return null;
+ }
+
+ UIComponent control = comp;
+ while (control != null) {
+ if (control instanceof AbstractTogglePanel) {
+ return (AbstractTogglePanel) control;
}
- throw new FacesException("Parent panel for control (id="
- + comp.getClientId(getFacesContext()) + ") has not been found.");
+
+ control = control.getParent();
}
+
+ throw new FacesException("Parent panel for control (id="
+ + comp.getClientId(FacesContext.getCurrentInstance()) + ") has not been found.");
}
@Override
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2010-10-04 10:44:32 UTC (rev 19422)
@@ -23,6 +23,8 @@
package org.richfaces.component.html;
import org.richfaces.component.UITogglePanelTitledItem;
+import org.richfaces.component.behavior.ToggleControl;
+
import javax.faces.component.behavior.ClientBehaviorHolder;
import java.util.Arrays;
@@ -94,8 +96,12 @@
return COMPONENT_FAMILY;
}
+ public HtmlAccordion getAccordion() {
+ return (HtmlAccordion) ToggleControl.getEnclosedPanel(this);
+ }
+
public String getHeaderClassActive() {
- return (String) getStateHelper().eval(PropertyKeys.headerClassActive);
+ return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getAccordion().getItemHeaderClassActive());
}
public void setHeaderClassActive(String headerClassActive) {
@@ -103,7 +109,7 @@
}
public String getHeaderClassDisabled() {
- return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled);
+ return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled, getAccordion().getItemHeaderClassDisabled());
}
public void setHeaderClassDisabled(String headerClassDisabled) {
@@ -111,7 +117,7 @@
}
public String getHeaderClassInactive() {
- return (String) getStateHelper().eval(PropertyKeys.headerClassInactive);
+ return (String) getStateHelper().eval(PropertyKeys.headerClassInactive, getAccordion().getItemHeaderClassInactive());
}
public void setHeaderClassInactive(String headerClassInactive) {
@@ -119,7 +125,7 @@
}
public String getHeaderClass() {
- return (String) getStateHelper().eval(PropertyKeys.headerClass);
+ return (String) getStateHelper().eval(PropertyKeys.headerClass, getAccordion().getItemHeaderClass());
}
public void setHeaderClass(String headerClass) {
@@ -135,7 +141,7 @@
}
public String getContentClass() {
- return (String) getStateHelper().eval(PropertyKeys.contentClass);
+ return (String) getStateHelper().eval(PropertyKeys.contentClass, getAccordion().getItemContentClass());
}
public void setContentClass(String contentClass) {
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-10-04 10:44:32 UTC (rev 19422)
@@ -137,7 +137,7 @@
boolean isDisabled = titledItem.isDisabled();
encodeHeader(context, titledItem, writer, HeaderStates.inactive, !isActive && !isDisabled);
encodeHeader(context, titledItem, writer, HeaderStates.active, isActive && !isDisabled);
- encodeHeader(context, titledItem, writer, HeaderStates.disable, isDisabled);
+ encodeHeader(context, titledItem, writer, HeaderStates.disabled, isDisabled);
writer.endElement("div");
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-10-04 10:44:32 UTC (rev 19422)
@@ -23,7 +23,7 @@
package org.richfaces.renderkit.html;
import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active;
-import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disable;
+import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled;
import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive;
import static org.richfaces.component.html.HtmlAccordion.PropertyKeys.height;
import static org.richfaces.component.util.HtmlUtil.concatClasses;
@@ -136,7 +136,7 @@
encodeTabHeader(context, tab, writer, inactive, !isActive && !isDisabled);
encodeTabHeader(context, tab, writer, active, isActive && !isDisabled);
- encodeTabHeader(context, tab, writer, disable, isDisabled);
+ encodeTabHeader(context, tab, writer, disabled, isDisabled);
}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js 2010-10-04 08:10:44 UTC (rev 19421)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js 2010-10-04 10:44:32 UTC (rev 19422)
@@ -45,7 +45,7 @@
},
__state : function () {
- return this.getName() === "true" ? "expanded" : "collapsed";
+ return this.getName() === "true" ? "exp" : "colps";
},
__header : function (state) {
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19421 - trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-10-04 04:10:44 -0400 (Mon, 04 Oct 2010)
New Revision: 19421
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
Log:
RF-9398 Tab panel: non-valid markup
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-10-04 07:15:55 UTC (rev 19420)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-10-04 08:10:44 UTC (rev 19421)
@@ -195,7 +195,7 @@
w.startElement("td", comp);
w.writeAttribute(STYLE, style, null);
w.writeAttribute(CLASS, classStyle, null);
- w.startElement("br", comp);
+ w.write("<br />");
w.endElement("td");
}
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19420 - in trunk: ui/output/ui/src/main/java/org/richfaces/component/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-10-04 03:15:55 -0400 (Mon, 04 Oct 2010)
New Revision: 19420
Modified:
trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java
Log:
RF-9401 Tab panel: classes for tab are not set
Modified: trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-10-01 21:44:47 UTC (rev 19419)
+++ trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-10-04 07:15:55 UTC (rev 19420)
@@ -15,8 +15,8 @@
<p>Page</p>
<h:form id="f">
- <pn:tabPanel id="panel" switchType="ajax">
- <pn:tab header="tab1 header">
+ <pn:tabPanel id="panel" switchType="ajax" tabHeaderClassActive="myClass_01">
+ <pn:tab header="tab1 header" headerClassActive="myClass_02">
Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here.
</pn:tab>
<pn:tab header="tab2 header">
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2010-10-01 21:44:47 UTC (rev 19419)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2010-10-04 07:15:55 UTC (rev 19420)
@@ -23,8 +23,8 @@
package org.richfaces.component.html;
import org.richfaces.component.UITogglePanelTitledItem;
+
import javax.faces.component.behavior.ClientBehaviorHolder;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -94,8 +94,12 @@
return COMPONENT_FAMILY;
}
+ public HtmlTabPanel getTabPanel() {
+ return (HtmlTabPanel) this.getParent();
+ }
+
public String getHeaderClassActive() {
- return (String) getStateHelper().eval(PropertyKeys.headerClassActive);
+ return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getTabPanel().getTabHeaderClassActive());
}
public void setHeaderClassActive(String headerClassActive) {
@@ -103,7 +107,7 @@
}
public String getHeaderClassDisabled() {
- return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled);
+ return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled, getTabPanel().getTabHeaderClassDisabled());
}
public void setHeaderClassDisabled(String headerClassDisabled) {
@@ -111,7 +115,7 @@
}
public String getHeaderClassInactive() {
- return (String) getStateHelper().eval(PropertyKeys.headerClassInactive);
+ return (String) getStateHelper().eval(PropertyKeys.headerClassInactive, getTabPanel().getTabHeaderClassInactive());
}
public void setHeaderClassInactive(String headerClassInactive) {
@@ -119,7 +123,7 @@
}
public String getHeaderClass() {
- return (String) getStateHelper().eval(PropertyKeys.headerClass);
+ return (String) getStateHelper().eval(PropertyKeys.headerClass, getTabPanel().getTabHeaderClass());
}
public void setHeaderClass(String headerClass) {
@@ -135,7 +139,7 @@
}
public String getContentClass() {
- return (String) getStateHelper().eval(PropertyKeys.contentClass);
+ return (String) getStateHelper().eval(PropertyKeys.contentClass, getTabPanel().getTabContentClass());
}
public void setContentClass(String contentClass) {
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19419 - in trunk/cdk: maven-cdk-plugin/src/it/annotated-component/src/main/templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-10-01 17:44:47 -0400 (Fri, 01 Oct 2010)
New Revision: 19419
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd
trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd
trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd
trunk/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml
Log:
RESOLVED - issue RF-8950: Add cdk extension attributes to the template schema
https://jira.jboss.org/browse/RF-8950
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2010-10-01 19:29:39 UTC (rev 19418)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2010-10-01 21:44:47 UTC (rev 19419)
@@ -19,10 +19,9 @@
<xs:schema targetNamespace="http://jboss.org/schema/richfaces/cdk/jsf/composite"
xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite" xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" />
<xs:annotation>
<xs:documentation>
@@ -308,7 +307,7 @@
<xs:complexType name="compositeImplementationType"
mixed="true">
<xs:choice>
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##other " />
</xs:choice>
</xs:complexType>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2010-10-01 19:29:39 UTC (rev 19418)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2010-10-01 21:44:47 UTC (rev 19419)
@@ -26,7 +26,6 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://jboss.org/schema/richfaces/cdk/jstl/core" xmlns="http://jboss.org/schema/richfaces/cdk/jstl/core"
- xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
@@ -35,8 +34,29 @@
</xs:documentation>
</xs:annotation>
- <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" />
+ <xs:simpleType name="elStrictExpression">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="#\{[^\}]+\}" />
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="literalExpression">
+ <xs:restriction base="xs:string">
+ <!-- TODO -->
+ <xs:pattern value=".*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="elMixedExpression">
+ <xs:restriction base="xs:string">
+ <xs:pattern value=".*#\{[^\}]+\}.*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="elFreeformExpression">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
<xs:complexType name="arbitraryContent" mixed="true">
<xs:choice>
<xs:any minOccurs="0" maxOccurs="unbounded" />
@@ -47,7 +67,7 @@
<xs:complexContent>
<xs:extension base="arbitraryContent">
<xs:attribute name="test" form="unqualified" use="required"
- type="cdk:elStrictExpression">
+ type="elStrictExpression">
<xs:annotation>
<xs:documentation>
<p>The test condition that determines whether or not the body content should be processed.</p>
@@ -111,14 +131,14 @@
<xs:complexType>
<xs:complexContent>
<xs:extension base="arbitraryContent">
- <xs:attribute name="items" type="cdk:elStrictExpression">
+ <xs:attribute name="items" type="elStrictExpression">
<xs:annotation>
<xs:documentation>
<p>Collection of items to iterate over.</p>
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="var" type="cdk:literalExpression">
+ <xs:attribute name="var" type="literalExpression">
<xs:annotation>
<xs:documentation>
<p>Name of the exported scoped variable for the current item of the iteration.
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2010-10-01 19:29:39 UTC (rev 19418)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2010-10-01 21:44:47 UTC (rev 19419)
@@ -28,7 +28,9 @@
targetNamespace="http://jboss.org/schema/richfaces/cdk/core" xmlns="http://jboss.org/schema/richfaces/cdk/core"
elementFormDefault="qualified" attributeFormDefault="unqualified"
xmlns:xhtml="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core" xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite">
+ xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core"
+ xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite"
+ xmlns:x="http://jboss.org/schema/richfaces/cdk/ext">
<xs:annotation>
<xs:documentation>
@@ -36,33 +38,12 @@
</xs:documentation>
</xs:annotation>
- <xs:import schemaLocation="web-facesuicomponent_2_0.xsd" namespace="http://java.sun.com/xml/ns/javaee" />
+ <xs:import schemaLocation="http://java.sun.com/xml/ns/javaee/web-facesuicomponent_2_0.xsd" namespace="http://java.sun.com/xml/ns/javaee" />
<xs:import schemaLocation="cdk-composite.xsd" namespace="http://jboss.org/schema/richfaces/cdk/jsf/composite" />
<xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://jboss.org/schema/richfaces/cdk/jstl/core" />
+ <xs:import schemaLocation="cdk-extensions.xsd" namespace="http://jboss.org/schema/richfaces/cdk/ext" />
- <xs:simpleType name="elStrictExpression">
- <xs:restriction base="xs:string">
- <xs:pattern value="#\{[^\}]+\}" />
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="literalExpression">
- <xs:restriction base="xs:string">
- <!-- TODO -->
- <xs:pattern value=".*" />
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="elMixedExpression">
- <xs:restriction base="xs:string">
- <xs:pattern value=".*#\{[^\}]+\}.*" />
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="elFreeformExpression">
- <xs:restriction base="xs:string" />
- </xs:simpleType>
-
<xs:simpleType name="resourceDependencyTargets">
<xs:restriction base="xs:string">
<xs:enumeration value="body" />
@@ -145,8 +126,45 @@
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="passThrough">
+ <xs:annotation>
+ <xs:documentation>
+ <p>Enables pass-through rendering of attributes. Allows to define whitespace-separated list of attributes
+ to include. If component attribute name is different from default, the exact name can be added after colon.</p>
+ <p>
+ Examples:
+
+ <ul>
+ <li><code><![CDATA[<div cdk:passThrough="title style"></code>]]></code></li>
+ <li><code><![CDATA[<div cdk:passThrough="title:headTitle style">]]></code></li>
+ </ul>
+
+ <span class="usage">
+ Attributes already defined on the tag are automatically excluded from pass-through
+ rendering.
+ </span>
+ </p>
+ <p>If "disabled" attribute of the component is true (i.e. boolean true or "true"), then
+ attributes that have associated behavior events are not encoded.</p>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list>
+ <xs:simpleType>
+ <xs:restriction base="xs:NMTOKEN" />
+ </xs:simpleType>
+ </xs:list>
+ </xs:simpleType>
+ <xs:minLength value="0" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
<xs:attributeGroup name="core.attrs">
<xs:attribute ref="passThroughWithExclusions" />
+ <xs:attribute ref="passThrough" />
</xs:attributeGroup>
<xs:element name="root">
@@ -260,10 +278,11 @@
</li>
<li>
all content declared inside <code><![CDATA[<cdk:body>]]></code> tag is compiled into
- statements of <code>encodeChildren(...)</code> method.
+ statements of <code>encodeChildren(...)</code> method. If content of body element is empty,
+ no encodeChildren(...) method will be generated unless 'enforce' attribute set to true.
</li>
<li>
- all content declared before <code><![CDATA[<cdk:body>]]></code> tag is compiled into
+ all content declared after <code><![CDATA[<cdk:body>]]></code> tag is compiled into
statements of <code>encodeEnd(...)</code> method
</li>
</ul>
@@ -344,6 +363,39 @@
]]></pre>
<br /><br />
+ If you want to disable default encodeChildren method, use enforce attribute:
+ <pre><![CDATA[
+ ...
+ <cc:implementation>
+ <div id="myId">
+ <cdk:body enforce="true"/>
+ </div>
+ </cc:implementation>
+ ...
+ ]]></pre>
+ produces the following code (unsignificant details are ommitted):
+ <pre><![CDATA[
+ ...
+
+ encodeBegin(...) {
+ ...
+ writer.startElement("div", cc);
+ writer.writeAttribute("id", "myId", null);
+ }
+
+ encodeChildren(...) {
+ // empty method.
+ }
+
+ encodeEnd(...) {
+ ...
+ writer.endElement("div");
+ }
+
+ ...
+ ]]></pre>
+
+ <br /><br />
The following code snippet:
<pre><![CDATA[
...
@@ -374,11 +426,14 @@
<xs:choice>
<xs:any minOccurs="0" maxOccurs="unbounded" />
</xs:choice>
+ <xs:attribute name="enforce" type="xs:boolean"/>
</xs:complexType>
</xs:element>
<xs:element ref="c:if" />
<xs:element ref="c:choose" />
<xs:element ref="call" />
+ <xs:element ref="switch" />
+ <xs:element ref="object" />
</xs:choice>
</xs:group>
@@ -426,7 +481,7 @@
<xs:complexType mixed="true">
<xs:simpleContent>
<xs:extension base="xs:string">
- <xs:attribute name="name" form="unqualified" type="literalExpression" use="required">
+ <xs:attribute name="name" form="unqualified" type="c:literalExpression" use="required">
<xs:annotation>
<xs:documentation>
<p>Name of the variable, corresponding to Java identifier syntax.</p>
@@ -461,12 +516,13 @@
<xs:annotation>
<xs:documentation>
<p>Variable type name. CDK automatically resolves simple names for primitive types,
- JSF API classes and objects from java.lang.* or java.util.*.</p>
+ JSF API classes and objects from java.lang.* or java.util.*.
+ For parametrised types you can use java generics syntax </p>
<p>Examples:
<ul>
<li><code><![CDATA[<cdk:object type="java.lang.String" ...>]]></code></li>
<li><code><![CDATA[<cdk:object type="float" ...>]]></code></li>
- <li><code><![CDATA[<cdk:object type="List" ...>]]></code></li>
+ <li><code><![CDATA[<cdk:object type="List<String>" ...>]]></code></li>
<li><code><![CDATA[<cdk:object type="UIComponent" ...>]]></code></li>
</ul>
</p>
@@ -475,24 +531,6 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="type-arguments" form="unqualified" type="xs:string">
- <xs:annotation>
- <xs:documentation>
- <p>Comma-separated list of generic type arguments for usage with types like
- java.util.List or java.util.Map.</p>
- <p>Examples:
- <ul>
- <li>
- <code><![CDATA[<cdk:object name="map" type="Map" type-arguments="String, Object" />]]></code>
- </li>
- <li>
- <code><![CDATA[<cdk:object name="list" type="List" type-arguments="UIComponent" />]]></code>
- </li>
- </ul>
- </p>
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -541,7 +579,7 @@
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="key" use="required" form="unqualified" type="elStrictExpression" />
+ <xs:attribute name="key" use="required" form="unqualified" type="c:elStrictExpression" />
</xs:complexType>
</xs:element>
</xs:schema>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2010-10-01 19:29:39 UTC (rev 19418)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2010-10-01 21:44:47 UTC (rev 19419)
@@ -18,9 +18,10 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jboss.org/schema/richfaces/cdk/xhtml-el"
xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns:xml="http://www.w3.org/XML/1998/namespace"
elementFormDefault="qualified" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
- xmlns:cdk-addinfo="http://jboss.org/schema/richfaces/cdk/additional-attributes-info">
+ xmlns:cdk-addinfo="http://jboss.org/schema/richfaces/cdk/additional-attributes-info"
+ xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core"
+ xmlns:x="http://jboss.org/schema/richfaces/cdk/ext">
- <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" />
<xs:annotation>
<xs:documentation>
@@ -80,6 +81,10 @@
</xs:documentation>
</xs:annotation>
+ <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" />
+ <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://jboss.org/schema/richfaces/cdk/jstl/core" />
+ <xs:import schemaLocation="cdk-extensions.xsd" namespace="http://jboss.org/schema/richfaces/cdk/ext" />
+
<xs:annotation>
<xs:documentation>
================== Imported Names
@@ -93,7 +98,7 @@
media type, as per [RFC2045]
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="ContentTypes">
@@ -103,7 +108,7 @@
[RFC2045]
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="Charset">
@@ -112,7 +117,7 @@
a character encoding, as per [RFC2045]
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="Charsets">
@@ -122,7 +127,7 @@
per [RFC2045]
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="LanguageCode">
@@ -131,7 +136,7 @@
a language code, as per [RFC3066]
</xs:documentation>
</xs:annotation>
- <xs:union memberTypes="xs:language cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:language c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="Character">
@@ -148,7 +153,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -165,7 +170,7 @@
one or more digits
</xs:documentation>
</xs:annotation>
- <xs:union memberTypes="simpleType.Number cdk:elMixedExpression" />
+ <xs:union memberTypes="simpleType.Number c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="tabindexNumber">
@@ -188,7 +193,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression" />
+ <xs:restriction base="c:elMixedExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -199,7 +204,7 @@
space-separated list of link types
</xs:documentation>
</xs:annotation>
- <xs:union memberTypes="xs:NMTOKENS cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:NMTOKENS c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="MediaDesc">
@@ -215,7 +220,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -226,7 +231,7 @@
a Uniform Resource Identifier, see [RFC2396]
</xs:documentation>
</xs:annotation>
- <xs:union memberTypes="xs:anyURI cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:anyURI c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="UriList">
@@ -236,7 +241,7 @@
Identifiers
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="Datetime">
@@ -245,7 +250,7 @@
date and time information. ISO date format
</xs:documentation>
</xs:annotation>
- <xs:union memberTypes="xs:dateTime cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:dateTime c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="Script">
@@ -254,7 +259,7 @@
script expression
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="StyleSheet">
@@ -263,7 +268,7 @@
style sheet data
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="Text">
@@ -272,7 +277,7 @@
used for titles etc.
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:simpleType name="FrameTarget">
@@ -288,7 +293,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -306,7 +311,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -324,7 +329,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -335,7 +340,7 @@
integer representing length in pixels
</xs:documentation>
</xs:annotation>
- <xs:union memberTypes="xs:nonNegativeInteger cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:nonNegativeInteger c:elMixedExpression" />
</xs:simpleType>
<xs:annotation>
@@ -355,7 +360,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -373,7 +378,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -395,7 +400,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -428,26 +433,26 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
<!-- TODO: add constraints -->
<xs:simpleType name="ID">
- <xs:union memberTypes="xs:ID cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:ID c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="IDREF">
- <xs:union memberTypes="xs:IDREF cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:IDREF c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="IDREFS">
- <xs:union memberTypes="xs:IDREFS cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:IDREFS c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="NMTOKEN">
- <xs:union memberTypes="xs:NMTOKEN cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:NMTOKEN c:elMixedExpression" />
</xs:simpleType>
<xs:simpleType name="NMTOKENS">
- <xs:union memberTypes="xs:NMTOKENS cdk:elMixedExpression" />
+ <xs:union memberTypes="xs:NMTOKENS c:elMixedExpression" />
</xs:simpleType>
<xs:annotation>
@@ -466,6 +471,7 @@
</xs:appinfo>
</xs:annotation>
</xs:attribute>
+ <xs:attribute ref="x:class"/>
</xs:attributeGroup>
<xs:attributeGroup name="coreattrs">
@@ -484,6 +490,7 @@
<xs:attribute name="id" type="ID" />
<xs:attribute name="style" type="StyleSheet" />
<xs:attribute name="title" type="Text" />
+ <xs:attributeGroup ref="x:coreattrs" />
</xs:attributeGroup>
<xs:simpleType name="simpleType.dir">
@@ -509,9 +516,10 @@
<xs:attribute ref="xml:lang" />
<xs:attribute name="dir">
<xs:simpleType>
- <xs:union memberTypes="simpleType.dir cdk:elMixedExpression" />
+ <xs:union memberTypes="simpleType.dir c:elMixedExpression" />
</xs:simpleType>
</xs:attribute>
+ <xs:attributeGroup ref="x:i18n" />
</xs:attributeGroup>
<xs:attributeGroup name="events">
@@ -543,6 +551,7 @@
<xs:attribute name="onkeypress" type="Script" />
<xs:attribute name="onkeydown" type="Script" />
<xs:attribute name="onkeyup" type="Script" />
+ <xs:attributeGroup ref="x:events" />
</xs:attributeGroup>
<xs:attributeGroup name="focus">
@@ -561,6 +570,7 @@
<xs:attribute name="tabindex" type="tabindexNumber" />
<xs:attribute name="onfocus" type="Script" />
<xs:attribute name="onblur" type="Script" />
+ <xs:attributeGroup ref="x:focus" />
</xs:attributeGroup>
<xs:attributeGroup name="attrs">
@@ -588,11 +598,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:align"/>
</xs:attributeGroup>
<xs:annotation>
@@ -868,7 +879,19 @@
<xs:attribute default="rect" name="shape" type="Shape"></xs:attribute>
<xs:attribute name="coords" type="Coords"></xs:attribute>
<xs:attribute name="target" type="FrameTarget"></xs:attribute>
- <xs:attributeGroup ref="cdk:core.attrs" />
+
+ <xs:attribute ref="x:charset" ></xs:attribute>
+ <xs:attribute ref="x:type" ></xs:attribute>
+ <xs:attribute ref="x:name" ></xs:attribute>
+ <xs:attribute ref="x:href" ></xs:attribute>
+ <xs:attribute ref="x:hreflang" ></xs:attribute>
+ <xs:attribute ref="x:rel" ></xs:attribute>
+ <xs:attribute ref="x:rev" ></xs:attribute>
+ <xs:attribute ref="x:shape" ></xs:attribute>
+ <xs:attribute ref="x:coords" ></xs:attribute>
+ <xs:attribute ref="x:target" ></xs:attribute>
+
+ <xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:group name="a.children">
@@ -1126,7 +1149,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -1144,7 +1167,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -1331,7 +1354,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -1346,11 +1369,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:compact" />
</xs:attributeGroup>
<xs:element name="ul" type="ul.content">
@@ -1380,7 +1404,7 @@
first list item in an ordered list.
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:element name="ol" type="ol.content">
@@ -1413,7 +1437,7 @@
LIStyle is constrained to: "(ULStyle|OLStyle)"
</xs:documentation>
</xs:annotation>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
<xs:element name="li">
@@ -1640,14 +1664,14 @@
<xs:attributeGroup ref="events" />
<xs:attribute name="lang" type="LanguageCode" />
<xs:attribute ref="xml:lang" />
- <xs:attribute name="dir" use="required">
+ <xs:attribute name="dir" use="optional">
<xs:annotation>
<xs:appinfo>
<cdk-addinfo:default-value>ltr</cdk-addinfo:default-value>
</xs:appinfo>
</xs:annotation>
<xs:simpleType>
- <xs:union memberTypes="simpleType.dir cdk:elMixedExpression" />
+ <xs:union memberTypes="simpleType.dir c:elMixedExpression" />
</xs:simpleType>
</xs:attribute>
</xs:extension>
@@ -1824,6 +1848,7 @@
<xs:extension base="Inline">
<xs:attributeGroup ref="attrs" />
<xs:attribute name="cite" type="URI" />
+ <xs:attribute ref="x:cite" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -2001,6 +2026,10 @@
<xs:attribute name="size" />
<xs:attribute name="color" type="Color" />
<xs:attribute name="face" />
+
+ <xs:attribute ref="x:size" />
+ <xs:attribute ref="x:color" />
+ <xs:attribute ref="x:face" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -2098,7 +2127,7 @@
<xs:complexContent>
<xs:extension base="form.content">
<xs:attributeGroup ref="attrs" />
- <xs:attribute name="action" use="required" type="URI" />
+ <xs:attribute name="action" use="optional" type="URI" />
<xs:attribute name="method" default="get">
<xs:simpleType>
<xs:union>
@@ -2109,7 +2138,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2121,6 +2150,16 @@
<xs:attribute name="accept" type="ContentTypes" />
<xs:attribute name="accept-charset" type="Charsets" />
<xs:attribute name="target" type="FrameTarget" />
+
+ <xs:attribute ref="x:action" />
+ <xs:attribute ref="x:method" ></xs:attribute>
+ <xs:attribute ref="x:enctype" />
+ <xs:attribute ref="x:onsubmit" />
+ <xs:attribute ref="x:onreset" />
+ <xs:attribute ref="x:accept" />
+ <xs:attribute ref="x:accept-charset" />
+ <xs:attribute ref="x:target" />
+
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -2141,6 +2180,12 @@
<xs:attribute name="accesskey" type="Character" />
<xs:attribute name="onfocus" type="Script" />
<xs:attribute name="onblur" type="Script" />
+
+ <xs:attribute ref="x:for" />
+ <xs:attribute ref="x:accesskey" />
+ <xs:attribute ref="x:onfocus" />
+ <xs:attribute ref="x:onblur" />
+
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -2163,7 +2208,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2178,11 +2223,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:checked" />
</xs:attributeGroup>
<xs:attributeGroup name="disabledGroup">
@@ -2195,11 +2241,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:disabled"></xs:attribute>
</xs:attributeGroup>
<xs:attributeGroup name="readonlyGroup">
@@ -2212,11 +2259,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:readonly"></xs:attribute>
</xs:attributeGroup>
<xs:element name="input" type="input.content">
@@ -2286,7 +2334,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2334,11 +2382,16 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+
+ <xs:attribute ref="x:name" />
+ <xs:attribute ref="x:value" />
+ <xs:attribute ref="x:type" />
+
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -2392,7 +2445,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2419,7 +2472,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2439,7 +2492,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2466,13 +2519,18 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="char" type="Character" />
<xs:attribute name="charoff" type="Length" />
+
+ <xs:attribute ref="x:align"/>
+ <xs:attribute ref="x:char"/>
+ <xs:attribute ref="x:charoff"/>
+
</xs:attributeGroup>
<xs:attributeGroup name="cellvalign">
@@ -2493,11 +2551,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:valign"/>
</xs:attributeGroup>
<xs:element name="table" type="table.content">
@@ -2514,7 +2573,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elFreeformExpression" />
+ <xs:restriction base="c:elFreeformExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2607,7 +2666,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression" />
+ <xs:restriction base="c:elMixedExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2629,11 +2688,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression" />
+ <xs:restriction base="c:elMixedExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:nowrap" />
</xs:attributeGroup>
<xs:element name="th">
@@ -2711,12 +2771,24 @@
<xs:attribute name="object" type="xs:anySimpleType"></xs:attribute>
<xs:attribute name="alt" type="Text"></xs:attribute>
<xs:attribute name="name" type="NMTOKEN"></xs:attribute>
- <xs:attribute use="required" name="width" type="Length"></xs:attribute>
- <xs:attribute use="required" name="height" type="Length"></xs:attribute>
+ <xs:attribute use="optional" name="width" type="Length"></xs:attribute>
+ <xs:attribute use="optional" name="height" type="Length"></xs:attribute>
<xs:attribute name="align" type="ImgAlign"></xs:attribute>
<xs:attribute name="hspace" type="Pixels"></xs:attribute>
<xs:attribute name="vspace" type="Pixels"></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
+
+ <xs:attribute ref="x:codebase" ></xs:attribute>
+ <xs:attribute ref="x:archive" ></xs:attribute>
+ <xs:attribute ref="x:code" ></xs:attribute>
+ <xs:attribute ref="x:object" ></xs:attribute>
+ <xs:attribute ref="x:alt" ></xs:attribute>
+ <xs:attribute ref="x:name" ></xs:attribute>
+ <xs:attribute ref="x:width" ></xs:attribute>
+ <xs:attribute ref="x:height" ></xs:attribute>
+ <xs:attribute ref="x:align" ></xs:attribute>
+ <xs:attribute ref="x:hspace" ></xs:attribute>
+ <xs:attribute ref="x:vspace" ></xs:attribute>
</xs:complexType>
<xs:group name="applet.children">
@@ -2753,28 +2825,47 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
- <xs:attribute use="required" name="alt" type="Text"></xs:attribute>
+
+ <xs:attribute use="optional" name="alt" type="Text"></xs:attribute>
<xs:attribute name="target" type="FrameTarget"></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
+
+ <xs:attribute ref="x:alt" ></xs:attribute>
+ <xs:attribute ref="x:target" ></xs:attribute>
+ <xs:attribute ref="x:shape" ></xs:attribute>
+ <xs:attribute ref="x:coords" ></xs:attribute>
+ <xs:attribute ref="x:href" ></xs:attribute>
+ <xs:attribute ref="x:nohref"></xs:attribute>
+
</xs:complexType>
<xs:complexType name="base.content">
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attribute name="id" type="ID"></xs:attribute>
<xs:attribute name="href" type="URI"></xs:attribute>
<xs:attribute name="target" type="FrameTarget"></xs:attribute>
+
+ <xs:attribute ref="x:id" ></xs:attribute>
+ <xs:attribute ref="x:href" ></xs:attribute>
+ <xs:attribute ref="x:target" ></xs:attribute>
+
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="basefont.content">
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attribute name="id" type="ID" />
- <xs:attribute use="required" name="size" type="xs:anySimpleType" />
+ <xs:attribute use="optional" name="size" type="xs:anySimpleType" />
<xs:attribute name="color" type="Color" />
<xs:attribute name="face" type="xs:anySimpleType" />
+
+ <xs:attribute ref="x:id" />
+ <xs:attribute ref="x:size" />
+ <xs:attribute ref="x:color" />
+ <xs:attribute ref="x:face" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="br.content">
@@ -2792,11 +2883,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute ref="x:clear" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="col.content">
@@ -2806,6 +2898,10 @@
<xs:attribute name="width" type="MultiLength"></xs:attribute>
<xs:attributeGroup ref="cellhalign"></xs:attributeGroup>
<xs:attributeGroup ref="cellvalign"></xs:attributeGroup>
+
+ <xs:attribute ref="x:span" />
+ <xs:attribute ref="x:width" />
+
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="colgroup.content">
@@ -2815,6 +2911,9 @@
<xs:attribute name="width" type="MultiLength" />
<xs:attributeGroup ref="cellhalign" />
<xs:attributeGroup ref="cellvalign" />
+
+ <xs:attribute ref="x:span" />
+ <xs:attribute ref="x:width" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:group name="colgroup.children">
@@ -2885,6 +2984,9 @@
<xs:attributeGroup ref="i18n"></xs:attributeGroup>
<xs:attribute name="id" type="ID"></xs:attribute>
<xs:attribute name="profile" type="URI"></xs:attribute>
+
+ <xs:attribute ref="x:id" />
+ <xs:attribute ref="x:profile" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
@@ -2923,7 +3025,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2937,19 +3039,24 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="size" type="Pixels"></xs:attribute>
<xs:attribute name="width" type="Length"></xs:attribute>
+
+ <xs:attribute ref="x:size" />
+ <xs:attribute ref="x:width" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="html.content">
<xs:group ref="html.children" />
<xs:attributeGroup ref="i18n"></xs:attributeGroup>
<xs:attribute name="id" type="ID"></xs:attribute>
+
+ <xs:attribute ref="x:id" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:group name="html.children">
@@ -2962,8 +3069,8 @@
<xs:complexType name="img.content">
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attributeGroup ref="attrs"></xs:attributeGroup>
- <xs:attribute use="required" name="src" type="URI"></xs:attribute>
- <xs:attribute use="required" name="alt" type="Text">
+ <xs:attribute use="optional" name="src" type="URI"></xs:attribute>
+ <xs:attribute use="optional" name="alt" type="Text">
<xs:annotation>
<xs:appinfo>
<cdk-addinfo:default-value></cdk-addinfo:default-value>
@@ -2986,7 +3093,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -2995,6 +3102,18 @@
<xs:attribute name="border" type="Length"></xs:attribute>
<xs:attribute name="hspace" type="Pixels"></xs:attribute>
<xs:attribute name="vspace" type="Pixels"></xs:attribute>
+
+ <xs:attribute ref="x:src" ></xs:attribute>
+ <xs:attribute ref="x:alt" ></xs:attribute>
+ <xs:attribute ref="x:name" ></xs:attribute>
+ <xs:attribute ref="x:longdesc" ></xs:attribute>
+ <xs:attribute ref="x:height" ></xs:attribute>
+ <xs:attribute ref="x:width" ></xs:attribute>
+ <xs:attribute ref="x:usemap" ></xs:attribute>
+ <xs:attribute ref="x:align" ></xs:attribute>
+ <xs:attribute ref="x:border" ></xs:attribute>
+ <xs:attribute ref="x:hspace" ></xs:attribute>
+ <xs:attribute ref="x:vspace" ></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="input.content">
@@ -3018,6 +3137,20 @@
<xs:attribute name="onchange" type="Script"></xs:attribute>
<xs:attribute name="accept" type="ContentTypes"></xs:attribute>
<xs:attribute name="align" type="ImgAlign"></xs:attribute>
+
+ <xs:attribute ref="x:type" ></xs:attribute>
+ <xs:attribute ref="x:name" ></xs:attribute>
+ <xs:attribute ref="x:value" ></xs:attribute>
+ <xs:attribute ref="x:size" ></xs:attribute>
+ <xs:attribute ref="x:maxlength" ></xs:attribute>
+ <xs:attribute ref="x:src" ></xs:attribute>
+ <xs:attribute ref="x:alt" ></xs:attribute>
+ <xs:attribute ref="x:usemap" ></xs:attribute>
+ <xs:attribute ref="x:onselect" ></xs:attribute>
+ <xs:attribute ref="x:onchange" ></xs:attribute>
+ <xs:attribute ref="x:accept" ></xs:attribute>
+ <xs:attribute ref="x:align" ></xs:attribute>
+
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="isindex.content">
@@ -3038,6 +3171,15 @@
<xs:attribute name="rev" type="LinkTypes"></xs:attribute>
<xs:attribute name="media" type="MediaDesc"></xs:attribute>
<xs:attribute name="target" type="FrameTarget"></xs:attribute>
+
+ <xs:attribute ref="x:charset" ></xs:attribute>
+ <xs:attribute ref="x:href" ></xs:attribute>
+ <xs:attribute ref="x:hreflang" ></xs:attribute>
+ <xs:attribute ref="x:type" ></xs:attribute>
+ <xs:attribute ref="x:rel" ></xs:attribute>
+ <xs:attribute ref="x:rev" ></xs:attribute>
+ <xs:attribute ref="x:media" ></xs:attribute>
+ <xs:attribute ref="x:target" ></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="map.content">
@@ -3045,10 +3187,15 @@
<xs:attributeGroup ref="i18n"></xs:attributeGroup>
<xs:attributeGroup ref="events"></xs:attributeGroup>
<xs:attributeGroup ref="classGroup" />
- <xs:attribute use="required" name="id" type="ID" />
+ <xs:attribute use="optional" name="id" type="ID" />
<xs:attribute name="style" type="StyleSheet" />
<xs:attribute name="title" type="Text" />
<xs:attribute name="name" type="xs:anySimpleType" />
+
+ <xs:attribute ref="x:id" />
+ <xs:attribute ref="x:style" />
+ <xs:attribute ref="x:title" />
+ <xs:attribute ref="x:name" />
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
@@ -3091,9 +3238,16 @@
<xs:attribute name="id" type="ID"></xs:attribute>
<xs:attribute name="http-equiv" type="xs:anySimpleType"></xs:attribute>
<xs:attribute name="name" type="xs:anySimpleType"></xs:attribute>
- <xs:attribute use="required" name="content" type="xs:anySimpleType">
+ <xs:attribute use="optional" name="content" type="xs:anySimpleType">
</xs:attribute>
<xs:attribute name="scheme" type="xs:anySimpleType"></xs:attribute>
+
+ <xs:attribute ref="x:id" ></xs:attribute>
+ <xs:attribute ref="x:http-equiv" ></xs:attribute>
+ <xs:attribute ref="x:name" ></xs:attribute>
+ <xs:attribute ref="x:content" >
+ </xs:attribute>
+ <xs:attribute ref="x:scheme" ></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="object.content" mixed="true">
@@ -3108,7 +3262,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -3172,7 +3326,7 @@
<xs:group ref="optgroup.children" />
<xs:attributeGroup ref="attrs"></xs:attributeGroup>
<xs:attributeGroup ref="disabledGroup" />
- <xs:attribute use="required" name="label" type="Text"></xs:attribute>
+ <xs:attribute use="optional" name="label" type="Text"></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
@@ -3196,7 +3350,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -3208,7 +3362,7 @@
<xs:complexType name="param.content">
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attribute name="id" type="ID"></xs:attribute>
- <xs:attribute use="required" name="name" type="xs:anySimpleType">
+ <xs:attribute use="optional" name="name" type="xs:anySimpleType">
</xs:attribute>
<xs:attribute name="value" type="xs:anySimpleType"></xs:attribute>
<xs:attribute default="data" name="valuetype">
@@ -3222,7 +3376,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -3234,7 +3388,7 @@
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attribute name="id" type="ID"></xs:attribute>
<xs:attribute name="charset" type="Charset"></xs:attribute>
- <xs:attribute use="required" name="type" type="ContentType"></xs:attribute>
+ <xs:attribute use="optional" name="type" type="ContentType"></xs:attribute>
<xs:attribute name="language" type="xs:anySimpleType"></xs:attribute>
<xs:attribute name="src" type="URI"></xs:attribute>
<xs:attribute name="defer">
@@ -3246,7 +3400,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression"></xs:restriction>
+ <xs:restriction base="c:elMixedExpression"></xs:restriction>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -3269,7 +3423,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="cdk:elMixedExpression" />
+ <xs:restriction base="c:elMixedExpression" />
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -3295,7 +3449,7 @@
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attributeGroup ref="i18n"></xs:attributeGroup>
<xs:attribute name="id" type="ID"></xs:attribute>
- <xs:attribute use="required" name="type" type="ContentType"></xs:attribute>
+ <xs:attribute use="optional" name="type" type="ContentType"></xs:attribute>
<xs:attribute name="media" type="MediaDesc"></xs:attribute>
<xs:attribute name="title" type="Text"></xs:attribute>
<xs:attribute fixed="preserve" ref="xml:space"></xs:attribute>
@@ -3357,11 +3511,17 @@
<xs:attributeGroup ref="focus"></xs:attributeGroup>
<xs:attributeGroup ref="disabledGroup" />
<xs:attribute name="name" type="xs:anySimpleType"></xs:attribute>
- <xs:attribute use="required" name="rows" type="Number"></xs:attribute>
- <xs:attribute use="required" name="cols" type="Number"></xs:attribute>
+ <xs:attribute use="optional" name="rows" type="Number"></xs:attribute>
+ <xs:attribute use="optional" name="cols" type="Number"></xs:attribute>
<xs:attributeGroup ref="readonlyGroup" />
<xs:attribute name="onselect" type="Script"></xs:attribute>
<xs:attribute name="onchange" type="Script"></xs:attribute>
+
+ <xs:attribute ref="x:name" ></xs:attribute>
+ <xs:attribute ref="x:rows" ></xs:attribute>
+ <xs:attribute ref="x:cols" ></xs:attribute>
+ <xs:attribute ref="x:onselect" ></xs:attribute>
+ <xs:attribute ref="x:onchange" ></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
<xs:complexType name="tfoot.content">
@@ -3398,6 +3558,7 @@
<xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" />
<xs:attributeGroup ref="i18n"></xs:attributeGroup>
<xs:attribute name="id" type="ID"></xs:attribute>
+ <xs:attribute ref="x:id"></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
@@ -3407,6 +3568,8 @@
<xs:attributeGroup ref="cellhalign"></xs:attributeGroup>
<xs:attributeGroup ref="cellvalign"></xs:attributeGroup>
<xs:attribute name="bgcolor" type="Color"></xs:attribute>
+
+ <xs:attribute ref="x:bgcolor"></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
@@ -3425,6 +3588,8 @@
<xs:attributeGroup ref="attrs" />
<xs:attribute name="type" type="ULStyle" />
<xs:attributeGroup ref="compactGroup" />
+
+ <xs:attribute ref="x:type"></xs:attribute>
<xs:attributeGroup ref="cdk:core.attrs" />
</xs:complexType>
Modified: trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-10-01 19:29:39 UTC (rev 19418)
+++ trunk/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-10-01 21:44:47 UTC (rev 19419)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
+<cdk:root xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core" xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite"
xmlns:x="http://jboss.org/schema/richfaces/cdk/ext">
<cc:interface>
@@ -37,9 +37,9 @@
</cc:interface>
<cc:implementation>
- <div id="#{clientId}" cdk:passThroughWithExclusions="id dir lang">
+ <div id="#{clientId}" cdk:passThroughWithExclusions="id dir lang" >
<input readonly="readonly"/>
- <input readonly="true"/>
+ <a x:onclick="onBodyClick" onclick="" href="/root/"/>
<c:if test="#{component.attributes['ifTest'] != null}">if content</c:if>
<c:choose>
<c:when test="#{component.attributes['anotherTest'] != null}">when content</c:when>
@@ -53,7 +53,7 @@
<ul x:style="listStyle" x:class="listClass" cdk:passThrough="id title:listTitle onclick:onlistclick ondblclick:onlistdblclick">
<c:forEach items="#{component.children}" var="iterationVar">
<li>forEach content <cdk:call>iterationVar.encodeAll(facesContext)</cdk:call></li>
- </c:forEach>
+ </c:forEach>
</ul>
</div>
</cc:implementation>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19418 - trunk/archetypes/richfaces-archetype-simpleapp.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-10-01 15:29:39 -0400 (Fri, 01 Oct 2010)
New Revision: 19418
Modified:
trunk/archetypes/richfaces-archetype-simpleapp/pom.xml
Log:
RF-9400 part of fix
Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-01 16:45:27 UTC (rev 19417)
+++ trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-01 19:29:39 UTC (rev 19418)
@@ -39,6 +39,7 @@
</plugin>
</plugins>
<resources>
+ <!-- Trigger filtering on resource directory -->
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19417 - in modules/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-01 12:45:27 -0400 (Fri, 01 Oct 2010)
New Revision: 19417
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTabPanelBean.properties
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/list.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
Log:
https://jira.jboss.org/browse/RFPL-837
* added one page for rich:tabPanel
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-10-01 16:15:35 UTC (rev 19416)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-10-01 16:45:27 UTC (rev 19417)
@@ -131,6 +131,7 @@
components.put("richProgressBar", "Rich Progress Bar");
components.put("richSubTable", "Rich Subtable");
components.put("richSubTableToggleControl", "Rich Subtable Toggle Control");
+ components.put("richTabPanel", "Rich Tab Panel");
components.put("richToggleControl", "Rich Toggle Control");
components.put("richTogglePanel", "Rich Toggle Panel");
components.put("richTogglePanelItem", "Rich Toggle Panel Item");
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2010-10-01 16:45:27 UTC (rev 19417)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * 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.tests.metamer.bean;
+
+import java.io.Serializable;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+import org.richfaces.component.html.HtmlTabPanel;
+
+import org.richfaces.tests.metamer.Attributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:tabPanel.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "richTabPanelBean")
+@SessionScoped
+public class RichTabPanelBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getUIComponentAttributes(HtmlTabPanel.class, getClass());
+
+ attributes.setAttribute("activeItem", "tab1");
+ attributes.setAttribute("rendered", true);
+
+ // TODO has to be tested in another way
+ attributes.remove("converter");
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTabPanelBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTabPanelBean.properties (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTabPanelBean.properties 2010-10-01 16:45:27 UTC (rev 19417)
@@ -0,0 +1,12 @@
+attr.dir.LTR=LTR
+attr.dir.RTL=RTL
+attr.dir.null=
+
+attr.headerAlignment.left=left
+attr.headerAlignment.right=right
+attr.headerAlignment.null=
+
+attr.switchType.client=client
+attr.switchType.server=server
+attr.switchType.ajax=ajax
+attr.switchType.null=
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/list.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/list.xhtml 2010-10-01 16:45:27 UTC (rev 19417)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <!--
+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.
+ -->
+
+ <ui:composition template="/templates/list.xhtml">
+
+ <ui:define name="pageTitle">Rich Tab Panel</ui:define>
+
+ <ui:define name="links">
+
+ <metamer:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page containing <b>rich:tabPanel</b> and input boxes for all its attributes.
+ </metamer:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-10-01 16:45:27 UTC (rev 19417)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+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.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:tabPanel id="tabPanel"
+ activeItem="#{richTabPanelBean.attributes['activeItem'].value}"
+ bypassUpdates="#{richTabPanelBean.attributes['bypassUpdates'].value}"
+ cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}"
+ data="#{richTabPanelBean.attributes['data'].value}"
+ dir="#{richTabPanelBean.attributes['dir'].value}"
+ execute="#{richTabPanelBean.attributes['execute'].value}"
+ firstItem="#{richTabPanelBean.attributes['firstItem'].value}"
+ headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}"
+ headerPosition="#{richTabPanelBean.attributes['headerPosition'].value}"
+ immediate="#{richTabPanelBean.attributes['immediate'].value}"
+ itemByIndex="#{richTabPanelBean.attributes['itemByIndex'].value}"
+ itemChangeListener="#{richTabPanelBean.attributes['itemChangeListener'].value}"
+ itemChangeListeners="#{richTabPanelBean.attributes['itemChangeListeners'].value}"
+ lang="#{richTabPanelBean.attributes['lang'].value}"
+ lastItem="#{richTabPanelBean.attributes['lastItem'].value}"
+ limitToList="#{richTabPanelBean.attributes['limitToList'].value}"
+ localValue="#{richTabPanelBean.attributes['localValue'].value}"
+ localValueSet="#{richTabPanelBean.attributes['localValueSet'].value}"
+ nextItem="#{richTabPanelBean.attributes['nextItem'].value}"
+ onbeforeitemchange="#{richTabPanelBean.attributes['onbeforeitemchange'].value}"
+ onclick="#{richTabPanelBean.attributes['onclick'].value}"
+ ondblclick="#{richTabPanelBean.attributes['ondblclick'].value}"
+ onitemchange="#{richTabPanelBean.attributes['onitemchange'].value}"
+ onmousedown="#{richTabPanelBean.attributes['onmousedown'].value}"
+ onmousemove="#{richTabPanelBean.attributes['onmousemove'].value}"
+ onmouseout="#{richTabPanelBean.attributes['onmouseout'].value}"
+ onmouseover="#{richTabPanelBean.attributes['onmouseover'].value}"
+ onmouseup="#{richTabPanelBean.attributes['onmouseup'].value}"
+ prevItem="#{richTabPanelBean.attributes['prevItem'].value}"
+ render="#{richTabPanelBean.attributes['render'].value}"
+ rendered="#{richTabPanelBean.attributes['rendered'].value}"
+ renderedItems="#{richTabPanelBean.attributes['renderedItems'].value}"
+ required="#{richTabPanelBean.attributes['required'].value}"
+ status="#{richTabPanelBean.attributes['status'].value}"
+ style="#{richTabPanelBean.attributes['style'].value}"
+ styleClass="#{richTabPanelBean.attributes['styleClass'].value}"
+ submittedActiveItem="#{richTabPanelBean.attributes['submittedActiveItem'].value}"
+ submittedValue="#{richTabPanelBean.attributes['submittedValue'].value}"
+ switchType="#{richTabPanelBean.attributes['switchType'].value}"
+ tabContentClass="#{richTabPanelBean.attributes['tabContentClass'].value}"
+ tabHeaderClass="#{richTabPanelBean.attributes['tabHeaderClass'].value}"
+ tabHeaderClassActive="#{richTabPanelBean.attributes['tabHeaderClassActive'].value}"
+ tabHeaderClassDisabled="#{richTabPanelBean.attributes['tabHeaderClassDisabled'].value}"
+ tabHeaderClassInactive="#{richTabPanelBean.attributes['tabHeaderClassInactive'].value}"
+ title="#{richTabPanelBean.attributes['title'].value}"
+ valid="#{richTabPanelBean.attributes['valid'].value}"
+ value="#{richTabPanelBean.attributes['value'].value}"
+ >
+
+ <rich:tab name="tab1" header="tab1 header">
+ content of tab 1
+ </rich:tab>
+ <rich:tab name="tab2" header="tab2 header">
+ content of tab 2
+ </rich:tab>
+ <rich:tab name="tab3" header="tab3 header">
+ content of tab 3
+ </rich:tab>
+ <rich:tab name="tab4" header="tab4 header" disabled="true">
+ content of tab 4
+ </rich:tab>
+ <rich:tab name="tab5" header="tab5 header">
+ content of tab 5
+ </rich:tab>
+ </rich:tabPanel>
+
+ <br/><br/>
+ <fieldset>
+ <legend>JavaScript API</legend>
+
+ <script type="text/javascript">
+ testedComponentId = "#{rich:clientId('tabPanel')}";
+ </script>
+
+ <h:commandButton id="switchButton1" value="switch to tab1">
+ <rich:componentControl id="componentControl1" event="click" operation="switchToItem" target="tabPanel" >
+ <f:param value="tab1" />
+ </rich:componentControl>
+ </h:commandButton>
+ <h:commandButton id="switchButton2" value="switch to tab2">
+ <rich:componentControl id="componentControl2" event="click" operation="switchToItem" target="tabPanel" >
+ <f:param value="tab2" />
+ </rich:componentControl>
+ </h:commandButton>
+ <h:commandButton id="switchButton3" value="switch to tab3">
+ <rich:componentControl id="componentControl3" event="click" operation="switchToItem" target="tabPanel" >
+ <f:param value="tab3" />
+ </rich:componentControl>
+ </h:commandButton>
+ <h:commandButton id="switchButton4" value="switch to tab4">
+ <rich:componentControl id="componentControl4" event="click" operation="switchToItem" target="tabPanel" >
+ <f:param value="tab4" />
+ </rich:componentControl>
+ </h:commandButton>
+ <h:commandButton id="switchButton5" value="switch to tab5">
+ <rich:componentControl id="componentControl5" event="click" operation="switchToItem" target="tabPanel" >
+ <f:param value="tab5" />
+ </rich:componentControl>
+ </h:commandButton>
+
+ </fieldset>
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richTabPanelBean.attributes}" id="attributes" render="log"/>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r19416 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-10-01 12:15:35 -0400 (Fri, 01 Oct 2010)
New Revision: 19416
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java
Log:
fixed a4j:repeat inside ui:repeat sample regarding to RF-9396
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-10-01 15:26:52 UTC (rev 19415)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-10-01 16:15:35 UTC (rev 19416)
@@ -28,11 +28,11 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat1">
- <li><h:panelGroup columns="1" rendered="#{item == 'row 1'}">
+ <ui:repeat value="#{templateBean.dataTableModel}" var="uiRepeatTemplateItem" id="containerUiRepeat1">
+ <li><h:panelGroup columns="1" rendered="#{uiRepeatTemplateItem == 'row 1'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li>
+ <h:outputText value="#{uiRepeatTemplateItem}" rendered="#{uiRepeatTemplateItem != 'row 1'}" /></li>
</ui:repeat>
</ol>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-10-01 15:26:52 UTC (rev 19415)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-10-01 16:15:35 UTC (rev 19416)
@@ -28,11 +28,11 @@
<ui:composition>
<ol>
- <ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat2">
- <li><h:panelGroup columns="1" rendered="#{item == 'row 2'}">
+ <ui:repeat value="#{templateBean.dataTableModel}" var="uiRepeatTemplateItem" id="containerUiRepeat2">
+ <li><h:panelGroup columns="1" rendered="#{uiRepeatTemplateItem == 'row 2'}">
<ui:decorate template="#{templateBean.nextTemplate}.xhtml" />
</h:panelGroup>
- <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li>
+ <h:outputText value="#{uiRepeatTemplateItem}" rendered="#{uiRepeatTemplateItem != 'row 2'}" /></li>
</ui:repeat>
</ol>
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2010-10-01 15:26:52 UTC (rev 19415)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2010-10-01 16:15:35 UTC (rev 19416)
@@ -31,9 +31,7 @@
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
-import org.richfaces.tests.metamer.ftest.annotations.Templates;
import org.richfaces.tests.metamer.ftest.annotations.Use;
-import org.testng.SkipException;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -41,7 +39,6 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-@Templates(exclude = { "uiRepeat1", "uiRepeat2" })
public class TestSimple extends AbstractMetamerTest {
protected static final int ELEMENTS_TOTAL = 20;
13 years, 11 months
- 1
- 0