richfaces-svn-commits
July 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 611 discussions
JBoss Rich Faces SVN: r18254 - in root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: internal and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-07-28 09:38:50 -0400 (Wed, 28 Jul 2010)
New Revision: 18254
Added:
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java
Modified:
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/internal/NamedType.java
Log:
listener configuring underlying test instance parameters using @Inject and @Use (replacing of @Factory method approach)
Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-28 12:32:53 UTC (rev 18253)
+++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-28 13:38:50 UTC (rev 18254)
@@ -25,31 +25,17 @@
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.testng.Assert.assertEquals;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
import java.net.URL;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
import org.jboss.test.selenium.AbstractTestCase;
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.encapsulated.JavaScript;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
-import org.richfaces.tests.metamer.ftest.annotations.Inject;
-import org.richfaces.tests.metamer.ftest.annotations.Use;
-import org.richfaces.tests.metamer.ftest.internal.NamedType;
import org.testng.SkipException;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
-import org.testng.annotations.Factory;
import org.testng.annotations.Optional;
import org.testng.annotations.Parameters;
@@ -203,154 +189,4 @@
protected void showControls() {
selenium.getEval(new JavaScript("window.showControls()"));
}
-
- @Factory
- public Object[] createTests() {
- // obtain parametrized constructor
- Constructor<?> constructor = null;
- for (Constructor<?> c : this.getClass().getConstructors()) {
- if (c.getParameterTypes().length > 0) {
- if (constructor == null) {
- constructor = c;
- } else {
- throw new IllegalStateException("there cannot be more than one parametrized constructor");
- }
- }
- }
-
- if (constructor == null) {
- try {
- return new Object[] { this.getClass().newInstance() };
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- Map<NamedType, List<? extends Object>> parameters = new LinkedHashMap<NamedType, List<? extends Object>>();
-
- // fill all parameters with null values to sorted map
- for (int i = 0; i < constructor.getParameterTypes().length; i++) {
- NamedType namedType = new NamedType(constructor.getParameterTypes()[i],
- constructor.getParameterAnnotations()[i]);
-
- if (parameters.containsKey(namedType)) {
- throw new IllegalStateException("there are ambiguous parameters");
- } else {
- parameters.put(namedType, null);
- }
- }
-
- List<Field> injections = new LinkedList<Field>();
-
- for (Field field : this.getClass().getDeclaredFields()) {
- if (field.getAnnotation(Inject.class) != null) {
- if (field.getAnnotation(Use.class) != null) {
- NamedType namedType = new NamedType(field.getType(), (String) null);
- if (!parameters.containsKey(namedType)) {
- namedType = new NamedType(field.getType(), field.getName());
- }
- if (!parameters.containsKey(namedType)) {
- throw new IllegalStateException("cannot find equivalent constructor parameter");
- }
-
- parameters.put(namedType, getUseParameter(field.getType(), field.getAnnotation(Use.class)));
- } else {
- injections.add(field);
- }
- }
- }
-
- if (!injections.isEmpty()) {
- throw new IllegalStateException("all injections weren't satisfied");
- }
-
- Object[][] parameterArray = new Object[parameters.size()][];
- int parameterPosition = 0;
- for (List<? extends Object> parameter : parameters.values()) {
- parameterArray[parameterPosition++] = parameter.toArray();
- }
-
- Object[][] combinations = generateCombinations(parameterArray);
-
- Object[] result = new Object[combinations.length];
- try {
- for (int i = 0; i < combinations.length; i++) {
- result[i] = constructor.newInstance(combinations[i]);
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- return result;
- }
-
- private Object[][] generateCombinations(Object[][] toCombine) {
- int count = 1;
- for (int outter = 0; outter < toCombine.length; outter++) {
- count *= toCombine[outter].length;
- }
-
- Object[][] result = new Object[count][toCombine.length];
-
- int[] position = new int[toCombine.length];
- Arrays.fill(position, 0);
- // int iterate = 0;
-
- for (int i = 0; i < count; i++) {
- result[i] = new Object[toCombine.length];
-
- for (int j = 0; j < toCombine.length; j++) {
- result[i][j] = toCombine[j][position[j]];
- }
-
- // iterate
- if (i + 1 < count) {
- for (int j = 0; j < toCombine.length; j++) {
- position[j] += 1;
- if (position[j] < toCombine[j].length) {
- break;
- } else {
- position[j] = 0;
- }
- }
- }
- }
-
- return result;
- }
-
- private List<? extends Object> getUseParameter(Class<?> parameterType, Use use) {
- if (parameterType == int.class || parameterType == Integer.class) {
- return Arrays.asList(ArrayUtils.toObject(use.ints()));
- }
-
- // tries satisfy parameter from fields
- List<Object> result = new LinkedList<Object>();
- for (int i = 0; i < use.value().length; i++) {
- boolean satisfied = false;
- for (Field field : this.getClass().getDeclaredFields()) {
- String name = use.value()[i];
- name = StringUtils.replace(name, "*", ".+");
- name = StringUtils.replace(name, "?", ".");
- Pattern pattern = Pattern.compile(name);
- if (pattern.matcher(field.getName()).matches()) {
- if (parameterType.isAssignableFrom(field.getType())) {
- try {
- field.setAccessible(true);
- result.add(field.get(this));
- satisfied = true;
- } catch (Exception e) {
- throw new IllegalStateException("the field cannot be obtained");
- }
- }
- }
- }
- if (satisfied) {
- continue;
- }
- throw new IllegalStateException("cannot find the field satysfying injection point");
- }
- return result;
- }
-
}
Added: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java
===================================================================
--- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java (rev 0)
+++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2010-07-28 13:38:50 UTC (rev 18254)
@@ -0,0 +1,317 @@
+/*******************************************************************************
+ * 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.ftest;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.internal.NamedType;
+import org.testng.IAnnotationTransformer;
+import org.testng.IInvokedMethod;
+import org.testng.IInvokedMethodListener;
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
+import org.testng.ITestContext;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.ITestAnnotation;
+
+/**
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+public class MatrixConfigurator implements IAnnotationTransformer, IInvokedMethodListener, IMethodInterceptor {
+
+ private static final Class<? extends Annotation>[] AFTER_ANNOTATION = new Class[] { AfterMethod.class,
+ AfterClass.class, AfterTest.class, AfterSuite.class };
+
+ Map<Class<?>, Map<Method, Configuration>> configurations = new HashMap<Class<?>, Map<Method, Configuration>>();
+ LinkedList<Method> methods = new LinkedList<Method>();
+ boolean methodConfigured = false;
+
+ public List<IMethodInstance> intercept(List<IMethodInstance> methodInstances, ITestContext context) {
+ for (IMethodInstance methodInstance : methodInstances) {
+ for (int i = 0; i < methodInstance.getMethod().getInvocationCount(); i++) {
+ methods.add(methodInstance.getMethod().getMethod());
+ }
+ }
+ return methodInstances;
+ }
+
+ public void beforeInvocation(IInvokedMethod invokedMethod, ITestResult testResult) {
+ if (!methodConfigured) {
+ Method method = invokedMethod.getTestMethod().getMethod();
+ for (Class<? extends Annotation> annotationClass : AFTER_ANNOTATION) {
+ if (method.getAnnotation(annotationClass) != null) {
+ return;
+ }
+ }
+
+ configureMethod(testResult);
+
+ methodConfigured = true;
+ }
+ }
+
+ private void configureMethod(ITestResult testResult) {
+ Method realMethod = ((Queue<Method>) methods).poll();
+ Class<?> realClass;
+ try {
+ realClass = realMethod.getDeclaringClass();
+ } catch (NullPointerException e) {
+ System.out.println(e);
+ return;
+ }
+
+ final Object testInstance = testResult.getInstance();
+ Map<NamedType, Object> configuration = configurations.get(realClass).get(realMethod).next();
+
+ try {
+ for (Entry<NamedType, Object> entry : configuration.entrySet()) {
+ final NamedType namedType = entry.getKey();
+ final Object parameter = entry.getValue();
+
+ Field field = realClass.getDeclaredField(namedType.getName());
+ Object assignment;
+ if (parameter instanceof String && !parameter.getClass().isAssignableFrom(field.getType())) {
+ Field parameterField = realClass.getDeclaredField((String) parameter);
+ boolean isAccessible = parameterField.isAccessible();
+ if (!isAccessible) {
+ parameterField.setAccessible(true);
+ }
+ assignment = parameterField.get(testInstance);
+ parameterField.setAccessible(isAccessible);
+ } else {
+ assignment = parameter;
+ }
+
+ boolean isAccessible = field.isAccessible();
+ if (!isAccessible) {
+ field.setAccessible(true);
+ }
+ field.set(testInstance, assignment);
+ field.setAccessible(isAccessible);
+ }
+ } catch (Exception e) {
+ throw new IllegalStateException("Cannot configure method", e);
+ }
+ }
+
+ public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
+ if (method.isTestMethod()) {
+ methodConfigured = false;
+ }
+ }
+
+ public void transform(ITestAnnotation annotation, Class testClass, Constructor testConstructor, Method testMethod) {
+ int invocationCount = createConfiguration(testMethod.getDeclaringClass(), testMethod);
+ annotation.setInvocationCount(invocationCount);
+ }
+
+ // public List<IMethodInstance> intercept(List<IMethodInstance> methods, ITestContext context) {
+ // for (IMethodInstance methodInstance : methods) {
+ // int count = createConfiguration(methodInstance);
+ // for (int i = 0; i < count; i++) {
+ // methodInstances.add(methodInstance);
+ // }
+ // }
+ //
+ // return methodInstances;
+ // }
+
+ public int createConfiguration(Class<?> realClass, Method realMethod) {
+
+ // Class<?> realClass = method.getRealClass();
+ // String methodName = method.getName();
+
+ Map<NamedType, List<? extends Object>> parameters = new LinkedHashMap<NamedType, List<? extends Object>>();
+
+ List<NamedType> unsatisfied = new LinkedList<NamedType>();
+
+ // get a list of satisfied and unsatisfied parameters/injections
+ for (Field field : realClass.getDeclaredFields()) {
+ if (field.getAnnotation(Inject.class) != null) {
+ final NamedType namedType = new NamedType(field.getType(), field.getName());
+ if (field.getAnnotation(Use.class) != null || field.getAnnotation(Use.class) != null) {
+ parameters.put(namedType,
+ getUseParameter(realClass, field.getType(), field.getAnnotation(Use.class)));
+ } else {
+ parameters.put(namedType, null);
+ unsatisfied.add(namedType);
+ }
+ }
+ }
+
+ // get a injections from method level
+ // Method realMethod;
+ // try {
+ // realMethod = realClass.getMethod(methodName);
+ // } catch (Exception e) {
+ // throw new IllegalStateException(e);
+ // }
+ for (Annotation annotation : realMethod.getAnnotations()) {
+ if (annotation.annotationType() == Use.class) {
+ Use use = (Use) annotation;
+ for (NamedType namedType : parameters.keySet()) {
+ if (namedType.getName().equals(use.field())) {
+ parameters.put(namedType, getUseParameter(realClass, namedType.getParameterType(), use));
+ unsatisfied.remove(namedType);
+ }
+ }
+ }
+ }
+
+ if (!unsatisfied.isEmpty()) {
+ throw new IllegalStateException("cannot satisfy following injection points: " + unsatisfied.toString());
+ }
+
+ Configuration configuration = new Configuration(parameters);
+
+ int count = 0;
+ while (configuration.hasNext()) {
+ configuration.next();
+ count += 1;
+ }
+ configuration.reset();
+
+ getClassConfigurations(realClass).put(realMethod, configuration);
+
+ return count;
+ }
+
+ private Map<Method, Configuration> getClassConfigurations(Class<?> realClass) {
+ if (!configurations.containsKey(realClass)) {
+ configurations.put(realClass, new HashMap<Method, Configuration>());
+ }
+ return configurations.get(realClass);
+ }
+
+ private List<? extends Object> getUseParameter(Class<?> testClass, Class<?> parameterType, Use use) {
+ if (parameterType == int.class || parameterType == Integer.class) {
+ return Arrays.asList(ArrayUtils.toObject(use.ints()));
+ }
+
+ // tries satisfy parameter from fields
+ List<Object> result = new LinkedList<Object>();
+ for (int i = 0; i < use.value().length; i++) {
+ boolean satisfied = false;
+ for (Field field : testClass.getDeclaredFields()) {
+ String name = use.value()[i];
+ name = StringUtils.replace(name, "*", ".+");
+ name = StringUtils.replace(name, "?", ".");
+ Pattern pattern = Pattern.compile(name);
+ if (pattern.matcher(field.getName()).matches()) {
+ if (parameterType.isAssignableFrom(field.getType())) {
+ result.add(field.getName());
+ satisfied = true;
+ }
+ }
+ }
+ if (satisfied) {
+ continue;
+ }
+ throw new IllegalStateException("cannot find the field satysfying injection point");
+ }
+ return result;
+ }
+
+ private class Configuration implements Iterator<Map<NamedType, Object>> {
+ Map<NamedType, List<? extends Object>> parameters;
+ Map<NamedType, Queue<? extends Object>> queues;
+ Queue<? extends Object> lastQueue;
+
+ public Configuration(Map<NamedType, List<? extends Object>> parameters) {
+ this.parameters = parameters;
+ reset();
+ }
+
+ public void reset() {
+ queues = new LinkedHashMap<NamedType, Queue<? extends Object>>();
+ for (Entry<NamedType, List<? extends Object>> entry : parameters.entrySet()) {
+ final NamedType namedType = entry.getKey();
+ List<? extends Object> parameter = entry.getValue();
+
+ lastQueue = new LinkedList<Object>(parameter);
+ queues.put(namedType, lastQueue);
+ }
+ }
+
+ public Map<NamedType, Object> next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+
+ Map<NamedType, Object> pass = new HashMap<NamedType, Object>();
+
+ for (Entry<NamedType, Queue<? extends Object>> entry : queues.entrySet()) {
+ final NamedType namedType = entry.getKey();
+ final Queue<? extends Object> queue = entry.getValue();
+
+ pass.put(namedType, queue.peek());
+ }
+
+ for (Entry<NamedType, Queue<? extends Object>> entry : queues.entrySet()) {
+ final NamedType namedType = entry.getKey();
+ final Queue<? extends Object> queue = entry.getValue();
+
+ queue.poll();
+
+ if (queue.isEmpty() && hasNext()) {
+ List<? extends Object> parameter = parameters.get(namedType);
+ queues.put(namedType, new LinkedList<Object>(parameter));
+ } else {
+ break;
+ }
+ }
+
+ return pass;
+ }
+
+ public boolean hasNext() {
+ return !lastQueue.isEmpty();
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+}
Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/internal/NamedType.java
===================================================================
--- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/internal/NamedType.java 2010-07-28 12:32:53 UTC (rev 18253)
+++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/internal/NamedType.java 2010-07-28 13:38:50 UTC (rev 18254)
@@ -37,7 +37,7 @@
this.parameterType = parameterType;
this.name = name;
}
-
+
public NamedType(Class<?> parameterType, Annotation[] annotations) {
this.parameterType = parameterType;
for (Annotation annotation : annotations) {
@@ -46,6 +46,14 @@
}
}
}
+
+ public Class<?> getParameterType() {
+ return parameterType;
+ }
+
+ public String getName() {
+ return name;
+ }
@Override
public String toString() {
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18253 - root/examples/iteration-demo/trunk/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-07-28 08:32:53 -0400 (Wed, 28 Jul 2010)
New Revision: 18253
Modified:
root/examples/iteration-demo/trunk/src/main/webapp/dataGrid.xhtml
Log:
fix caption facet
Modified: root/examples/iteration-demo/trunk/src/main/webapp/dataGrid.xhtml
===================================================================
--- root/examples/iteration-demo/trunk/src/main/webapp/dataGrid.xhtml 2010-07-28 12:05:10 UTC (rev 18252)
+++ root/examples/iteration-demo/trunk/src/main/webapp/dataGrid.xhtml 2010-07-28 12:32:53 UTC (rev 18253)
@@ -39,7 +39,7 @@
<h:body>
<h:form id="form1">
- <it:dataGrid columns="3" var="record" value="#{dataBean.employeeList}">
+ <it:dataGrid columns="3" var="record" elements="8" value="#{dataBean.employeeList}">
<f:facet name="header">
<h:outputText value="header"/>
</f:facet>
@@ -48,7 +48,7 @@
<h:outputText value="footer"/>
</f:facet>
- <f:facet name="сaption">
+ <f:facet name="caption">
<h:outputText value="caption"/>
</f:facet>
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18252 - root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-07-28 08:05:10 -0400 (Wed, 28 Jul 2010)
New Revision: 18252
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java
Log:
https://jira.jboss.org/browse/RF-8980
Modified: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2010-07-28 11:33:31 UTC (rev 18251)
+++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/DataGridRenderer.java 2010-07-28 12:05:10 UTC (rev 18252)
@@ -281,10 +281,9 @@
writer.endElement(HTML.TD_ELEM);
}
}
+
+ writer.endElement(HTML.TR_ELEMENT);
- if(rest != 0){
- writer.endElement(HTML.TR_ELEMENT);
- }
}
public DataVisitResult process(FacesContext facesContext, Object rowKey, Object argument) {
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18251 - root/tests/metamer/trunk/application/src/main/webapp/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-07-28 07:33:31 -0400 (Wed, 28 Jul 2010)
New Revision: 18251
Modified:
root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
Log:
* fixed stylesheet reference
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-07-28 11:33:31 UTC (rev 18251)
@@ -27,7 +27,7 @@
<h:head>
<title><ui:insert name="pageTitle">Insert some page title here</ui:insert></title>
<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
+ <h:outputStylesheet library="css" name="common.ecss" />
<ui:insert name="head"/>
</h:head>
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18250 - root/tests/metamer/trunk/application/src/main/webapp/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-07-28 06:54:15 -0400 (Wed, 28 Jul 2010)
New Revision: 18250
Modified:
root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/plain.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
Log:
* added license header to xhtml files
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!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">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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 xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/plain.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/plain.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/plain.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!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">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!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:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
Modified: root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-07-28 10:54:15 UTC (rev 18250)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18249 - in root/tests/metamer/trunk/application/src/main/webapp: components/a4jActionListener and 25 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-07-28 06:50:07 -0400 (Wed, 28 Jul 2010)
New Revision: 18249
Added:
root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/css/testPageLink.ecss
root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/testPageLink.xhtml
root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
Removed:
root/tests/metamer/trunk/application/src/main/webapp/resources/css/list.css
Modified:
root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/index.xhtml
root/tests/metamer/trunk/application/src/main/webapp/resources/css/common.ecss
root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/attributes.xhtml
Log:
* list pages refactored to use a template and composite component for links
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,17 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J Action Listener</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
- <h:link outcome="all" value="All" styleClass="link"/>
- <div class="description">Page that contains a4j:actionListener invoked by type, binding, method and from composite component.</div>
+ <ui:define name="pageTitle">A4J Action Listener</ui:define>
- </h:body>
+ <ui:define name="links">
+
+ <ta:testPageLink id="all" outcome="all" value="All">
+ Page that contains <b>a4j:actionListener</b> invoked by type, binding, method and from composite component.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
</html>
\ No newline at end of file
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,52 +1,88 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>A4J Ajax</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">A4J Ajax</ui:define>
- <h:link outcome="hCommandButton" value="Command Button" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:commandButton</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="hCommandLink" value="Command Link" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:commandLink</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hCommandButton" outcome="hCommandButton" value="Command Button">
+ Simple page that contains <b>h:commandButton</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hInputText" value="Input Text" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:inputText</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hCommandLink" outcome="hCommandLink" value="Command Link">
+ Simple page that contains <b>h:commandLink</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hInputSecret" value="Input Secret" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:inputSecret</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hInputText" outcome="hInputText" value="Input Text">
+ Simple page that contains <b>h:inputText</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hInputTextarea" value="Input Textarea" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:inputTextarea</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hInputSecret" outcome="hInputSecret" value="Input Secret">
+ Simple page that contains <b>h:inputSecret</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hGraphicImage" value="Graphic Image" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:graphicImage</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hInputTextarea" outcome="hInputTextarea" value="Input Textarea">
+ Simple page that contains <b>h:inputTextarea</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectManyMenu" value="Select Many Menu" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectManyMenu</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hGraphicImage" outcome="hGraphicImage" value="Graphic Image">
+ Simple page that contains <b>h:graphicImage</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectManyListbox" value="Select Many Listbox" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectManyListbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hSelectManyMenu" outcome="hSelectManyMenu" value="Select Many Menu">
+ Simple page that contains <b>h:selectManyMenu</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectManyCheckbox" value="Select Many Checkbox" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectManyCheckbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hSelectManyListbox" outcome="hSelectManyListbox" value="Select Many Listbox">
+ Simple page that contains <b>h:selectManyListbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectOneMenu" value="Select One Menu" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectOneMenu</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hSelectManyCheckbox" outcome="hSelectManyCheckbox" value="Select Many Checkbox">
+ Simple page that contains <b>h:selectManyCheckbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectBooleanCheckbox" value="Select Boolean Checkbox" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectBooleanCheckbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hSelectOneMenu" outcome="hSelectOneMenu" value="Select One Menu">
+ Simple page that contains <b>h:selectOneMenu</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectOneRadio" value="Select One Radio" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectOneRadio</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
+ <ta:testPageLink id="hSelectBooleanCheckbox" outcome="hSelectBooleanCheckbox" value="Select Boolean Checkbox">
+ Simple page that contains <b>h:selectBooleanCheckbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectOneListbox" value="Select One Listbox" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:selectOneListbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.</div>
-</h:body>
+ <ta:testPageLink id="hSelectOneRadio" outcome="hSelectOneRadio" value="Select One Radio">
+ Simple page that contains <b>h:selectOneRadio</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ <ta:testPageLink id="hSelectOneListbox" outcome="hSelectOneListbox" value="Select One Listbox">
+ Simple page that contains <b>h:selectOneListbox</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
</html>
\ No newline at end of file
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,18 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J Command Button</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">A4J Command Button</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>a4j:commandButton</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:commandButton</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,17 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J Command Link</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">A4J Command Link</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>a4j:commandLink</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:commandLink</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,21 +21,21 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J JavaScript Function</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">A4J JavaScript Function</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link" />
- <div class="description">Simple page that contains <b>a4j:jsFunction</b> and
- input boxes for all its attributes.</div>
-
- </h:body>
-</html>
\ No newline at end of file
+ <ui:define name="links">
+
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:jsFunction</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,17 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>A4J Log</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">A4J Log</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains log and input boxes for all its attributes.</div>
+ <ui:define name="links">
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:log</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,19 +1,45 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>A4J Media Output</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">A4J Media Output</ui:define>
- <h:link outcome="image" value="Image" styleClass="link"/>
- <div class="description">Simple page that contains media output (image) and input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="flash" value="Flash" styleClass="link"/>
- <div class="description">Simple page that contains media output (flash) and input boxes for all its attributes.</div>
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="image" outcome="image" value="Image">
+ Simple page that contains <b>a4j:mediaOutput</b> (image) and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ <ta:testPageLink id="flash" outcome="flash" value="Flash">
+ Simple page that contains <b>a4j:mediaOutput</b> (flash) and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,19 +21,21 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>A4J Output Panel</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">A4J Output Panel</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>a4j:outputPanel</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:outputPanel</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,20 +21,21 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J Action Parameter</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">A4J Action Parameter</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Page that contains <b>a4j:param</b> and inputs for all its attributes.</div>
+ <ui:define name="links">
- </h:body>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Page that contains <b>a4j:param</b> and inputs for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
</html>
\ No newline at end of file
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,17 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>A4J Poll</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">A4J Poll</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>a4j:poll</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:poll</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,20 +1,45 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>A4J Push</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">A4J Push</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>a4j:push</b> and input boxes for all its attributes.</div>
-
- <h:link outcome="event-producer" value="Event Producer" styleClass="link"/>
- <div class="description">Page that is bind to application bean producing events catched by a4j:push.</div>
+ <ui:define name="links">
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:push</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ <ta:testPageLink id="event-producer" outcome="event-producer" value="Event Producer">
+ Page that is bind to application bean producing events catched by a4j:push.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,24 +21,25 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J Region</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">A4J Region</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link" />
- <div class="description">Simple page that contains <b>a4j:region</b> and
- input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="nested" value="Nested regions" styleClass="link" />
- <div class="description">Simple page that contains nested <b>a4j:region</b>s.</div>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:region</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="nested" outcome="nested" value="Nested regions">
+ Simple page that contains nested <b>a4j:region</b>s.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,24 +21,25 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>A4J Repeat</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">A4J Repeat</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link" />
- <div class="description">Simple page that contains <b>a4j:repeat</b> and
- input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="matrix" value="Matrix" styleClass="link" />
- <div class="description">Simple page that contains <b>a4j:repeat</b> rendering a table. Page contains input boxes for all repeat's attributes.</div>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>a4j:repeat</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="matrix" outcome="matrix" value="Matrix">
+ Simple page that contains <b>a4j:repeat</b> rendering a table. Page contains input boxes for all repeat's attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/commandButton/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,18 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>JSF Command Button</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">JSF Command Button</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>h:commandButton</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>h:commandButton</b> and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,34 +21,39 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>Rich Data Grid</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">Rich Data Grid</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link" />
- <div class="description">Simple page that contains <b>rich:dataGrid</b> (with model containing capitals) and
- input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="scroller" value="Data Scroller" styleClass="link" />
- <div class="description">Page that contains <b>rich:dataGrid</b> (with model containing capitals), data
- scroller and input boxes for all its attributes.</div>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:dataGrid</b> (with model containing capitals) and
+ input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hGraphicImage" value="Graphic Image" styleClass="link" />
- <div class="description">Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>h:graphicImage</b> inside it.</div>
+ <ta:testPageLink id="scroller" outcome="scroller" value="Data Scroller">
+ Page that contains <b>rich:dataGrid</b> (with model containing capitals), data
+ scroller and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="hSelectBooleanCheckbox" value="Select Boolean Checkbox" styleClass="link" />
- <div class="description">Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>h:selectBooleanCheckbox</b> inside it.</div>
+ <ta:testPageLink id="hGraphicImage" outcome="hGraphicImage" value="Graphic Image">
+ Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>h:graphicImage</b> inside it.
+ </ta:testPageLink>
- <h:link outcome="a4jRepeat" value="A4J Repeat" styleClass="link" />
- <div class="description">Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>a4j:repeat</b> inside it.</div>
+ <ta:testPageLink id="hSelectBooleanCheckbox" outcome="hSelectBooleanCheckbox" value="Select Boolean Checkbox">
+ Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>h:selectBooleanCheckbox</b> inside it.
+ </ta:testPageLink>
- </h:body>
+ <ta:testPageLink id="a4jRepeat" outcome="a4jRepeat" value="A4J Repeat">
+ Page that contains <b>rich:dataGrid</b> (with model containing employees) with <b>a4j:repeat</b> inside it.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
</html>
\ No newline at end of file
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,19 +21,21 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>Rich Data Scroller</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">Rich Data Scroller</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>rich:dataTable</b> with two <b>rich:dataScroller</b>s and input boxes for all their attributes.</div>
+ <ui:define name="links">
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:dataTable</b> with two <b>rich:dataScroller</b>s and input boxes for all their attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,35 +21,43 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>Rich Data Table</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">Rich Data Table</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="scroller" value="Data Scroller" styleClass="link"/>
- <div class="description">Page that contains <b>rich:dataTable</b> (with model containing capitals), data scroller and input boxes for all its attributes.</div>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="components1" value="Various Components 1" styleClass="link"/>
- <div class="description">Page that contains <b>rich:dataTable</b> (with model containing employees) and input boxes for all its attributes.
- <span style="color: red">TODO will be used with various types of input and command components as soon as available</span></div>
+ <ta:testPageLink id="scroller" outcome="scroller" value="Data Scroller">
+ Page that contains <b>rich:dataTable</b> (with model containing capitals), data scroller and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="components2" value="Various Components 2" styleClass="link"/>
- <div class="description">Page that contains <b>rich:dataTable</b> (with model containing employees) and input boxes for all its attributes.
- <span style="color: red">TODO will be used with various types of input and command components as soon as available</span></div>
+ <ta:testPageLink id="components1" outcome="components1" value="Various Components 1">
+ Page that contains <b>rich:dataTable</b> (with model containing employees) and input boxes for all its attributes.
+ <span style="color: red">TODO will be used with various types of input and command components as soon as available</span>
+ </ta:testPageLink>
- <h:link outcome="sorting" value="Table Sorting" styleClass="link"/>
- <div class="description">Page that contains sortable <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.</div>
+ <ta:testPageLink id="components2" outcome="components2" value="Various Components 2">
+ Page that contains <b>rich:dataTable</b> (with model containing employees) and input boxes for all its attributes.
+ <span style="color: red">TODO will be used with various types of input and command components as soon as available</span>
+ </ta:testPageLink>
- <h:link outcome="filtering" value="Table filtering" styleClass="link"/>
- <div class="description">Page that contains filterable <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.</div>
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="sorting" outcome="sorting" value="Table Sorting">
+ Page that contains sortable <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ <ta:testPageLink id="filtering" outcome="filtering" value="Table filtering">
+ Page that contains filterable <b>rich:dataTable</b> (with model containing capitals) and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,35 +21,43 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>Rich Extended Data Table</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">Rich Extended Data Table</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="scroller" value="Data Scroller" styleClass="link"/>
- <div class="description">Page that contains <b>rich:extendedDataTable</b> (with model containing capitals), data scroller and input boxes for all its attributes.</div>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="components1" value="Various Components 1" styleClass="link"/>
- <div class="description">Page that contains <b>rich:extendedDataTable</b> (with model containing employees) and input boxes for all its attributes.
- <span style="color: red">TODO will be used with various types of input and command components as soon as available</span></div>
+ <ta:testPageLink id="scroller" outcome="scroller" value="Data Scroller">
+ Page that contains <b>rich:extendedDataTable</b> (with model containing capitals), data scroller and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="components2" value="Various Components 2" styleClass="link"/>
- <div class="description">Page that contains <b>rich:extendedDataTable</b> (with model containing employees) and input boxes for all its attributes.
- <span style="color: red">TODO will be used with various types of input and command components as soon as available</span></div>
+ <ta:testPageLink id="components1" outcome="components1" value="Various Components 1">
+ Page that contains <b>rich:extendedDataTable</b> (with model containing employees) and input boxes for all its attributes.
+ <span style="color: red">TODO will be used with various types of input and command components as soon as available</span>
+ </ta:testPageLink>
- <h:link outcome="sorting" value="Table Sorting" styleClass="link"/>
- <div class="description">Page that contains sortable <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.</div>
+ <ta:testPageLink id="components2" outcome="components2" value="Various Components 2">
+ Page that contains <b>rich:extendedDataTable</b> (with model containing employees) and input boxes for all its attributes.
+ <span style="color: red">TODO will be used with various types of input and command components as soon as available</span>
+ </ta:testPageLink>
- <h:link outcome="filtering" value="Table filtering" styleClass="link"/>
- <div class="description">Page that contains filterable <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.</div>
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="sorting" outcome="sorting" value="Table Sorting">
+ Page that contains sortable <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ <ta:testPageLink id="filtering" outcome="filtering" value="Table filtering">
+ Page that contains filterable <b>rich:extendedDataTable</b> (with model containing capitals) and input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,17 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>Rich Functions</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
- <h:link outcome="all" value="All" styleClass="link"/>
- <div class="description">Page containing all RichFaces client functions.</div>
+ <ui:define name="pageTitle">Rich Functions</ui:define>
- </h:body>
-</html>
\ No newline at end of file
+ <ui:define name="links">
+
+ <ta:testPageLink id="all" outcome="all" value="All">
+ Page containing all RichFaces client functions.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,17 +1,41 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>Rich jQuery</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">Rich jQuery</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>rich:jQuery</b> and inputs for all its attributes.</div>
+ <ui:define name="links">
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:jQuery</b> and inputs for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richList/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -21,21 +21,22 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
- <h:head>
- <title>Rich List</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
- </h:head>
+ <ui:composition template="/templates/list.xhtml">
- <h:body>
+ <ui:define name="pageTitle">Rich List</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link" />
- <div class="description">Simple page that contains <b>rich:list</b> (with model containing capitals) and
- input boxes for all its attributes.</div>
+ <ui:define name="links">
- </h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:list</b> (with model containing capitals) and
+ input boxes for all its attributes.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/list.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/richPanel/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,22 +1,49 @@
+<!--
+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.
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp">
-<h:head>
- <title>Rich Toggle Panel</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
- <h:outputStylesheet library="css" name="list.css" />
-</h:head>
+ <ui:composition template="/templates/list.xhtml">
-<h:body>
+ <ui:define name="pageTitle">Rich Toggle Panel</ui:define>
- <h:link outcome="simple" value="Simple" styleClass="link"/>
- <div class="description">Simple page that contains <b>rich:togglePanel</b> and input boxes for all its attributes.</div>
+ <ui:define name="links">
- <h:link outcome="nested" value="Nested Panels" styleClass="link"/>
- <div class="description">Page containing a <b>rich:togglePanel</b> with two nested panels.</div>
+ <ta:testPageLink id="simple" outcome="simple" value="Simple">
+ Simple page that contains <b>rich:togglePanel</b> and input boxes for all its attributes.
+ </ta:testPageLink>
- <h:link outcome="customLook" value="Look Customization" styleClass="link"/>
- <div class="description">Page containing several <b>rich:togglePanel</b>s testing stylesheet usage and skinnability features.</div>
-</h:body>
-</html>
\ No newline at end of file
+ <ta:testPageLink id="nested" outcome="nested" value="Nested Panels">
+ Page containing a <b>rich:togglePanel</b> with two nested panels.
+ </ta:testPageLink>
+
+ <ta:testPageLink id="customLook" outcome="customLook" value="Look Customization">
+ Page containing several <b>rich:togglePanel</b>s testing stylesheet usage and skinnability features.
+ </ta:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
Modified: root/tests/metamer/trunk/application/src/main/webapp/index.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,3 +1,25 @@
+<!--
+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.
+-->
+
<!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:c="http://java.sun.com/jsp/jstl/core"
xmlns:a4j="http://richfaces.org/a4j">
@@ -6,7 +28,6 @@
<title>Metamer: RichFaces Testing Application</title>
<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
<h:outputStylesheet library="css" name="common.ecss" />
- <h:outputStylesheet library="css" name="list.css" />
</h:head>
<h:body>
Modified: root/tests/metamer/trunk/application/src/main/webapp/resources/css/common.ecss
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/resources/css/common.ecss 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/resources/css/common.ecss 2010-07-28 10:50:07 UTC (rev 18249)
@@ -26,4 +26,9 @@
.valign-top {
vertical-align: top;
+}
+
+ul a.link {
+ font-size: 16px;
+ font-weight: bold;
}
\ No newline at end of file
Deleted: root/tests/metamer/trunk/application/src/main/webapp/resources/css/list.css
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/resources/css/list.css 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/resources/css/list.css 2010-07-28 10:50:07 UTC (rev 18249)
@@ -1,9 +0,0 @@
-.link {
- font-size: 16px;
- font-weight: bold;
-}
-
-.description {
- padding-top: 5px;
- padding-bottom: 15px;
-}
\ No newline at end of file
Modified: root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/attributes.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/attributes.xhtml 2010-07-27 16:26:04 UTC (rev 18248)
+++ root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/attributes.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -6,7 +6,7 @@
<h:body>
<composite:interface>
- <composite:attribute name="id" type="java.util.String" />
+ <composite:attribute name="id" type="java.lang.String" />
<composite:attribute name="value" type="org.richfaces.tests.metamer.Attributes" required="true"
shortDescription="Representation of attributes of a component." />
<composite:attribute name="render" />
Added: root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/css/testPageLink.ecss
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/css/testPageLink.ecss (rev 0)
+++ root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/css/testPageLink.ecss 2010-07-28 10:50:07 UTC (rev 18249)
@@ -0,0 +1,9 @@
+.link {
+ font-size: 16px;
+ font-weight: bold;
+}
+
+.description {
+ padding-top: 5px;
+ padding-bottom: 15px;
+}
\ No newline at end of file
Added: root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/testPageLink.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/testPageLink.xhtml (rev 0)
+++ root/tests/metamer/trunk/application/src/main/webapp/resources/testapp/testPageLink.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -0,0 +1,43 @@
+<!--
+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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:composite="http://java.sun.com/jsf/composite">
+
+ <h:body>
+ <composite:interface>
+ <composite:attribute name="outcome" type="java.lang.String" required="true"/>
+ <composite:attribute name="value" type="java.lang.String" required="true"/>
+ </composite:interface>
+
+ <composite:implementation>
+
+ <h:outputStylesheet library="testapp/css" name="testPageLink.ecss" />
+
+ <h:link id="link" outcome="#{cc.attrs.outcome}" value="#{cc.attrs.value}" styleClass="link" />
+ <h:panelGroup id="desc" layout="block" styleClass="description">
+ <composite:insertChildren/>
+ </h:panelGroup>
+
+ </composite:implementation>
+ </h:body>
+</html>
Added: root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml (rev 0)
+++ root/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-07-28 10:50:07 UTC (rev 18249)
@@ -0,0 +1,53 @@
+<!--
+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.
+-->
+
+<!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:ui="http://java.sun.com/jsf/facelets">
+
+ <h:head>
+ <title><ui:insert name="pageTitle">Insert some page title here</ui:insert></title>
+ <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+ <h:outputStylesheet library="css" name="list.css" />
+ <ui:insert name="head"/>
+ </h:head>
+
+ <h:body>
+ <h:panelGrid columns="2">
+ <h:link id="goHomeLink" outcome="/index">
+ <h:graphicImage id="goHomeImage" library="images" name="home.png" title="Go Home" style="width: 36px;"/>
+ </h:link>
+ <h:panelGroup style="font-size: xx-large; font-weight: bold;">
+ <ui:insert name="pageTitle">Insert some page title here</ui:insert>
+ </h:panelGroup>
+ </h:panelGrid>
+
+ <br/>
+
+ <h:panelGroup layout="block" styleClass="links">
+ <ui:insert name="links">Insert some links to pages here</ui:insert>
+ </h:panelGroup>
+
+ <hr style="width: 900px; margin-left: 0px;"/>
+ #{a4j.version}
+ </h:body>
+</html>
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18248 - in root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk: concurrent and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-07-27 12:26:04 -0400 (Tue, 27 Jul 2010)
New Revision: 18248
Added:
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/concurrent/
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/concurrent/CountingExecutorCompletionService.java
Modified:
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/Main.java
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceInfo.java
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceTaskFactory.java
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/FacesImpl.java
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/ResourceHandlerImpl.java
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java
root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java
Log:
Dynamic resources prerenderer: added handling for static resource depedencies
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/Main.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/Main.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/Main.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -21,12 +21,13 @@
*/
package org.richfaces.cdk;
-import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import org.richfaces.cdk.concurrent.CountingExecutorCompletionService;
import org.richfaces.cdk.faces.FacesImpl;
import org.richfaces.cdk.naming.FileNameMapperImpl;
import org.richfaces.cdk.resource.ResourceWriterImpl;
@@ -46,39 +47,40 @@
}
public static void main(String[] args) throws Exception {
+ String dstDir = args[0];
+ ResourceWriterImpl resourceWriter = new ResourceWriterImpl(dstDir);
+ ResourceTaskFactory taskFactory = new ResourceTaskFactoryImpl();
+ taskFactory.setResourceWriter(resourceWriter);
+
// TODO set webroot
- Faces faces = new FacesImpl(null, new FileNameMapperImpl());
+ Faces faces = new FacesImpl(null, new FileNameMapperImpl(), taskFactory);
faces.start();
- String dstDir = args[0];
-
ResourcesScanner resourcesScanner = new ResourcesScannerImpl();
resourcesScanner.scan();
- ResourceWriterImpl resourceWriter = new ResourceWriterImpl(dstDir);
- ResourceTaskFactory taskFactory = new ResourceTaskFactoryImpl(faces, resourceWriter);
-
- taskFactory.setResources(resourcesScanner.getResources());
+ ExecutorService executorService = createExecutorService();
+ CompletionService<Object> completionService = new CountingExecutorCompletionService<Object>(executorService);
+ taskFactory.setCompletionService(completionService);
taskFactory.setSkins(Lists.newArrayList("blueSky", "ruby", "classic"));
+ for (ResourceInfo resourceInfo : resourcesScanner.getResources()) {
+ taskFactory.submit(resourceInfo);
+ }
- ExecutorService executorService = createExecutorService();
- ExecutorCompletionService<Object> completionService = new ExecutorCompletionService<Object>(executorService);
-
try {
- int tasksCounter = 0;
- for (Callable<Object> task : taskFactory.createTasks()) {
- completionService.submit(task);
- tasksCounter++;
- }
-
- while (tasksCounter > 0) {
- try {
- completionService.take().get();
- } catch (ExecutionException e) {
- // TODO: handle exception
- e.getCause().printStackTrace();
+ Future<Object> future = null;
+ while (true) {
+ future = completionService.take();
+ if (future != null) {
+ try {
+ future.get();
+ } catch (ExecutionException e) {
+ // TODO: handle exception
+ e.getCause().printStackTrace();
+ }
+ } else {
+ break;
}
- tasksCounter--;
}
} finally {
executorService.shutdown();
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceInfo.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceInfo.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceInfo.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -21,6 +21,8 @@
*/
package org.richfaces.cdk;
+import com.google.common.base.Objects;
+
/**
* @author Nick Belaevski
*
@@ -89,4 +91,11 @@
return true;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return Objects.toStringHelper(this).add("resourceName", resourceName).add("libraryName", libraryName).toString();
+ }
}
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceTaskFactory.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceTaskFactory.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/ResourceTaskFactory.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -22,7 +22,7 @@
package org.richfaces.cdk;
import java.util.Collection;
-import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
/**
* @author Nick Belaevski
@@ -32,8 +32,12 @@
public void setSkins(Collection<String> skins);
- public void setResources(Collection<ResourceInfo> resources);
+ public void setCompletionService(CompletionService<Object> completionService);
+
+ public void setFaces(Faces faces);
+
+ public void setResourceWriter(ResourceWriter resourceWriter);
- public Collection<Callable<Object>> createTasks();
+ public void submit(ResourceInfo info);
}
Added: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/concurrent/CountingExecutorCompletionService.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/concurrent/CountingExecutorCompletionService.java (rev 0)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/concurrent/CountingExecutorCompletionService.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -0,0 +1,70 @@
+/*
+ * 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.cdk.concurrent;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class CountingExecutorCompletionService<T> extends ExecutorCompletionService<T> {
+
+ private AtomicInteger tasksCounter = new AtomicInteger(0);
+
+ public CountingExecutorCompletionService(Executor executor) {
+ super(executor);
+ }
+
+ public CountingExecutorCompletionService(Executor executor, BlockingQueue<Future<T>> completionQueue) {
+ super(executor, completionQueue);
+ }
+
+ @Override
+ public Future<T> submit(Callable<T> task) {
+ tasksCounter.getAndIncrement();
+ return super.submit(task);
+ }
+
+ public Future<T> submit(Runnable task, T result) {
+ tasksCounter.getAndIncrement();
+ return super.submit(task, result);
+ }
+
+ @Override
+ public Future<T> take() throws InterruptedException {
+ if (tasksCounter.get() == 0) {
+ return null;
+ }
+
+ try {
+ return super.take();
+ } finally {
+ tasksCounter.getAndDecrement();
+ }
+ }
+}
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/FacesImpl.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/FacesImpl.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/FacesImpl.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -32,6 +32,7 @@
import org.richfaces.application.ServicesFactoryImpl;
import org.richfaces.cdk.Faces;
import org.richfaces.cdk.FileNameMapper;
+import org.richfaces.cdk.ResourceTaskFactory;
import org.richfaces.cdk.skin.SkinFactoryImpl;
import org.richfaces.skin.SkinFactory;
@@ -44,11 +45,15 @@
private String webroot;
private FileNameMapper fileNameMapper;
+
+ private ResourceTaskFactory resourceTaskFactory;
- public FacesImpl(String webroot, FileNameMapper fileNameMapper) {
+ public FacesImpl(String webroot, FileNameMapper fileNameMapper, ResourceTaskFactory resourceTaskFactory) {
super();
this.webroot = webroot;
this.fileNameMapper = fileNameMapper;
+ this.resourceTaskFactory = resourceTaskFactory;
+ resourceTaskFactory.setFaces(this);
}
public void start() {
@@ -61,6 +66,7 @@
serviceFactory.setInstance(SkinFactory.class, skinFactory);
serviceFactory.setInstance(InitParametersStorage.class, new InitParametersStorage());
serviceFactory.setInstance(FileNameMapper.class, fileNameMapper);
+ serviceFactory.setInstance(ResourceTaskFactory.class, resourceTaskFactory);
}
};
serviceFactory.init(Collections.singleton(module));
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/ResourceHandlerImpl.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/ResourceHandlerImpl.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/faces/ResourceHandlerImpl.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -30,7 +30,9 @@
import javax.faces.context.FacesContext;
import org.reflections.util.Utils;
+import org.richfaces.application.ServiceTracker;
import org.richfaces.cdk.ResourceInfo;
+import org.richfaces.cdk.ResourceTaskFactory;
import org.richfaces.cdk.resource.URLResource;
import org.richfaces.resource.CompiledCSSResource;
import org.richfaces.resource.Java2DUserResource;
@@ -110,6 +112,9 @@
result.setContentType(contentType);
result.setResourceName(resourceName);
result.setLibraryName(libraryName);
+
+ ResourceTaskFactory resourceTaskFactory = ServiceTracker.getService(ResourceTaskFactory.class);
+ resourceTaskFactory.submit(new ResourceInfo(resourceName, libraryName));
}
return result;
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/resource/ResourceWriterImpl.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -56,7 +56,6 @@
InputStream is = null;
try {
is = resource.getInputStream();
-
File skinDir = new File(baseDir, skinName);
File outFile = new File(skinDir, getFileNameMapper().createName(resource));
outFile.getParentFile().mkdirs();
Modified: root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java
===================================================================
--- root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java 2010-07-27 14:18:46 UTC (rev 18247)
+++ root/cdk-sandbox/trunk/dynamic-resources-prerenderer/src/main/java/org/richfaces/cdk/task/ResourceTaskFactoryImpl.java 2010-07-27 16:26:04 UTC (rev 18248)
@@ -21,10 +21,12 @@
*/
package org.richfaces.cdk.task;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
-import java.util.List;
import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ConcurrentMap;
import javax.faces.application.Resource;
import javax.faces.component.StateHolder;
@@ -36,8 +38,11 @@
import org.richfaces.cdk.ResourceWriter;
import org.richfaces.cdk.faces.CurrentResourceContext;
import org.richfaces.resource.StateHolderResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
@@ -47,6 +52,8 @@
*/
public class ResourceTaskFactoryImpl implements ResourceTaskFactory {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ResourceTaskFactoryImpl.class);
+
private class ResourcesRendererCallable implements Callable<Object> {
private String skinName;
@@ -63,7 +70,7 @@
resourceInfo.getLibraryName());
}
- public Object call() throws Exception {
+ private void renderResource() {
try {
faces.setSkin(skinName);
FacesContext facesContext = faces.startRequest();
@@ -72,7 +79,7 @@
if (resource == null) {
//TODO log null resource
- return null;
+ return;
}
CurrentResourceContext.getInstance(facesContext).setResource(resource);
@@ -93,12 +100,16 @@
//TODO check content type
resourceWriter.writeResource(skinName, resource);
+ } catch (Exception e) {
+ LOGGER.error(MessageFormat.format("Exception rendering resorce {0} using skin {1}: {2}", resourceInfo, skinName, e.getMessage()), e);
} finally {
faces.setSkin(null);
faces.stopRequest();
}
-
- // TODO Auto-generated method stub
+ }
+
+ public Object call() throws Exception {
+ renderResource();
return null;
}
@@ -108,33 +119,35 @@
private ResourceWriter resourceWriter;
- private Collection<ResourceInfo> resources = Collections.emptySet();
+ private ConcurrentMap<ResourceInfo, Boolean> submittedResources = Maps.newConcurrentMap();
+ private CompletionService<Object> completionService;
+
private Collection<String> skins = Collections.emptySet();
- public ResourceTaskFactoryImpl(Faces faces, ResourceWriter resourceWriter) {
- super();
+ public void setFaces(Faces faces) {
this.faces = faces;
+ }
+
+ public void setResourceWriter(ResourceWriter resourceWriter) {
this.resourceWriter = resourceWriter;
}
-
- public void setResources(Collection<ResourceInfo> resources) {
- this.resources = resources;
+
+ public void setSkins(Collection<String> skins) {
+ this.skins = Lists.newArrayList(skins);
}
- public void setSkins(Collection<String> skins) {
- this.skins = skins;
+ public void setCompletionService(CompletionService<Object> completionService) {
+ this.completionService = completionService;
}
- public Collection<Callable<Object>> createTasks() {
- List<Callable<Object>> result = Lists.newArrayList();
-
- for (String skin : skins) {
- for (ResourceInfo resourceInfo : resources) {
- result.add(new ResourcesRendererCallable(skin, resourceInfo));
+ @Override
+ public void submit(ResourceInfo info) {
+ if (submittedResources.putIfAbsent(info, Boolean.TRUE) == null) {
+ for (String skinName: skins) {
+ completionService.submit(new ResourcesRendererCallable(skinName, info));
}
}
-
- return result;
}
+
}
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18247 - in root: ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-07-27 10:18:46 -0400 (Tue, 27 Jul 2010)
New Revision: 18247
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java
root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss
root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js
root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/templates/inputnumberslider.template.xml
Log:
RF-8983
Modified: root/core/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2010-07-27 13:07:48 UTC (rev 18246)
+++ root/core/trunk/impl/src/main/java/org/richfaces/renderkit/InputRendererBase.java 2010-07-27 14:18:46 UTC (rev 18247)
@@ -56,7 +56,7 @@
return SelectUtils.getConvertedUIInputValue(context, (UIInput) component, (String) val);
}
- public String getInputValue(FacesContext context, UIInput component) {
+ public String getInputValue(FacesContext context, UIComponent component) {
UIInput input = (UIInput) component;
String value = (String) input.getSubmittedValue();
Modified: root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss
===================================================================
--- root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-07-27 13:07:48 UTC (rev 18246)
+++ root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss 2010-07-27 14:18:46 UTC (rev 18247)
@@ -19,38 +19,57 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-.sldr_size {
+.rf-ins, .rf-ins-ta {
display: inline-block;
- width: 200px;
}
-.sldr_min {
- display: block;
+.rf-ins {
+ white-space: nowrap;
+}
+
+.rf-ins-ta {
+ width: 200px; /*TODO remove it*/
+}
+
+.rf-ins-mn, .rf-ins-mx, .rf-ins-i, .rf-ins-tt {
font-size: 11px;
- border-left: 1px solid #c0c0c0;
- padding-left: 3px;
font-family: arial;
- font-size: 11px;
color: #000000;
- float: left;
+}
+
+.rf-ins-mn, .rf-ins-mx {
+ width: 25%;
+ overflow: hidden;
+ display: block;
margin-bottom: 3px;
}
-.sldr_max {
- display: block;
- font-size: 11px;
- top: 0px;
- right: -2px;
+.rf-ins-mn {
+ border-left: 1px solid #c0c0c0;
+ padding-left: 3px;
+ float: left;
+}
+
+.rf-ins-mx {
border-right: 1px solid #c0c0c0;
padding-right: 3px;
- font-family: arial;
- font-size: 11px;
- color: #000000;
float: right;
- margin-bottom: 3px;
+ text-align: right;
}
-.sldr_track {
+.rf-ins-i {
+ background: url("#{resource['bg_field.gif']}") top repeat-x #fff;
+ border: 1px inset #C0C0C0;
+ margin: 0px 10px 0px 10px;
+}
+
+.rf-ins-tt {
+ position: relative;
+ top: -17px;
+ display: none;
+}
+
+.rf-ins-t {
background: url("#{resource['bg.gif']}") 1px 1px repeat-x #FFFFFF;
border: 1px solid #C0C0C0;
display: block;
@@ -59,17 +78,10 @@
clear: both;
}
-.sldr_handler {
+.rf-ins-h {
+ width: 7px;
+ height: 8px;
+ border: none;
position: relative;
top: -1px;
- left: 120px;
-}
-
-.sldr_field {
- background: url("#{resource['bg_field.gif']}") top repeat-x #fff;
- font-family: arial;
- font-size: 11px;
- color: #000000;
- border: 1px inset #C0C0C0;
- margin: 0px 10px 0px 10px;
}
\ No newline at end of file
Modified: root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js
===================================================================
--- root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-07-27 13:07:48 UTC (rev 18246)
+++ root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.js 2010-07-27 14:18:46 UTC (rev 18247)
@@ -25,25 +25,82 @@
richfaces.ui.InputNumberSlider = richfaces.BaseComponent.extendClass({
name: "InputNumberSlider",
+
+ minValue: 0,
+ maxValue: 100,
+ step: 5,
init: function (id) {
+
+ this.range = this.maxValue - this.minValue;
this.id = id;
+ this.element = jQuery(this.attachToDom());
+ this.input = this.element.find(".rf-ins-i");
+ this.track = this.element.find(".rf-ins-t");
+ this.handle = this.element.find(".rf-ins-h");
+ this.tooltip = this.element.find(".rf-ins-tt");
+
+ this.track[0].tabIndex = 0;
+ this.handle.css("left", this.input.val() * (this.track.width() - this.handle.width()) / this.range);
+
+ var proxy = jQuery.proxy(this.__inputHandler, this)
+ this.input.change(proxy);
+ this.input.submit(proxy);
+ this.track.mousedown(jQuery.proxy(this.__mousedownHandler, this));
+ this.track.keydown(jQuery.proxy(this.__keydownHandler, this));
},
- publicFunction: function () {
- // ...
+ setValue: function (value) {
+ value = Number(value);
+ if (value > this.maxValue) {
+ value = this.maxValue;
+ } else if (value < this.minValue) {
+ value = this.minValue;
+ } else {
+ value = Math.round(value / this.step) * this.step; //TODO Add support of float values.
+ }
+ if (value != this.input.val()) {
+ this.input.val(value);
+ var left = value * (this.track.width() - this.handle.width()) / this.range;
+ this.handle.css("left", left);
+ this.tooltip.text(value);
+ this.tooltip.css("left", left - this.handle.width());
+ }
},
- __privateFunction: function () {
- // ...
+ __inputHandler: function () {
+ this.setValue(this.input.val());
+ },
+
+ __keydownHandler: function (event) {
+ if (event.keyCode == 37) { //LEFT
+ this.setValue(Number(this.input.val()) - this.step);
+ event.preventDefault();
+ } else if (event.keyCode == 39) { //RIGHT
+ this.setValue(Number(this.input.val()) + this.step);
+ event.preventDefault();
+ }
+ },
+
+ __mousedownHandler: function (event) {
+ this.__mousemoveHandler(event);
+ this.track.focus();
+ var jQueryDocument = jQuery(document);
+ jQueryDocument.mousemove(jQuery.proxy(this.__mousemoveHandler, this));
+ jQueryDocument.one("mouseup", jQuery.proxy(this.__mouseupHandler, this));
+ this.tooltip.show();
+ event.preventDefault();
+ },
+
+ __mousemoveHandler: function (event) {
+ var value = this.range * (event.pageX - this.track.position().left) / (this.track.width() - this.handle.width()) + this.minValue;
+ this.setValue(value);
+ event.preventDefault();
+ },
+
+ __mouseupHandler: function () {
+ this.tooltip.hide();
+ jQuery(document).unbind("mousemove", this.__mousemoveHandler);
}
-
- // __overrideMethod: function () {
- // // if you need to use method from parent class use link to parent prototype
- // // like in previous solution with extend method
- // this.$super.__overrideMethod.call(this, ...params...);
- //
- // //...
- // }
});
}(window.RichFaces, jQuery));
\ No newline at end of file
Modified: root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/templates/inputnumberslider.template.xml
===================================================================
--- root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-07-27 13:07:48 UTC (rev 18246)
+++ root/ui-sandbox/inputs/trunk/inputnumberslider/src/main/templates/inputnumberslider.template.xml 2010-07-27 14:18:46 UTC (rev 18247)
@@ -40,16 +40,18 @@
</cc:interface>
<cc:implementation>
<span id="#{clientId}" class="rf-ins">
- <span class="sldr_size">
- <span class="sldr_min">0</span>
- <span class="sldr_max">100</span>
- <span class="sldr_track">
+ <span class="rf-ins-ta">
+ <span class="rf-ins-mn">0</span>
+ <span class="rf-ins-mx">100</span>
+ <span class="rf-ins-t">
<img src="#{facesContext.application.resourceHandler.createResource('handler.gif').requestPath}"
- width="7" height="8" alt="" border="0" class="sldr_handler" />
+ alt="" class="rf-ins-h" />
+ <span class="rf-ins-tt">#{getInputValue(facesContext, component)}</span>
</span>
</span>
- <input id="#{clientId}:i" name="#{clientId}" class="sldr_field" size="3" value="10" type="text" />
- <script type="text/javascript">RichFaces.ui.InputNumberSlider('#{clientId}');</script>
+ <input name="#{clientId}" type="text" class="rf-ins-i" size="3"
+ value="#{getInputValue(facesContext, component)}" />
+ <script type="text/javascript">new RichFaces.ui.InputNumberSlider('#{clientId}');</script>
</span>
</cc:implementation>
</cdk:root>
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18246 - in root/ui/iteration/trunk/lists/ui/src: main/resources/META-INF/resources/org.richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-07-27 09:07:48 -0400 (Tue, 27 Jul 2010)
New Revision: 18246
Modified:
root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss
root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java
Log:
https://jira.jboss.org/browse/RF-8969
Modified: root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
===================================================================
--- root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-07-27 13:01:36 UTC (rev 18245)
+++ root/ui/iteration/trunk/lists/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-07-27 13:07:48 UTC (rev 18246)
@@ -134,7 +134,7 @@
}
rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-lst-t rf-dlst-t"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-t"));
termFacet.encodeAll(context);
writer.endElement(HTML.DT_ELEMENT);
}
@@ -146,7 +146,7 @@
}
rendererUtils.writeAttribute(writer, HTML.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-lst-i rf-dlst-d"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-d"));
renderHandlers(context, sequence);
rendererUtils.encodeChildren(context, sequence);
writer.endElement(HTML.DD_ELEMENT);
@@ -192,20 +192,20 @@
}
- private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-lst-i rf-ulst-i");
+ private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-i");
- private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-lst-i rf-olst-i");
+ private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-i");
private ItemsEncoder definitionItemsEncoder = new DefinitionItemsEncoder();
protected String getListClass(ListType type) {
switch (type) {
case ordered:
- return "rf-lst rf-olst";
+ return "rf-olst";
case unordered:
- return "rf-lst rf-ulst";
+ return "rf-ulst";
case definitions:
- return "rf-lst rf-dlst";
+ return "rf-dlst";
default:
throw new IllegalArgumentException(type.toString());
Modified: root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss
===================================================================
--- root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-07-27 13:01:36 UTC (rev 18245)
+++ root/ui/iteration/trunk/lists/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-07-27 13:07:48 UTC (rev 18246)
@@ -1,4 +1,4 @@
-.rf-lst-i, .rf-dlst-t, .rf-dlst-d {
+.rf-ulst-i, .rf-olst-i, .rf-dlst-t, .rf-dlst-d {
font-size: '#{richSkin.generalSizeFont}';
font-family: '#{richSkin.generalFamilyFont}';
color: '#{richSkin.generalTextColor}';
Modified: root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java
===================================================================
--- root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-07-27 13:01:36 UTC (rev 18245)
+++ root/ui/iteration/trunk/lists/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-07-27 13:07:48 UTC (rev 18246)
@@ -73,8 +73,8 @@
assertEquals(1, nodes.size());
HtmlElement list = (HtmlElement) nodes.get(0);
assertEquals("ol", list.getNodeName());
- assertEquals("rf-lst rf-olst", list.getAttribute(HTML.CLASS_ATTRIBUTE));
- verifySimpleListItems(list, "rf-lst-i rf-olst-i");
+ assertEquals("rf-olst", list.getAttribute(HTML.CLASS_ATTRIBUTE));
+ verifySimpleListItems(list, "rf-olst-i");
}
@Test
@@ -86,8 +86,8 @@
HtmlElement list = (HtmlElement) nodes.get(0);
assertEquals("ul", list.getNodeName());
- assertEquals("rf-lst rf-ulst", list.getAttribute(HTML.CLASS_ATTRIBUTE));
- verifySimpleListItems((HtmlElement) list, "rf-lst-i rf-ulst-i");
+ assertEquals("rf-ulst", list.getAttribute(HTML.CLASS_ATTRIBUTE));
+ verifySimpleListItems((HtmlElement) list, "rf-ulst-i");
}
@Test
@@ -141,7 +141,7 @@
HtmlElement item = (HtmlElement) termItems.get(i);
assertEquals("dt", item.getNodeName());
- assertEquals("rf-lst-t rf-dlst-t", item.getAttribute("class"));
+ assertEquals("rf-dlst-t", item.getAttribute("class"));
assertEquals(data.getTerm(), item.asText());
}
@@ -150,7 +150,7 @@
HtmlElement item = (HtmlElement) definitionItems.get(i);
assertEquals("dd", item.getNodeName());
- assertEquals("rf-lst-i rf-dlst-d", item.getAttribute("class"));
+ assertEquals("rf-dlst-d", item.getAttribute("class"));
assertEquals(data.getDefinition(), item.asText());
}
}
14 years, 5 months
- 1
- 0
JBoss Rich Faces SVN: r18245 - in root/tests/metamer/trunk/application/src/main: webapp/components and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-07-27 09:01:36 -0400 (Tue, 27 Jul 2010)
New Revision: 18245
Added:
root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java
root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/
root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml
root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml
root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRegion.css
Modified:
root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
Log:
* added a4j:region (two pages)
Added: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java
===================================================================
--- root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java (rev 0)
+++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java 2010-07-27 13:01:36 UTC (rev 18245)
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * 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 javax.faces.event.AjaxBehaviorEvent;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.SelectItem;
+
+import org.richfaces.component.UIRegion;
+import org.richfaces.tests.metamer.Attributes;
+import org.richfaces.tests.metamer.model.Employee;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for a4j:region.
+ *
+ * @author Exadel, Nick Belaevski, <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "a4jRegionBean")
+@SessionScoped
+public class A4JRegionBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static final SelectItem[] AVAILABLE_EXECUTE_OPTIONS = new SelectItem[]{
+ new SelectItem(null, "default"), new SelectItem("@region"), new SelectItem("@all"), new SelectItem("@this")
+ };
+ private static Logger logger;
+ // for page simple.xhtml
+ private Attributes attributes;
+ private Employee user1;
+ private Employee user2;
+ // for page nested.xhtml
+ private String execute;
+ private String nestedExecute;
+ private String outerExecute;
+ private String outerValue;
+ private String regionValue;
+ private String nestedRegionValue;
+ private String lastExecutedLinkValue;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.info("initializing bean " + getClass().getName());
+
+ user1 = new Employee();
+ user2 = new Employee();
+
+ attributes = Attributes.getUIComponentAttributes(UIRegion.class, getClass());
+ attributes.setAttribute("rendered", true);
+
+ }
+
+ // getters and setters for page simple.xhtml
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+
+ public Employee getUser1() {
+ return user1;
+ }
+
+ public void setUser1(Employee user1) {
+ this.user1 = user1;
+ }
+
+ public Employee getUser2() {
+ return user2;
+ }
+
+ public void setUser2(Employee user2) {
+ this.user2 = user2;
+ }
+
+ // getters and setters for page nested.xhtml
+ public SelectItem[] getExecuteOptions() {
+ return AVAILABLE_EXECUTE_OPTIONS;
+ }
+
+ public String getOuterValue() {
+ return outerValue;
+ }
+
+ public void setOuterValue(String outerValue) {
+ this.outerValue = outerValue;
+ }
+
+ public String getRegionValue() {
+ return regionValue;
+ }
+
+ public void setRegionValue(String value) {
+ this.regionValue = value;
+ }
+
+ public String getNestedRegionValue() {
+ return nestedRegionValue;
+ }
+
+ public void setNestedRegionValue(String nestedValue) {
+ this.nestedRegionValue = nestedValue;
+ }
+
+ public String getExecute() {
+ return execute;
+ }
+
+ public void setExecute(String execute) {
+ this.execute = execute;
+ }
+
+ public String getNestedExecute() {
+ return nestedExecute;
+ }
+
+ public void setNestedExecute(String nestedExecute) {
+ this.nestedExecute = nestedExecute;
+ }
+
+ public String getOuterExecute() {
+ logger.error("getOuterExecute " + outerExecute);
+ return outerExecute;
+ }
+
+ public void setOuterExecute(String outerExecute) {
+ logger.error("setOuterExecute " + outerExecute);
+ this.outerExecute = outerExecute;
+ }
+
+ public void handleBehavior(AjaxBehaviorEvent event) {
+ lastExecutedLinkValue = (String) event.getComponent().getAttributes().get("value");
+ }
+
+ public String getLastExecutedLinkValue() {
+ return lastExecutedLinkValue;
+ }
+
+ public void handleDefaultsValueChange(ValueChangeEvent event) {
+ String newValue = (String) event.getNewValue();
+
+ setOuterExecute(newValue);
+ setExecute(newValue);
+ setNestedExecute(newValue);
+ }
+}
Property changes on: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Modified: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-07-27 12:10:43 UTC (rev 18244)
+++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-07-27 13:01:36 UTC (rev 18245)
@@ -101,6 +101,7 @@
components.put("a4jParam", "A4J Action Parameter");
components.put("a4jPoll", "A4J Poll");
components.put("a4jPush", "A4J Push");
+ components.put("a4jRegion", "A4J Region");
components.put("a4jRepeat", "A4J Repeat");
components.put("commandButton", "JSF Command Button");
components.put("richDataGrid", "Rich Data Grid");
Added: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml (rev 0)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/list.xhtml 2010-07-27 13:01:36 UTC (rev 18245)
@@ -0,0 +1,44 @@
+<!--
+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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+ <h:head>
+ <title>A4J Region</title>
+ <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+ <h:outputStylesheet library="css" name="list.css" />
+ </h:head>
+
+ <h:body>
+
+ <h:link outcome="simple" value="Simple" styleClass="link" />
+ <div class="description">Simple page that contains <b>a4j:region</b> and
+ input boxes for all its attributes.</div>
+
+ <h:link outcome="nested" value="Nested regions" styleClass="link" />
+ <div class="description">Simple page that contains nested <b>a4j:region</b>s.</div>
+
+ </h:body>
+</html>
\ No newline at end of file
Added: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml (rev 0)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2010-07-27 13:01:36 UTC (rev 18245)
@@ -0,0 +1,143 @@
+<!--
+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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich">
+
+ <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>
+
+ <h:outputStylesheet library="css" name="a4jRegion.css" />
+
+ <script type="text/javascript">/*<![CDATA[*/
+ function randomize() {
+ jQuery("input[type='text']").each(function() {
+ var letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ var val = "";
+
+ for (var i = 0; i < 8; i++) {
+ var letter = letters.charAt(Math.floor(letters.length * Math.random()));
+ val += letter;
+ }
+
+ this.value = val;
+ });
+ }
+ /*]]>*/</script>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+
+ <h:panelGrid columns="2">
+ <h:outputLabel id="defaultSelectLabel" value="Defaults for all" for="defaultsSelect"/>
+ <h:selectOneMenu id="defaultsSelect" valueChangeListener="#{a4jRegionBean.handleDefaultsValueChange}">
+ <f:selectItems value="#{a4jRegionBean.executeOptions}" />
+ <a4j:ajax event="change" render="outerSelect, regionSelect, nestedRegionSelect" execute="@this"/>
+ </h:selectOneMenu>
+
+ <h:outputLabel id="outerSelectLabel" value="Out of region" for="outerSelect"/>
+ <h:selectOneMenu id="outerSelect" value="#{a4jRegionBean.outerExecute}" onchange="submit()">
+ <f:selectItems value="#{a4jRegionBean.executeOptions}" />
+ </h:selectOneMenu>
+
+ <h:outputLabel id="regionSelectLabel" value="Region" for="regionSelect"/>
+ <h:selectOneMenu id="regionSelect" value="#{a4jRegionBean.execute}" onchange="submit()">
+ <f:selectItems value="#{a4jRegionBean.executeOptions}" />
+ </h:selectOneMenu>
+
+ <h:outputLabel id="nestedRegionSelectLabel" value="Nested region" for="nestedRegionSelect" />
+ <h:selectOneMenu id="nestedRegionSelect" value="#{a4jRegionBean.nestedExecute}" onchange="submit()">
+ <f:selectItems value="#{a4jRegionBean.executeOptions}" />
+ </h:selectOneMenu>
+ </h:panelGrid>
+
+
+ <br/>
+
+ <fieldset>
+ <legend>outputs</legend>
+
+ <h:panelGroup layout="block" id="outputValues">
+ <h:panelGrid columns="2" >
+ Outer: <h:outputText id="outerValueOutput" value="#{a4jRegionBean.outerValue}" />
+ Region: <h:outputText id="regionValueOutput" value="#{a4jRegionBean.regionValue}" />
+ Nested region: <h:outputText id="nestedRegionValueOutput" value="#{a4jRegionBean.nestedRegionValue}" />
+ Last executed link value: <h:outputText id="lastLinkOutput" value="#{a4jRegionBean.lastExecutedLinkValue}" />
+ </h:panelGrid>
+ </h:panelGroup>
+ </fieldset>
+
+ <br/>
+ <button id="generateValuesButton" type="button" onclick="randomize()">Generate random values</button>
+ <br/>
+ <br/>
+
+ <h:inputText id="outerValueInput" value="#{a4jRegionBean.outerValue}" />
+
+ <h:commandLink id="outerValueLink" value="Out of region">
+ <a4j:ajax id="outerValueAjax" listener="#{a4jRegionBean.handleBehavior}" execute="#{a4jRegionBean.outerExecute}" render="outputValues" />
+ </h:commandLink>
+
+ <fieldset>
+ <legend>Region</legend>
+
+ <a4j:region id="outerRegion">
+ <h:inputText id="regionValueInput" value="#{a4jRegionBean.regionValue}" />
+
+ <h:commandLink id="regionValueLink" value="Region">
+ <a4j:ajax id="regionValueAjax" listener="#{a4jRegionBean.handleBehavior}" execute="#{a4jRegionBean.execute}" render="outputValues" />
+ </h:commandLink>
+
+ <fieldset>
+ <legend>Nested region</legend>
+
+ <a4j:region id="nestedRegion">
+ <h:inputText id="nestedRegionValueInput" value="#{a4jRegionBean.nestedRegionValue}" />
+
+ <h:commandLink id="nestedRegionValueLink" value="Nested region">
+ <a4j:ajax id="nestedRegionValueAjax" listener="#{a4jRegionBean.handleBehavior}" execute="#{a4jRegionBean.nestedExecute}" render="outputValues" />
+ </h:commandLink>
+
+ </a4j:region>
+ </fieldset>
+ </a4j:region>
+ </fieldset>
+
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml
===================================================================
--- root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml (rev 0)
+++ root/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2010-07-27 13:01:36 UTC (rev 18245)
@@ -0,0 +1,105 @@
+<!--
+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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:ta="http://java.sun.com/jsf/composite/testapp" xmlns:rich="http://richfaces.org/rich">
+
+ <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>
+ <h:outputStylesheet library="css" name="a4jRegion.css" />
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+
+ <fieldset>
+ <legend>User info panel explicitly executed by ID</legend>
+
+ <h:panelGrid columns="2">
+ <h:panelGrid columns="2" id="inputPanel1">
+ <h:outputText value="Name: " />
+ <h:inputText id="user1NameInput" value="#{a4jRegionBean.user1.name}">
+ <a4j:ajax render="outputPanel1" event="keyup" execute="inputPanel1" />
+ </h:inputText>
+ <h:outputText value="Email: " />
+ <h:inputText id="user1EmailInput" value="#{a4jRegionBean.user1.email}">
+ <a4j:ajax render="outputPanel1" event="keyup" execute="inputPanel1" />
+ </h:inputText>
+ </h:panelGrid>
+
+ <h:panelGrid columns="2" id="outputPanel1">
+ <h:outputText value="Entered name:" />
+ <h:outputText id="user1NameOutput" value="#{a4jRegionBean.user1.name}" />
+ <h:outputText value="Entered email:" />
+ <h:outputText id="user1EmailOutput" value="#{a4jRegionBean.user1.email}" />
+ </h:panelGrid>
+ </h:panelGrid>
+
+ </fieldset>
+
+ <br/>
+
+ <fieldset>
+ <legend>User info panel with a4j:region</legend>
+
+ <h:panelGrid columns="2">
+ <a4j:region id="a4jRegion"
+ rendered="#{a4jRegionBean.attributes['rendered'].value}">
+ <h:panelGrid columns="2" id="inputPanel2">
+ <h:outputText value="Name: " />
+ <h:inputText id="user2NameInput" value="#{a4jRegionBean.user2.name}">
+ <a4j:ajax render="outputPanel2" event="keyup" />
+ </h:inputText>
+ <h:outputText value="Email: " />
+ <h:inputText id="user2EmailInput" value="#{a4jRegionBean.user2.email}">
+ <a4j:ajax render="outputPanel2" event="keyup" />
+ </h:inputText>
+ </h:panelGrid>
+ </a4j:region>
+
+ <h:panelGrid columns="2" id="outputPanel2">
+ <h:outputText value="Entered name:" />
+ <h:outputText id="user2NameOutput" value="#{a4jRegionBean.user2.name}" />
+ <h:outputText value="Entered email:" />
+ <h:outputText id="user2EmailOutput" value="#{a4jRegionBean.user2.email}" />
+ </h:panelGrid>
+
+ </h:panelGrid>
+ </fieldset>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <ta:attributes value="#{a4jRegionBean.attributes}" id="attributes" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: root/tests/metamer/trunk/application/src/main/webapp/resources/css/a4jRegion.css
===================================================================
14 years, 5 months
- 1
- 0