richfaces-svn-commits
August 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 329 discussions
JBoss Rich Faces SVN: r15155 - in branches/community/3.3.X/docs: migrationguide/en/src/main/docbook and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-08-11 07:16:31 -0400 (Tue, 11 Aug 2009)
New Revision: 15155
Modified:
branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml
branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-670 - links are fixed
Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml
===================================================================
--- branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml 2009-08-11 00:35:58 UTC (rev 15154)
+++ branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/master.xml 2009-08-11 11:16:31 UTC (rev 15155)
@@ -47,7 +47,7 @@
<!ENTITY jspdeclaration SYSTEM "tags/jspdeclaration.xml">
<!ENTITY cdkguide "../../cdkguide/html_single/index.html">
-<!ENTITY devguide "../../devguide//html_single/index.html">
+<!ENTITY devguide "../../devguide/html_single/index.html">
<!ENTITY migrationguide "../../migrationguide/html_single/index.html">
<!ENTITY photoalbumguide "../../realworld/html_single/index.html">
<!ENTITY realworld "../../realworld/html_single/index.html">
Modified: branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master.xml
===================================================================
--- branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master.xml 2009-08-11 00:35:58 UTC (rev 15154)
+++ branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/master.xml 2009-08-11 11:16:31 UTC (rev 15155)
@@ -28,7 +28,7 @@
<!ENTITY dataTableAjax SYSTEM "included/dataTableAjax.xml">
<!ENTITY cdkguide "../../cdkguide/html_single/index.html">
- <!ENTITY devguide "../../devguide//html_single/index.html">
+ <!ENTITY devguide "../../devguide/html_single/index.html">
<!ENTITY migrationguide "../../migrationguide/html_single/index.html">
<!ENTITY photoalbumguide "../../realworld/html_single/index.html">
<!ENTITY realworld "../../realworld/html_single/index.html">
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15154 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/apt and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-08-10 20:35:58 -0400 (Mon, 10 Aug 2009)
New Revision: 15154
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java
root/cdk/trunk/plugins/generator/src/main/javadoc/generatedClasses.png
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java
Removed:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/NamingConventions.java
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCdkContext.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/JsfType.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java
Log:
Parse attributes annotations.
Move naming conventions to CdkContext
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCdkContext.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCdkContext.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/AbstractCdkContext.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -43,7 +43,7 @@
private File resourceOutput;
- private String baseName;
+ private NamingConventions namingConventions;
/**
* <p class="changed_added_4_0"></p>
@@ -108,17 +108,21 @@
return loader;
}
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the namingConventions
+ */
@Override
- public String getBaseName() {
- return this.baseName;
+ public NamingConventions getNamingConventions() {
+ return namingConventions;
}
/**
* <p class="changed_added_4_0"></p>
- * @param baseName the baseName to set
+ * @param namingConventions the namingConventions to set
*/
- public void setBaseName(String baseName) {
- this.baseName = baseName;
+ public void setNamingConventions(NamingConventions namingConventions) {
+ this.namingConventions = namingConventions;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContext.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -3,6 +3,7 @@
import java.io.File;
+
/**
* <p class="changed_added_4_0">
* That interface defines context for all CDK operations
@@ -50,14 +51,9 @@
public abstract File getJavaSource();
/**
- * <p class="changed_added_4_0">
- * Base name for generated JSF library, as described in the CDK <a href=
- * "http://www.jboss.org/community/wiki/RichFacesCDKnamingconventions"
- * >naming conventions</a>
- * </p>
- *
+ * <p class="changed_added_4_0"></p>
* @return
*/
- public String getBaseName();
+ public NamingConventions getNamingConventions();
}
\ No newline at end of file
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/LibraryBuilder.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -101,7 +101,7 @@
* @return
*/
public ComponentLibrary createLibrary(){
- return new ComponentLibrary(getContext().getBaseName());
+ return new ComponentLibrary();
}
/**
Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java (from rev 15150, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/NamingConventions.java)
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -0,0 +1,70 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk;
+
+import org.richfaces.cdk.model.ClassDescription;
+import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.InvalidNameException;
+import org.richfaces.cdk.model.Component.Type;
+
+/**
+ * <p class="changed_added_4_0">
+ * That interface defines methods that calculates names according to <a
+ * href="http://www.jboss.org/community/docs/DOC-13693">CDK naming
+ * conventions</>
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public interface NamingConventions {
+
+ /**
+ * <p class="changed_added_4_0">Calculates component type from explicit value or base class name.</p>
+ * <ul>
+ * <li><code><prefix>.component.Abstract<Name></code> => <code><prefix>.<Name></code> </li>
+ * <li><code><prefix>.component.<Name>Base</code> => <code><prefix>.<Name></code> </li>
+ * <li><code><prefix>.component.UI<Name></code> => <code><prefix>.<Name></code> </li>
+ * </ul>
+ * @param explicitType
+ * @param className
+ * @return
+ * @throws InvalidNameException if className does not match naming conventions.
+ */
+ public String inferComponentType(String explicitType, String className) throws InvalidNameException;
+
+ /**
+ * <p class="changed_added_4_0">Calculates concrete component class from explicit value or type.</p>
+ * <ul>
+ * <li>Use explicit class name if it was provided by developer.</li>
+ * <li>Calculate name from type as <code><prefix>.<Name></code> => <code><prefix>.component.UI<Name></code> for an abstract class.</li>
+ * <li>Use base class name if concrete class should not be generated.
+ * </ul>
+ * @param explicitClass
+ * @param className
+ * @return
+ */
+ public String inferUIComponentClass(String componentType, String explicitClass, String baseClass, boolean baseClassIsAbstract) throws InvalidNameException;
+
+}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -0,0 +1,115 @@
+package org.richfaces.cdk;
+
+import org.richfaces.cdk.model.ClassDescription;
+import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.InvalidNameException;
+import org.richfaces.cdk.model.Name;
+import org.richfaces.cdk.model.Component.Type;
+import org.richfaces.cdk.model.Name.Classifier;
+import org.richfaces.cdk.util.Strings;
+
+/**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+final class RichFacesConventions implements NamingConventions {
+
+ private static final String ABSTRACT = "Abstract";
+ private static final String UI = "UI";
+ private static final String BASE = "Base";
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ */
+ private final String baseName;
+
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param componentLibrary
+ */
+ RichFacesConventions(String baseName) {
+ this.baseName = baseName;
+ }
+
+
+ private final String[] COMPONENT_SUFFIXES = { BASE };
+ private final String[] COMPONENT_PREFIXES = { UI, ABSTRACT };
+
+ @Override
+ public String inferComponentType(String explicitType, String className)
+ throws InvalidNameException {
+ // check parameters.
+ if (Strings.isEmpty(explicitType)) {
+ if (Strings.isEmpty(className)) {
+ throw new IllegalArgumentException();
+ }
+ Name name = Name.create(className);
+ // Use base library prefix.
+ name.setPrefix(this.getBaseName());
+ // Component type does not contain class or markup parts.
+ name.setClassifier(null);
+ name.setMarkup(null);
+ String simpleName = name.getSimpleName();
+ // Remove common prefixes.
+ for (int i = 0; i < COMPONENT_PREFIXES.length; i++) {
+ if (simpleName.startsWith(COMPONENT_PREFIXES[i])) {
+ simpleName = simpleName.substring(COMPONENT_PREFIXES[i]
+ .length());
+ break;
+ }
+ }
+ // Remove common suffixes.
+ for (int i = 0; i < COMPONENT_SUFFIXES.length; i++) {
+ if (simpleName.endsWith(COMPONENT_SUFFIXES[i])) {
+ simpleName = simpleName.substring(0, simpleName
+ .length()
+ - COMPONENT_SUFFIXES[i].length());
+ break;
+ }
+ }
+ name.setSimpleName(simpleName);
+ return name.toString();
+ } else {
+ return explicitType;
+ }
+ }
+
+
+ @Override
+ public String inferUIComponentClass(String componentType,
+ String explicitClass, String baseClass, boolean baseClassIsAbstract)
+ throws InvalidNameException {
+ String className;
+ if(!Strings.isEmpty(explicitClass)){
+ // Class name provided by developer.
+ className = explicitClass;
+ } else if (baseClassIsAbstract || baseClass.startsWith(ABSTRACT)|| baseClass.endsWith(BASE)) {
+ // Infer UI class name from component type.
+ Name name = Name.create(componentType);
+ name.setClassifier(Classifier.component);
+ name.setMarkup(null);
+ name.setSimpleName(UI+name.getSimpleName());
+ className = name.toString();
+ } else {
+ // Do not generate class, use base name.
+ className = baseClass;
+ }
+ return className;
+ }
+
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the baseName
+ */
+ protected String getBaseName() {
+ return baseName;
+ }
+
+
+
+}
\ No newline at end of file
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -24,6 +24,7 @@
package org.richfaces.cdk.apt;
import java.lang.annotation.Annotation;
+import java.util.List;
import java.util.Set;
import javax.annotation.processing.AbstractProcessor;
@@ -32,9 +33,16 @@
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
import org.richfaces.cdk.CdkContext;
+import org.richfaces.cdk.model.InvalidNameException;
+import org.richfaces.cdk.util.PropertyUtils;
import com.google.common.collect.Sets;
@@ -50,13 +58,99 @@
public abstract class CdkProcessor extends AbstractProcessor {
/**
- * <p class="changed_added_4_0">CDK context.</p>
- */
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+ protected final class BeanProperty {
+
+ private TypeMirror type;
+
+ private Element element;
+
+ private final String name;
+
+ private boolean exists;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + getOuterType().hashCode();
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ BeanProperty other = (BeanProperty) obj;
+ if (!getOuterType().equals(other.getOuterType()))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ return true;
+ }
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param name
+ */
+ public BeanProperty(String name) {
+ this.name = name;
+ }
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ private CdkProcessor getOuterType() {
+ return CdkProcessor.this;
+ }
+
+ }
+
+ /**
+ * <p class="changed_added_4_0">
+ * CDK context.
+ * </p>
+ */
protected final CdkContext context;
/**
- * <p class="changed_added_4_0"></p>
- * @param context current CDK context
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param context
+ * current CDK context
*/
protected CdkProcessor(CdkContext context) {
super();
@@ -80,14 +174,22 @@
}
/**
- * <p class="changed_added_4_0">Get all classes annotated with particular annotation.</p>
- * @param annotation annotation class.
- * @param round current round environment.
- * @return {@link Set} of all classes annotated with {@code annotation} type.
+ * <p class="changed_added_4_0">
+ * Get all classes annotated with particular annotation.
+ * </p>
+ *
+ * @param annotation
+ * annotation class.
+ * @param round
+ * current round environment.
+ * @return {@link Set} of all classes annotated with {@code annotation}
+ * type.
*/
- protected Set<? extends TypeElement> getClassesAnnotatedWith(Class<? extends Annotation> annotation,RoundEnvironment round){
+ protected Set<? extends TypeElement> getClassesAnnotatedWith(
+ Class<? extends Annotation> annotation, RoundEnvironment round) {
Set<TypeElement> classes = Sets.newHashSet();
- Set<? extends Element> annotatedWith = round.getElementsAnnotatedWith(annotation);
+ Set<? extends Element> annotatedWith = round
+ .getElementsAnnotatedWith(annotation);
for (Element element : annotatedWith) {
if (ElementKind.CLASS.equals(element.getKind())) {
TypeElement classElement = (TypeElement) element;
@@ -96,4 +198,66 @@
}
return classes;
}
+
+ /**
+ * <p class="changed_added_4_0">
+ * Get all fields and bean properties that are annotated with given
+ * annotation.
+ * </p>
+ *
+ * @param annotation
+ * @param type
+ * @return
+ */
+ protected Set<BeanProperty> getBeanPropertiesAnnotatedWith(
+ Class<? extends Annotation> annotation, TypeElement type) {
+ Set<BeanProperty> properties = Sets.newHashSet();
+ List<ExecutableElement> methodsIn = ElementFilter
+ .methodsIn(this.processingEnv.getElementUtils().getAllMembers(
+ type));
+ // Get all methods and fields annotated by annotation.
+ for (ExecutableElement executableElement : methodsIn) {
+ if (null != executableElement.getAnnotation(annotation)) {
+ // Have an annotation, infer property name.
+ String name;
+ TypeMirror propertyType;
+ if (ElementKind.METHOD.equals(executableElement.getKind())) {
+ propertyType = executableElement.getReturnType();
+ List<? extends VariableElement> parameters = executableElement
+ .getParameters();
+ if (TypeKind.VOID.equals(propertyType.getKind())
+ && 1 == parameters.size()) {
+ // That is setter method, get type from parameter.
+ propertyType = parameters.get(0).asType();
+ } else if (!parameters.isEmpty()) {
+ // TODO Invalid method signature for a bean property,
+ // throw exception ?
+ continue;
+ }
+ try {
+ name = PropertyUtils
+ .methodToName(executableElement.getSimpleName()
+ .toString());
+ } catch (InvalidNameException e) {
+ // TODO Invalid method name for a bean property, throw
+ // exception ?
+ continue;
+ }
+
+ } else if (ElementKind.FIELD
+ .equals(executableElement.getKind())) {
+ name = executableElement.getSimpleName().toString();
+ propertyType = executableElement.asType();
+ } else {
+ continue;
+ }
+ BeanProperty property = new BeanProperty(name);
+ property.type = propertyType;
+ property.element = executableElement;
+ // TODO - merge properties with same name ?
+ properties.add(property);
+ }
+ }
+ return properties;
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -29,13 +29,17 @@
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import org.richfaces.cdk.CdkContext;
+import org.richfaces.cdk.NamingConventions;
import org.richfaces.cdk.annotations.Component;
+import org.richfaces.cdk.annotations.Family;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.InvalidNameException;
-import org.richfaces.cdk.model.NamingConventions;
+import org.richfaces.cdk.model.Component.Type;
+import org.richfaces.cdk.util.Strings;
/**
* <p class="changed_added_4_0"></p>
@@ -64,19 +68,22 @@
RoundEnvironment roundEnv) {
if(null != annotations && !annotations.isEmpty()){
ComponentLibrary library = getLibrary();
- NamingConventions namingUtils = library.getNamingUtils();
+ NamingConventions namingUtils = getContext().getNamingConventions();
// Process all component classes.
Set<? extends TypeElement> componentClasses = getClassesAnnotatedWith(Component.class, roundEnv);
for (TypeElement component : componentClasses) {
try {
// Process class-level annotations.
- // Calculate type
+ // Calculate type for base UI component class.
Component componentAnnotation = component.getAnnotation(Component.class);
- String componentType = namingUtils.inferComponentType(componentAnnotation.type(),component.getQualifiedName().toString());
+ String baseClassName = component.getQualifiedName().toString();
+ String componentType = namingUtils.inferComponentType(componentAnnotation.type(),baseClassName);
+ String uiComponentClass = namingUtils.inferUIComponentClass(componentType, componentAnnotation.className(), baseClassName, component.getModifiers().contains(Modifier.ABSTRACT));
org.richfaces.cdk.model.Component componentModel = library
- .getComponent(componentType, true);
- // Calculate classes.
- String componentClassName = componentAnnotation.className();
+ .createComponent(componentType, uiComponentClass, baseClassName);
+ // Component Family.
+ Family family = component.getAnnotation(Family.class);
+ componentModel.setFamily(Strings.isEmpty(family.value())?componentType:family.value());
// Process attributes.
} catch (InvalidNameException e) {
// rise error and continue.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -23,49 +23,58 @@
package org.richfaces.cdk.model;
+import com.google.common.collect.ImmutableMap;
+
/**
- * <p class="changed_added_4_0">Tthat class represents information about Jsf object class.</p>
+ * <p class="changed_added_4_0">
+ * Tthat class represents information about Jsf object class.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
public class ClassDescription {
-
+
+ private static final ImmutableMap<String, String> primitiveTypes = ImmutableMap
+ .<String, String> builder().put(boolean.class.getName(),
+ Boolean.class.getName()).put(byte.class.getName(),
+ Byte.class.getName()).put(char.class.getName(),
+ Character.class.getName()).put(short.class.getName(),
+ Short.class.getName()).put(int.class.getName(),
+ Integer.class.getName()).put(long.class.getName(),
+ Long.class.getName()).put(float.class.getName(),
+ Float.class.getName()).put(double.class.getName(),
+ Double.class.getName()).build();
+
private final String name;
-
- private boolean exists;
-
- private boolean primitive;
-
- private String boxingClassName;
-
+
+ private final boolean primitive;
+
+ private final String boxingClassName;
+
private ClassDescription superClass;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @param name
*/
public ClassDescription(String name) {
this.name = name;
+ if (primitiveTypes.containsKey(name)) {
+ boxingClassName = primitiveTypes.get(name);
+ primitive = true;
+ } else {
+ boxingClassName = name;
+ primitive = false;
+ }
}
/**
- * <p class="changed_added_4_0"></p>
- * @return the exists
- */
- public boolean isExists() {
- return exists;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param exists the exists to set
- */
- public void setExists(boolean exists) {
- this.exists = exists;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return the superClass
*/
public ClassDescription getSuperClass() {
@@ -73,15 +82,20 @@
}
/**
- * <p class="changed_added_4_0"></p>
- * @param superClass the superClass to set
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param superClass
+ * the superClass to set
*/
public void setSuperClass(ClassDescription superClass) {
this.superClass = superClass;
}
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return the name
*/
public String getName() {
@@ -89,7 +103,9 @@
}
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return the primitive
*/
public boolean isPrimitive() {
@@ -97,28 +113,18 @@
}
/**
- * <p class="changed_added_4_0"></p>
- * @param primitive the primitive to set
- */
- public void setPrimitive(boolean primitive) {
- this.primitive = primitive;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return the boxingClassName
*/
- public String getBoxingClassName() {
- return primitive?boxingClassName:name;
+ public String getBoxingName() {
+ return boxingClassName;
}
- /**
- * <p class="changed_added_4_0"></p>
- * @param boxingClassName the boxingClassName to set
- */
- public void setBoxingClassName(String boxingClassName) {
- this.boxingClassName = boxingClassName;
+ @Override
+ public String toString() {
+ return name;
}
-
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
+import org.richfaces.cdk.model.Component.Type;
import org.richfaces.cdk.util.Strings;
import com.google.common.collect.Maps;
@@ -56,64 +57,6 @@
/**
* <p class="changed_added_4_0">
- * </p>
- *
- * @author asmirnov(a)exadel.com
- *
- */
- final class RichFacesConventions implements NamingConventions {
- private final String[] COMPONENT_SUFFIXES = { "Base" };
- private final String[] COMPONENT_PREFIXES = { "UI", "Abstract" };
-
- @Override
- public String inferComponentType(String explicitType, String className)
- throws InvalidNameException {
- // check parameters.
- if (Strings.isEmpty(explicitType)) {
- if (Strings.isEmpty(className)) {
- throw new IllegalArgumentException();
- }
- Name name = Name.create(className);
- // Use base library prefix.
- name.setPrefix(getBaseName());
- // Component type does not contain class or markup parts.
- name.setClassifier(null);
- name.setMarkup(null);
- String simpleName = name.getSimpleName();
- // Remove common prefixes.
- for (int i = 0; i < COMPONENT_PREFIXES.length; i++) {
- if (simpleName.startsWith(COMPONENT_PREFIXES[i])) {
- simpleName = simpleName.substring(COMPONENT_PREFIXES[i]
- .length());
- break;
- }
- }
- // Remove common suffixes.
- for (int i = 0; i < COMPONENT_SUFFIXES.length; i++) {
- if (simpleName.endsWith(COMPONENT_SUFFIXES[i])) {
- simpleName = simpleName.substring(0, simpleName
- .length()
- - COMPONENT_SUFFIXES[i].length());
- break;
- }
- }
- name.setSimpleName(simpleName);
- return name.toString();
- } else {
- return explicitType;
- }
- }
-
- @Override
- public String inferUIComponentClass(String explicitClass, String componentType) {
- // TODO Auto-generated method stub
- return null;
- }
-
- }
-
- /**
- * <p class="changed_added_4_0">
* JSF components in that library
* </p>
*/
@@ -144,13 +87,7 @@
*/
private final TagLibrary tagLibrary;
- /**
- * <p class="changed_added_4_0">
- * </p>
- */
- private final String baseName;
- private NamingConventions namingConventions = new RichFacesConventions();
/**
* <p class="changed_added_4_0">
@@ -158,9 +95,8 @@
*
* @param baseName
*/
- public ComponentLibrary(String baseName) {
- this.baseName = baseName;
- this.tagLibrary = new TagLibrary(baseName);
+ public ComponentLibrary() {
+ this.tagLibrary = new TagLibrary();
}
/**
@@ -191,7 +127,7 @@
* created
* </p>
*
- * @param type
+ * @param componentType2
* @param create
* @return
*/
@@ -206,6 +142,31 @@
}
/**
+ * <p class="changed_added_4_0">Create a new component description.</p>
+ * @param type component type.
+ * @param className final component class name.
+ * @param superClassName name of the component superclass. May be empty or null for already existed components.
+ * @return
+ */
+ public Component createComponent(String type, String className, String superClassName) {
+ Component component = getComponent(type, true);
+ ClassDescription componentClass;
+ if(!Strings.isEmpty(className)){
+ componentClass = new ClassDescription(className);
+ if(!Strings.isEmpty(superClassName) && !className.equals(superClassName)){
+ componentClass.setSuperClass(new ClassDescription(superClassName));
+ }
+ } else if(!Strings.isEmpty(superClassName)) {
+ componentClass = new ClassDescription(superClassName);
+ } else {
+ // Do not modify class descriptions because it would be already existed component.
+ return component;
+ }
+ component.setComponentClass(componentClass);
+ return component;
+ }
+
+ /**
* <p class="changed_added_4_0">
* </p>
*
@@ -265,18 +226,5 @@
return tagLibrary;
}
- public NamingConventions getNamingUtils() {
- return namingConventions;
- }
- /**
- * <p class="changed_added_4_0">
- * </p>
- *
- * @return the baseName
- */
- protected String getBaseName() {
- return baseName;
- }
-
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/JsfType.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/JsfType.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/JsfType.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -40,6 +40,14 @@
this.type = type;
}
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
@Override
public String toString() {
return type;
Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/NamingConventions.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/NamingConventions.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/NamingConventions.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -1,63 +0,0 @@
-/*
- * $Id$
- *
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.cdk.model;
-
-/**
- * <p class="changed_added_4_0">
- * That interface defines methods that calculates names according to <a
- * href="http://www.jboss.org/community/docs/DOC-13693">CDK naming
- * conventions</>
- * </p>
- *
- * @author asmirnov(a)exadel.com
- *
- */
-public interface NamingConventions {
-
- /**
- * <p class="changed_added_4_0">Calculates component type from explicit value or base class name.</p>
- * <ul>
- * <li><code><prefix>.component.Abstract<Name></code> => <code><prefix>.<Name></code> </li>
- * <li><code><prefix>.component.<Name>Base</code> => <code><prefix>.<Name></code> </li>
- * <li><code><prefix>.component.UI<Name></code> => <code><prefix>.<Name></code> </li>
- * </ul>
- * @param explicitType
- * @param className
- * @return
- * @throws InvalidNameException if className does not match naming conventions.
- */
- public String inferComponentType(String explicitType, String className) throws InvalidNameException;
-
- /**
- * <p class="changed_added_4_0">Calculates concrete component class from explicit value or type.</p>
- * <ul>
- * <li><code><prefix>.<Name></code> => <code><prefix>.component.UI<Name></code> </li>
- * </ul>
- * @param explicitClass
- * @param className
- * @return
- */
- public String inferUIComponentClass(String explicitClass, String componentType);
-
-}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -38,12 +38,6 @@
*/
private final List<Tag> tags = new ArrayList<Tag>();
- private final String baseName;
-
- public TagLibrary(String baseName) {
- this.baseName = baseName;
- }
-
/**
* <p class="changed_added_4_0"></p>
* @return the tags
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -0,0 +1,46 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.util;
+
+import org.richfaces.cdk.model.InvalidNameException;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class PropertyUtils {
+
+ public static String methodToName(String methodName) throws InvalidNameException {
+ if(null != methodName ){
+ if(methodName.length()>3 && Character.isUpperCase(methodName.charAt(3)) &&(methodName.startsWith("set")||methodName.startsWith("get"))){
+ return Strings.firstToLowerCase(methodName.substring(3));
+ } else if(methodName.length()>2 && Character.isUpperCase(methodName.charAt(2)) && methodName.startsWith("is")) {
+ return Strings.firstToLowerCase(methodName.substring(2));
+ }
+ }
+ throw new InvalidNameException("Method name "+methodName+" is not valid bean property getter or setter");
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/PropertyUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: root/cdk/trunk/plugins/generator/src/main/javadoc/generatedClasses.png
===================================================================
(Binary files differ)
Property changes on: root/cdk/trunk/plugins/generator/src/main/javadoc/generatedClasses.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -0,0 +1,114 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.richfaces.cdk.model.InvalidNameException;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class NamingConventionsTest {
+
+ private static final String BASE="foo.bar";
+ private RichFacesConventions conventions;
+
+ @Before
+ public void createConventions() {
+ conventions = new RichFacesConventions(BASE);
+ }
+
+ @After
+ public void destroyConventions(){
+ conventions = null;
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferComponentType(java.lang.String, java.lang.String)}.
+ * @throws Exception
+ */
+ @Test
+ public void testInferComponentTypeExplicit() throws Exception {
+ assertEquals("foo.bar.Test", conventions.inferComponentType("foo.bar.Test","foo.baz.UITest"));
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferComponentType(java.lang.String, java.lang.String)}.
+ * @throws Exception
+ */
+ @Test
+ public void testInferComponentTypeFromUIClass() throws Exception {
+ assertEquals("foo.bar.Test", conventions.inferComponentType("","foo.baz.component.UITest"));
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferComponentType(java.lang.String, java.lang.String)}.
+ * @throws Exception
+ */
+ @Test
+ public void testInferComponentTypeFromAbstractClass() throws Exception {
+ assertEquals("foo.bar.Test", conventions.inferComponentType("","foo.baz.component.AbstractTest"));
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferComponentType(java.lang.String, java.lang.String)}.
+ * @throws Exception
+ */
+ @Test
+ public void testInferComponentTypeFromBaseClass() throws Exception {
+ assertEquals("foo.bar.Test", conventions.inferComponentType("","foo.baz.component.TestBase"));
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferComponentType(java.lang.String, java.lang.String)}.
+ * @throws Exception
+ */
+ @Test
+ public void testInferComponentTypeFromMarkupClass() throws Exception {
+ assertEquals("foo.bar.HtmlTest", conventions.inferComponentType("","foo.baz.component.html.HtmlTest"));
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferUIComponentClass(java.lang.String, java.lang.String, java.lang.String, boolean)}.
+ */
+ @Test
+ public void testInferUIComponentClassFromExplicit() throws Exception {
+ assertEquals("foo.bar.UITest", conventions.inferUIComponentClass("foo.bar.Test", "foo.bar.UITest", "foo.bar.AbstractClass", true));
+ }
+
+ /**
+ * Test method for {@link org.richfaces.cdk.RichFacesConventions#inferUIComponentClass(java.lang.String, java.lang.String, java.lang.String, boolean)}.
+ */
+ @Test
+ public void testInferUIComponentClassFromType() throws Exception {
+ assertEquals("foo.bar.component.UITest", conventions.inferUIComponentClass("foo.bar.Test", "", "foo.bar.AbstractClass", true));
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/NamingConventionsTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java 2009-08-10 17:48:55 UTC (rev 15153)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ProcessorTest.java 2009-08-11 00:35:58 UTC (rev 15154)
@@ -23,30 +23,18 @@
package org.richfaces.cdk.apt;
+import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
-
import static javax.lang.model.util.ElementFilter.*;
-
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.nio.channels.Channels;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
import java.util.Set;
-import java.util.logging.Level;
import java.util.logging.LogManager;
-import java.util.logging.Logger;
import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.Processor;
@@ -54,95 +42,69 @@
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import javax.tools.Diagnostic;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
-import javax.tools.JavaCompiler.CompilationTask;
-import javax.tools.JavaFileObject.Kind;
import org.easymock.Capture;
import org.easymock.CaptureType;
-import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.richfaces.cdk.CdkContext;
-import org.richfaces.cdk.LoggerFactory;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Component;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.InvalidNameException;
-import org.richfaces.cdk.model.Property;
-import org.richfaces.cdk.util.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
*
* @author asmirnov(a)exadel.com
*
*/
-public class ProcessorTest {
-
+public class ProcessorTest {
+
private static final String ANNOTATION2 = TestAnnotation2.class.getName();
- @SupportedAnnotationTypes(Component.NAME)
- @SupportedSourceVersion(SourceVersion.RELEASE_6)
- private final class TestProcessor extends CdkProcessor {
-
- ComponentLibrary library;
-
- private int numOfComponents;
+ private static abstract class TestProcessor extends CdkProcessor {
+ protected ComponentLibrary library;
+
+ protected int numOfComponents;
+
public TestProcessor(CdkContext context) {
super(context);
}
-
+
@Override
public synchronized void init(ProcessingEnvironment processingEnv) {
super.init(processingEnv);
}
-
+
@Override
public synchronized boolean isInitialized() {
return super.isInitialized();
}
@Override
- public boolean process(Set<? extends TypeElement> annotations,
- RoundEnvironment roundEnv) {
- return false;
+ public Set<String> getSupportedAnnotationTypes() {
+ // Process all annotations
+ return ImmutableSet.of("*");
}
-
}
private static final String INTERFACE_JAVA = "org/richfaces/cdk/apt/TestInterface.java";
private static final String SUB_CLASS_JAVA = "org/richfaces/cdk/apt/TestSubClass.java";
private static final String CLASS_JAVA = "org/richfaces/cdk/apt/TestClass.java";
- private static final ImmutableSet<String> PROCESS_ANNOTATIONS = ImmutableSet.of(TestAnnotation.class.getName());
+ private static final ImmutableSet<String> PROCESS_ANNOTATIONS = ImmutableSet
+ .of(TestAnnotation.class.getName());
private static final String COMPONENT_CLASS_JAVA = "org/richfaces/cdk/test/component/AbstractTestComponent.java";
-
+
private File testSourceDirectory;
private ClassLoader testLoader;
@@ -186,21 +148,28 @@
expect(cdkContext.getJavaSource()).andStubReturn(testSourceDirectory);
expect(cdkContext.getJavaSourceOutput()).andStubReturn(null);
expect(cdkContext.getResourceOutput()).andStubReturn(null);
- expect(cdkContext.getLoader()).andStubReturn(TestAnnotation.class.getClassLoader());
+ expect(cdkContext.getLoader()).andStubReturn(
+ TestAnnotation.class.getClassLoader());
replay(cdkContext);
Processor processor = createMock(Processor.class);
processor.init((ProcessingEnvironment) anyObject());
- expect(processor.getSupportedOptions()).andReturn(ImmutableSet.<String>of());
-// processor.process(null,null);
+ expect(processor.getSupportedOptions()).andReturn(
+ ImmutableSet.<String> of());
+ // processor.process(null,null);
Capture<Set<? extends TypeElement>> capturedTypes = new Capture<Set<? extends TypeElement>>();
- expect(processor.process(capture(capturedTypes), capture(new Capture<RoundEnvironment>()))).andReturn(true).times(2);
- expect(processor.getSupportedAnnotationTypes()).andReturn(ImmutableSet.of(TestAnnotation.class.getName()));
- expect(processor.getSupportedSourceVersion()).andReturn(SourceVersion.RELEASE_6);
+ expect(
+ processor.process(capture(capturedTypes),
+ capture(new Capture<RoundEnvironment>()))).andReturn(
+ true).times(2);
+ expect(processor.getSupportedAnnotationTypes()).andReturn(
+ ImmutableSet.of(TestAnnotation.class.getName()));
+ expect(processor.getSupportedSourceVersion()).andReturn(
+ SourceVersion.RELEASE_6);
replay(processor);
CdkCompiler compiler = CdkCompiler.create(cdkContext);
compiler.process(ImmutableList.of(getJavaFile(CLASS_JAVA)), processor);
- verify(cdkContext,processor);
+ verify(cdkContext, processor);
}
/**
@@ -215,56 +184,124 @@
// Prepare Mock compilation context.
CdkContext cdkContext = createMock(CdkContext.class);
expect(cdkContext.getJavaSource()).andStubReturn(testSourceDirectory);
- expect(cdkContext.getJavaSourceOutput()).andStubReturn( null);
+ expect(cdkContext.getJavaSourceOutput()).andStubReturn(null);
expect(cdkContext.getResourceOutput()).andStubReturn(null);
- expect(cdkContext.getLoader()).andStubReturn(TestAnnotation2.class.getClassLoader());
+ expect(cdkContext.getLoader()).andStubReturn(
+ TestAnnotation2.class.getClassLoader());
replay(cdkContext);
Processor processor = createMock(Processor.class);
processor.init((ProcessingEnvironment) anyObject());
- expect(processor.getSupportedOptions()).andReturn(ImmutableSet.<String>of());
-// processor.process(null,null);
- Capture<Set<? extends TypeElement>> capturedTypes = new Capture<Set<? extends TypeElement>>(CaptureType.FIRST);
- expect(processor.process(capture(capturedTypes), capture(new Capture<RoundEnvironment>()))).andReturn(true).times(2);
- expect(processor.getSupportedAnnotationTypes()).andReturn(ImmutableSet.of(TestAnnotation2.class.getName()));
- expect(processor.getSupportedSourceVersion()).andReturn(SourceVersion.RELEASE_6);
+ expect(processor.getSupportedOptions()).andReturn(
+ ImmutableSet.<String> of());
+ // processor.process(null,null);
+ Capture<Set<? extends TypeElement>> capturedTypes = new Capture<Set<? extends TypeElement>>(
+ CaptureType.FIRST);
+ expect(
+ processor.process(capture(capturedTypes),
+ capture(new Capture<RoundEnvironment>()))).andReturn(
+ true).times(2);
+ expect(processor.getSupportedAnnotationTypes()).andReturn(
+ ImmutableSet.of(TestAnnotation2.class.getName()));
+ expect(processor.getSupportedSourceVersion()).andReturn(
+ SourceVersion.RELEASE_6);
replay(processor);
CdkCompiler compiler = CdkCompiler.create(cdkContext);
- compiler.process(ImmutableList.of(getJavaFile(SUB_CLASS_JAVA),getJavaFile(CLASS_JAVA)), processor);
- verify(cdkContext,processor);
+ compiler.process(ImmutableList.of(getJavaFile(SUB_CLASS_JAVA),
+ getJavaFile(CLASS_JAVA)), processor);
+ verify(cdkContext, processor);
Set<? extends TypeElement> elements = capturedTypes.getValue();
assertFalse(elements.isEmpty());
- assertEquals("TestAnnotation2", elements.iterator().next().getSimpleName().toString());
+ assertEquals("TestAnnotation2", elements.iterator().next()
+ .getSimpleName().toString());
}
/**
* Test method for
- * {@link org.richfaces.cdk.apt.CdkProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)}
+ * {@link org.richfaces.cdk.apt.CdkProcessor#getClassesAnnotatedWith(Class, RoundEnvironment)}
* .
*
* @throws Exception
*/
@Test
- public void testCDKProcessor() throws Exception {
+ public void testGetClassesAnnotatedWith() throws Exception {
// Prepare Mock compilation context.
CdkContext cdkContext = createMock(CdkContext.class);
expect(cdkContext.getJavaSource()).andStubReturn(testSourceDirectory);
expect(cdkContext.getJavaSourceOutput()).andStubReturn(null);
expect(cdkContext.getResourceOutput()).andStubReturn(null);
- expect(cdkContext.getLoader()).andStubReturn(TestAnnotation2.class.getClassLoader());
+ expect(cdkContext.getLoader()).andStubReturn(
+ TestAnnotation2.class.getClassLoader());
replay(cdkContext);
- TestProcessor processor = new TestProcessor(cdkContext);
- ComponentLibrary library = new ComponentLibrary("org.richfaces.cdk.test");
- processor.library = library;
+ TestProcessor processor = new TestProcessor(cdkContext) {
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ if (!roundEnv.processingOver()) {
+ this.numOfComponents = getClassesAnnotatedWith(
+ Component.class, roundEnv).size();
+
+ }
+ return true;
+ }
+ };
+ // ComponentLibrary library = new
+ // ComponentLibrary("org.richfaces.cdk.test");
+ // processor.library = library;
CdkCompiler compiler = CdkCompiler.create(cdkContext);
- compiler.process(ImmutableList.of(getJavaFile(COMPONENT_CLASS_JAVA)), processor);
+ compiler.process(ImmutableList.of(getJavaFile(COMPONENT_CLASS_JAVA)),
+ processor);
verify(cdkContext);
- assertTrue(processor.isInitialized());
+ assertTrue(processor.isInitialized());
+ assertEquals(1, processor.numOfComponents);
}
-
+
/**
- * <p class="changed_added_4_0"></p>
+ * Test method for
+ * {@link org.richfaces.cdk.apt.CdkProcessor#getClassesAnnotatedWith(Class, RoundEnvironment)}
+ * .
*
+ * @throws Exception
+ */
+ @Test
+ public void testGetPropertiesAnnotatedWith() throws Exception {
+ // Prepare Mock compilation context.
+ CdkContext cdkContext = createMock(CdkContext.class);
+ expect(cdkContext.getJavaSource()).andStubReturn(testSourceDirectory);
+ expect(cdkContext.getJavaSourceOutput()).andStubReturn(null);
+ expect(cdkContext.getResourceOutput()).andStubReturn(null);
+ expect(cdkContext.getLoader()).andStubReturn(
+ TestAnnotation2.class.getClassLoader());
+ replay(cdkContext);
+ TestProcessor processor = new TestProcessor(cdkContext) {
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ if (!roundEnv.processingOver()) {
+ TypeElement typeElement = getClassesAnnotatedWith(
+ Component.class, roundEnv).iterator().next();
+ Set<BeanProperty> beanProperties = getBeanPropertiesAnnotatedWith(Attribute.class, typeElement);
+ assertEquals(1, beanProperties.size());
+ assertEquals("testValue", beanProperties.iterator().next().getName());
+ numOfComponents++;
+ }
+ return true;
+ }
+ };
+ // ComponentLibrary library = new
+ // ComponentLibrary("org.richfaces.cdk.test");
+ // processor.library = library;
+ CdkCompiler compiler = CdkCompiler.create(cdkContext);
+ compiler.process(ImmutableList.of(getJavaFile(COMPONENT_CLASS_JAVA)),
+ processor);
+ verify(cdkContext);
+ assertTrue(processor.isInitialized());
+ assertEquals(1, processor.numOfComponents);
+ }
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @param name
* TODO
* @return
@@ -273,7 +310,8 @@
private JavaFileObject getJavaFileObject(String name)
throws URISyntaxException {
final File classFile = getJavaFile(name);
- SimpleJavaFileObject fileObject = new VirtualJavaFileSystemObject(classFile);
+ SimpleJavaFileObject fileObject = new VirtualJavaFileSystemObject(
+ classFile);
return fileObject;
}
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15153 - tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-08-10 13:48:55 -0400 (Mon, 10 Aug 2009)
New Revision: 15153
Modified:
tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java
Log:
change SVN revision and date
Modified: tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-08-10 17:41:11 UTC (rev 15152)
+++ tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-08-10 17:48:55 UTC (rev 15153)
@@ -35,7 +35,7 @@
public static final String PROJECT_NAME = "Jboss Richfaces";
/**
- * Revision version, must be auto modified by CVS
+ * Revision version, must be auto modified by CVS
*/
public static final String REVISION = "2.CR1" ;
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15152 - tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-08-10 13:41:11 -0400 (Mon, 10 Aug 2009)
New Revision: 15152
Modified:
tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java
Log:
change SVN revision and date
Modified: tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-08-10 16:41:24 UTC (rev 15151)
+++ tags/3.3.2.CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-08-10 17:41:11 UTC (rev 15152)
@@ -35,11 +35,11 @@
public static final String PROJECT_NAME = "Jboss Richfaces";
/**
- * Revision version, must be auto modified by CVS
+ * Revision version, must be auto modified by CVS
*/
public static final String REVISION = "2.CR1" ;
- public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$";
+ public static final String SCM_REVISION = " SVN $Revision$ $Date:) $";//$Revision$ $Date$";
public static final Version _version = new Version();
public String getVendor() {
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15151 - in tags/3.3.2.CR1/docs: cdkguide/en/src/main/docbook/includes and 11 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-08-10 12:41:24 -0400 (Mon, 10 Aug 2009)
New Revision: 15151
Removed:
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/resources/images/giagram.png
Modified:
tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/includes/skin.xml
tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/master.xml
tags/3.3.2.CR1/docs/common-resources/en/src/main/xslt/pdf-common.xsl
tags/3.3.2.CR1/docs/faq/en/src/main/docbook/module/RFCfaq.xml
tags/3.3.2.CR1/docs/migrationguide/en/src/main/docbook/master.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/a4j_status.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/navigationPanel.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/skinnability.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/usedComponents.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/validators.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/master.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/getting_started.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/intro.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml
tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/resources/images/erd.png
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/ajaxListener.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/calendar.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/componentControl.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/contextMenu.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/datascroller.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dragListener.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dropListener.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/fileUpload.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/modalPanel.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/tree.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/master.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
tags/3.3.2.CR1/docs/userguide/en/src/main/resources/images/componentControl_init.png
Log:
https://jira.jboss.org/jira/browse/RF-7639 docs are merged
Modified: tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/includes/skin.xml
===================================================================
--- tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/includes/skin.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/includes/skin.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -15,7 +15,7 @@
RichFaces has a number of predefined skins you could use wtih the <emphasis role="bold"><property><inputDate></property></emphasis> component.
But if you want to create your own skin, please, read carefully
the <property>"Skinnability"</property> section of the
- <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">RichFaces Developer Guide</ulink>. You could find all neccesary information about
+ <ulink url="&devguide;/#Skinnability">RichFaces Developer Guide</ulink>. You could find all neccesary information about
<property>Built-in skinnability in RichFaces</property>, <property>XCSS file format</property>, <property>Plug-n-Skin feature</property>, etc. there.
</para>
<para>
Modified: tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/master.xml
===================================================================
--- tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/master.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/cdkguide/en/src/main/docbook/master.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -45,6 +45,16 @@
<!ENTITY jspscriptlet SYSTEM "tags/jspscriptlettag.xml">
<!ENTITY jspdirectivepage SYSTEM "tags/jspdirectivepage.xml">
<!ENTITY jspdeclaration SYSTEM "tags/jspdeclaration.xml">
+
+<!ENTITY cdkguide "../../cdkguide/html_single/index.html">
+<!ENTITY devguide "../../devguide//html_single/index.html">
+<!ENTITY migrationguide "../../migrationguide/html_single/index.html">
+<!ENTITY photoalbumguide "../../realworld/html_single/index.html">
+<!ENTITY realworld "../../realworld/html_single/index.html">
+<!ENTITY tlddoc "../../tlddoc/index.html">
+<!ENTITY apidoc "../../apidoc/index.html">
+<!ENTITY apidoc_framework "../../apidoc_framework/index.html">
+
]>
<book>
@@ -73,7 +83,7 @@
<abstract>
<title/>
<para>
- <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">PDF version</ulink>
+ <ulink url="../../cdkguide/en/pdf/CDK_Developer_Guide.pdf">PDF version</ulink>
</para>
</abstract>
Modified: tags/3.3.2.CR1/docs/common-resources/en/src/main/xslt/pdf-common.xsl
===================================================================
--- tags/3.3.2.CR1/docs/common-resources/en/src/main/xslt/pdf-common.xsl 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/common-resources/en/src/main/xslt/pdf-common.xsl 2009-08-10 16:41:24 UTC (rev 15151)
@@ -6,8 +6,8 @@
xmlns:jbh="java:org.jboss.highlight.renderer.FORenderer"
exclude-result-prefixes="jbh">
-<xsl:import href="classpath:/xslt/org/jboss/pdf.xsl" />
-
+<xsl:import href="classpath:/xslt/org/jboss/pdf.xsl" />
+
<xsl:attribute-set name="book.titlepage.recto.style">
<xsl:attribute name="font-family">
<xsl:value-of select="$title.fontset"/>
@@ -17,64 +17,156 @@
<xsl:attribute name="font-size">12pt</xsl:attribute>
<xsl:attribute name="text-align">center</xsl:attribute>
</xsl:attribute-set>
-
-<xsl:template name="toc.line">
- <xsl:param name="toc-context" select="NOTANODE"/>
- <xsl:variable name="id">
- <xsl:call-template name="object.id"/>
- </xsl:variable>
-
- <xsl:variable name="label">
- <xsl:apply-templates select="." mode="label.markup"/>
- </xsl:variable>
-
- <fo:block xsl:use-attribute-sets="toc.line.properties">
- <fo:inline keep-with-next.within-line="always">
-
- <fo:basic-link internal-destination="{$id}">
- <xsl:if test="$label != ''">
- <xsl:copy-of select="$label"/>
- <xsl:value-of select="$autotoc.label.separator"/>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="self::section/title/emphasis[@role='since']">
- <xsl:variable name="titleWithoutEmphasis">
- <xsl:copy-of select="self::section/title/text()" />
- </xsl:variable>
- <xsl:apply-templates select="$titleWithoutEmphasis" mode="title.markup"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="." mode="title.markup"/>
- </xsl:otherwise>
- </xsl:choose>
- </fo:basic-link>
- </fo:inline>
- <fo:inline keep-together.within-line="always">
- <xsl:text> </xsl:text>
- <fo:leader leader-pattern="dots"
- leader-pattern-width="3pt"
- leader-alignment="reference-area"
- keep-with-next.within-line="always"/>
- <xsl:text> </xsl:text>
- <fo:basic-link internal-destination="{$id}">
- <fo:page-number-citation ref-id="{$id}"/>
- </fo:basic-link>
- </fo:inline>
- </fo:block>
-</xsl:template>
-
-<!-- avoid bulk HTML elements generation in the PDF table -->
-<xsl:template match="//emphasis[@role='arrowWrapper']" />
-<xsl:template match="//emphasis[@role='descriptionWrapper']">
- <xsl:value-of select="." />
-</xsl:template>
-<xsl:template match="//emphasis[@role='since']">
- <fo:inline font-size="75%" vertical-align="super">
- <xsl:value-of select="." />
- </fo:inline>
-</xsl:template>
-
-
+
+<xsl:template name="toc.line">
+ <xsl:param name="toc-context" select="NOTANODE"/>
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+
+ <fo:block xsl:use-attribute-sets="toc.line.properties">
+ <fo:inline keep-with-next.within-line="always">
+
+ <fo:basic-link internal-destination="{$id}">
+ <xsl:if test="$label != ''">
+ <xsl:copy-of select="$label"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="self::section/title/emphasis[@role='since']">
+ <xsl:variable name="titleWithoutEmphasis">
+ <xsl:copy-of select="self::section/title/text()" />
+ </xsl:variable>
+ <xsl:apply-templates select="$titleWithoutEmphasis" mode="title.markup"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="." mode="title.markup"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </fo:basic-link>
+ </fo:inline>
+ <fo:inline keep-together.within-line="always">
+ <xsl:text> </xsl:text>
+ <fo:leader leader-pattern="dots"
+ leader-pattern-width="3pt"
+ leader-alignment="reference-area"
+ keep-with-next.within-line="always"/>
+ <xsl:text> </xsl:text>
+ <fo:basic-link internal-destination="{$id}">
+ <fo:page-number-citation ref-id="{$id}"/>
+ </fo:basic-link>
+ </fo:inline>
+ </fo:block>
+</xsl:template>
+
+<!-- avoid bulk HTML elements generation in the PDF table -->
+<xsl:template match="//emphasis[@role='arrowWrapper']" />
+<xsl:template match="//emphasis[@role='descriptionWrapper']">
+ <xsl:value-of select="." />
+</xsl:template>
+<xsl:template match="//emphasis[@role='since']">
+ <fo:inline font-size="75%" vertical-align="super">
+ <xsl:value-of select="." />
+ </fo:inline>
+</xsl:template>
+
+
+ <xsl:attribute-set name="header.content.properties">
+ <xsl:attribute name="font-family">Helvetica</xsl:attribute>
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+
+ </xsl:attribute-set>
+
+ <xsl:template name="header.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+ <fo:block>
+ <!-- sequence can be odd, even, first, blank
+ position can be left, center, right-->
+ <xsl:choose>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'center'">
+ <xsl:call-template name="draft.text"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'center'">
+ <xsl:call-template name="draft.text"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'center'">
+ <xsl:value-of
+ select="ancestor-or-self::book/bookinfo/corpauthor"/>
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'left'">
+ <fo:page-number/>
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'center'">
+ <xsl:text>This page intentionally left blank</xsl:text>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'right'">
+ </xsl:when>
+
+ </xsl:choose>
+ </fo:block>
+ </xsl:template>
+
+ <xsl:template name="footer.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+
+ <fo:block>
+ <!-- pageclass can be front, body, back -->
+ <!-- sequence can be odd, even, first, blank -->
+ <!-- position can be left, center, right -->
+ <xsl:choose>
+ <xsl:when test="($sequence = 'odd'or $sequence = 'even' or $sequence = 'blank' or $sequence = 'first') and $position = 'right'">
+ <fo:page-number/>
+ </xsl:when>
+ </xsl:choose>
+ </fo:block>
+ </xsl:template>
+
<!-- avoid page sequence to generate blank pages after even page numbers -->
<xsl:template name="force.page.count">
@@ -83,6 +175,7 @@
<xsl:text>no-force</xsl:text>
</xsl:template>
+
<!-- adding corpauthor entry to the titlepage -->
<xsl:template name="book.titlepage.recto">
@@ -167,4 +260,87 @@
<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
</fo:block>
</xsl:template>
+
+ <!--#################################remove column-width unspecified Warning########-->
+ <xsl:template name="generate.col">
+ <!-- generate the table-column for column countcol -->
+ <xsl:param name="countcol">1</xsl:param>
+ <xsl:param name="colspecs" select="./colspec"/>
+ <xsl:param name="count">1</xsl:param>
+ <xsl:param name="colnum">1</xsl:param>
+
+ <xsl:choose>
+ <xsl:when test="$count>count($colspecs)">
+ <fo:table-column column-number="{$countcol}" column-width="proportional-column-width(1)">
+ <xsl:variable name="colwidth">
+ <xsl:call-template name="calc.column.width"/>
+ </xsl:variable>
+ <xsl:if test="$colwidth != 'proportional-column-width(1)'">
+ <xsl:attribute name="column-width">
+ <xsl:value-of select="$colwidth"/>
+ </xsl:attribute>
+ </xsl:if>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
+
+ <xsl:variable name="colspec.colnum">
+ <xsl:choose>
+ <xsl:when test="$colspec/@colnum">
+ <xsl:value-of select="$colspec/@colnum"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$colnum"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="colspec.colwidth">
+ <xsl:choose>
+ <xsl:when test="$colspec/@colwidth">
+ <xsl:value-of select="$colspec/@colwidth"/>
+ </xsl:when>
+ <xsl:otherwise>1*</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test="$colspec.colnum=$countcol">
+ <fo:table-column column-number="{$countcol}" column-width="proportional-column-width(1)">
+ <xsl:variable name="colwidth">
+ <xsl:call-template name="calc.column.width">
+ <xsl:with-param name="colwidth">
+ <xsl:value-of select="$colspec.colwidth"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:if test="$colwidth != 'proportional-column-width(1)'">
+ <xsl:attribute name="column-width">
+ <xsl:value-of select="$colwidth"/>
+ </xsl:attribute>
+ </xsl:if>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="generate.col">
+ <xsl:with-param name="countcol" select="$countcol"/>
+ <xsl:with-param name="colspecs" select="$colspecs"/>
+ <xsl:with-param name="count" select="$count+1"/>
+ <xsl:with-param name="colnum">
+ <xsl:choose>
+ <xsl:when test="$colspec/@colnum">
+ <xsl:value-of select="$colspec/@colnum + 1"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$colnum + 1"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
</xsl:stylesheet>
Modified: tags/3.3.2.CR1/docs/faq/en/src/main/docbook/module/RFCfaq.xml
===================================================================
--- tags/3.3.2.CR1/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -2662,7 +2662,7 @@
...]]></programlisting>
<para>
For the detailed description see
- the <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Request Errors and Session Expiration Handling</ulink> section of the Developer Guide.
+ the <ulink url="&devguide;/#RequestErrorsAndSessionExpirationHandling">Request Errors and Session Expiration Handling</ulink> section of the Developer Guide.
</para>
</listitem>
</itemizedlist>
Modified: tags/3.3.2.CR1/docs/migrationguide/en/src/main/docbook/master.xml
===================================================================
--- tags/3.3.2.CR1/docs/migrationguide/en/src/main/docbook/master.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/migrationguide/en/src/main/docbook/master.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -27,6 +27,15 @@
<!ENTITY dataTableAjax SYSTEM "included/dataTableAjax.xml">
+ <!ENTITY cdkguide "../../cdkguide/html_single/index.html">
+ <!ENTITY devguide "../../devguide//html_single/index.html">
+ <!ENTITY migrationguide "../../migrationguide/html_single/index.html">
+ <!ENTITY photoalbumguide "../../realworld/html_single/index.html">
+ <!ENTITY realworld "../../realworld/html_single/index.html">
+ <!ENTITY tlddoc "../../tlddoc/index.html">
+ <!ENTITY apidoc "../../apidoc/index.html">
+ <!ENTITY apidoc_framework "../../apidoc_framework/index.html">
+
]>
<book>
<bookinfo>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/a4j_status.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/a4j_status.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/a4j_status.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -70,6 +70,6 @@
</para>
<para>
- If you would like to get more details about the <emphasis role="bold"><property><a4j:status></property></emphasis> please visit <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/status.jsf?c=status">Live Demo</ulink> web page and <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">RichFaces Developer Guide</ulink>.
+ If you would like to get more details about the <emphasis role="bold"><property><a4j:status></property></emphasis> please visit <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/status.jsf?c=status">Live Demo</ulink> web page and <ulink url="&devguide;/#a4j_status">RichFaces Developer Guide</ulink>.
</para>
</section>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/navigationPanel.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/navigationPanel.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/navigationPanel.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -4,7 +4,7 @@
<title>Navigation tree</title>
<para>
The <emphasis role="bold"><property><rich:tree></property></emphasis> component takes one of the main places
- in the <property>Photo Album</property> and is tightly bounded with the application logic.
+ in the <property>Photo Album</property> and is tightly bound with the application logic.
It helps to represent
and implement inherently the "Shelves - Albums" hierarchy.
Shelf is the highest possible level in the tree hierarchy, that
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/skinnability.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/skinnability.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/skinnability.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<section id="skinnability" xreflabel="skinnability">
<?dbhtml filename="skinnability.html"?>
- <title>Skinnability TBR</title>
+ <title>Skinnability</title>
<para>
The Photo Album application employs such feature of RichFaces framework as skinnability. If you have a look at the web.xml you will see that the <code>
@@ -41,6 +41,6 @@
...]]></programlisting>
<para>
- You can find more information about the Skinnability feature in <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">RichFaces Developer Guide</ulink>.
+ You can find more information about the Skinnability feature in <ulink url="&devguide;/#Skinnability">RichFaces Developer Guide</ulink>.
</para>
</section>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/usedComponents.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/usedComponents.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/usedComponents.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -3,7 +3,7 @@
<?dbhtml filename="usedComponents.html"?>
<title>Used Components</title>
<para>
- Below there is a list of components used in <property>Photo Album</property>.
+ Have a look at the list of components used in the <property>Photo Album</property> application.
</para>
<table>
<title>Components used in "Photo Album Demo"</title>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/validators.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/validators.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/includes/validators.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -63,7 +63,7 @@
</para>
<para>
- If you would like to get more details about the validators that RichFaces library provides please visit <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/ajaxValidator.jsf">Live Demo</ulink> web page and <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..." >RichFaces Developer Guide</ulink>.
+ If you would like to get more details about the validators that RichFaces library provides please visit <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/ajaxValidator.jsf">Live Demo</ulink> web page and <ulink url="&devguide;" >RichFaces Developer Guide</ulink>.
</para>
</section>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/master.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/master.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/master.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -14,7 +14,6 @@
<!ENTITY shelfView SYSTEM "includes/shelfView.xml">
<!ENTITY albumView SYSTEM "includes/albumView.xml">
<!ENTITY errorsReports SYSTEM "includes/errorsReports.xml">
- <!ENTITY userPreferencesView SYSTEM "includes/userPreferencesView.xml">
<!ENTITY imageView SYSTEM "includes/imageView.xml">
<!ENTITY contextMenu SYSTEM "includes/contextMenu.xml">
<!ENTITY tooltips SYSTEM "includes/tooltips.xml">
@@ -22,6 +21,15 @@
<!ENTITY validators SYSTEM "includes/validators.xml">
<!ENTITY button SYSTEM "includes/button.xml">
<!ENTITY a4j_status SYSTEM "includes/a4j_status.xml">
+
+ <!ENTITY cdkguide "../../cdkguide/html_single/index.html">
+ <!ENTITY devguide "../../devguide/html_single/index.html">
+ <!ENTITY migrationguide "../../migrationguide/html_single/index.html">
+ <!ENTITY photoalbumguide "../../realworld/html_single/index.html">
+ <!ENTITY realworld "../../realworld/html_single/index.html">
+ <!ENTITY tlddoc "../../tlddoc/index.html">
+ <!ENTITY apidoc "../../apidoc/index.html">
+ <!ENTITY apidoc_framework "../../apidoc_framework/index.html">
]>
@@ -67,7 +75,7 @@
<!--<abstract>
<title/>
<para>
- <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">PDF version</ulink>
+ <ulink url="../../migrationguide/pdf/richfaces_migration_guide.pdf">PDF version</ulink>
</para>
</abstract> -->
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/getting_started.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -12,7 +12,7 @@
<title>Environment Configuration</title>
<para>
In order to download, build, modify, and deploy the Photo Album application
- you need the following installed and configured:
+ you need to have the following installed and configured:
</para>
<itemizedlist>
<listitem>
@@ -67,7 +67,7 @@
</listitem>
<listitem>
<para>
- <emphasis>Import the project into your IDE</emphasis>.
+ <emphasis>Import the project into Eclipse IDE</emphasis>.
You can just deploy Photo Album application onto the server, but
the convenient way is to import the project into your IDE.
We recommend Eclipse with JBoss Tools since this bundle is more preferable to
@@ -128,11 +128,11 @@
</tip>
</section>
<section>
- <title>Running Functional(Selenium) Tests</title>
+ <title>Running Functional(Selenium) Tests TBR</title>
<para>
- Before starting Selenium test please make sure that you have Firefox browser installed on your local machine and
- since the Photo Album application is designed to be deployed and run on JBoss Application server,
- so please make sure that the <jboss.installer.url> property of the project pom.xml (<code>examples/photoalbum/</code>) points to a existing JBoss Application server copy.
+ Before starting Selenium test please make sure that you have Firefox browser installed on your local machine, as
+ the Photo Album application is designed to be deployed and run on JBoss Application server,
+ so please make sure that the <jboss.installer.url> property of the project pom.xml (<code>examples/photoalbum/</code>) points to an existing JBoss Application server copy.
</para>
<para>
@@ -156,7 +156,7 @@
<section>
<title>Context Help</title>
<para>
- The Photo Album appellation was developed in the first place to demonstrate the mighty power of RichFaces thus most of UI elements in the application has a context help article that tells how a particular element works, providing technical details about it.
+ The Photo Album application was developed in the first place to demonstrate the mighty power of RichFaces thus most of UI elements in the application has a context help article that tells how a particular element works, providing technical details about it.
A context help article is displayed when you click on the question mark icon (
<inlinemediaobject>
<imageobject>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/intro.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/intro.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/intro.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -18,7 +18,7 @@
or shelves and shelves can not keep another shelves and can not be stored in albums.
</para>
<para>
- The Photo Album web application is designed and developed with RichFaces. This application demonstrates:
+ The Photo Album web application is designed and developed with RichFaces and by RichFaces team. This application demonstrates:
</para>
<itemizedlist>
<listitem>
@@ -36,7 +36,7 @@
<listitem>
<para>
<emphasis>Highly customizable look-and-feel</emphasis> - the <property>RichFaces</property> have special feature called
- <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Skinnability</ulink>.
+ <ulink url="&devguide;/#Skinnability">Skinnability</ulink>.
</para>
</listitem>
</itemizedlist>
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml
===================================================================
--- tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -7,12 +7,12 @@
</keywordset>
</chapterinfo>
- <title>Application Overview</title>
+ <title>Application Overview TBR</title>
<section id="pageFlows">
<title>Page flows</title>
<para>
- The page flow of the application is illustrated on the diagram.
+ The page flow of the application is illustrated in the diagram.
</para>
<figure>
<title>Page Flow diagram</title>
@@ -31,9 +31,8 @@
<section>
<title>Registering</title>
<para>
- Registering in is basically the first step a user takes in the application. Have a look at a piece of code from <code>\includes\index\</code>
- </para>
-
+ Registering in is basically the first step a user takes in the application if he/she wants to have access to all features of the application. Have a look at a piece of code from <code>\includes\index\index.xhtml</code>:
+ </para>
<programlisting role="XML"><![CDATA[...
<h:panelGroup rendered="#{!identity.loggedIn}" styleClass="top-right-bottom-menu-item-link" layout="block">
<h:form style="margin: 0px">
@@ -41,27 +40,36 @@
</h:form>
</h:panelGroup>
...]]></programlisting>
- <para>When the button is hit the <code>goToRegister</code> method is evoked and the <code>START_REGISTER_EVENT</code> is raised. These action display the registration form that is included from <code>\includes\register.xhtml</code>. </para>
+ <para>When the button is hit the <code>goToRegister</code> method of the <code>Authenticator</code> class is invoked and the <code>START_REGISTER_EVENT</code> is raised. These action display the registration form that is included from <code>\includes\register.xhtml</code>. </para>
-
+
<para>The <emphasis role="bold"><property><a4j:commandLink></property></emphasis> displays the link to the registration form and invokes the <code>goToRegister</code> method.
</para>
- <para>When all fields are filled out with correct values the <code>register(user)</code> is triggered and a new user is set. </para>
+ <para>When all fields are filled out with correct values the <code>authenticator.register(user)</code> is triggered and a new user object is declared. </para>
</section>
<section>
<title>Navigation Between Pages</title>
<para>
- Technically, user do not browse between pages of the application: every content page is included into the content area of <code>index.xhtml</code> file.
+ Technically, user does not browse between pages of the application: every content page is included into the content area of <code>index.xhtml</code> file after a certain action performed by user.
</para>
<programlisting role="XML"><![CDATA[...
<h:panelGroup styleClass="content_box" layout="block">
<ui:include src="#{model.mainArea.template}" />
</h:panelGroup>
...]]></programlisting>
+ <figure>
+ <title>Content Area</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/contentArea.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>
- The <code>NavigationEnum</code> class encapsulated all possible states, that can be applied to content area ("mainArea") on the page.
+ The <code>NavigationEnum</code> enumeration encapsulated all possible states, that can be applied to content area ("mainArea") on the page.
</para>
@@ -89,12 +97,14 @@
...
}
]]></programlisting>
+
<para>
This class specifies which file is included depending on some user action.
- The template to be loaded is identified according to some condition in a Controller (<code>Controllor.java</code>) method and is saved to the Model (<code>Model.java</code>). During <code>index.xhtml</code> page rendering the value is taken from the Model to define what should be rendered to the page.
- </para>
- </section>
+ The template to be loaded is identified according to some condition in the Controller
+ (<code>Controllor.java</code>) class and is saved to the Model (<code>Model.java</code>). During <code>index.xhtml</code> page rendering the value is taken from the Model to define what should be rendered to the page.
+ </para>
+ </section>
</section>
<section id="dataModel">
Modified: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/resources/images/erd.png
===================================================================
(Binary files differ)
Deleted: tags/3.3.2.CR1/docs/photo_album_app_guide/en/src/main/resources/images/giagram.png
===================================================================
(Binary files differ)
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/ajaxListener.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/ajaxListener.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/ajaxListener.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -87,7 +87,7 @@
<para>
The <emphasis><property>"type"</property></emphasis> attribute defines the fully qualified Java class name for the listener.
- This Java class implements <code><ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."><property>org.ajax4jsf.event.AjaxListener</property></ulink></code>interface, which is base interface for all listeners, capable for receiving Ajax events.
+ This Java class implements <code><ulink url="&apidoc_framework;/org/ajax4jsf/event/AjaxListener.html"><property>org.ajax4jsf.event.AjaxListener</property></ulink></code>interface, which is base interface for all listeners, capable for receiving Ajax events.
The source of the event could be accessed using the <code><ulink url="http://java.sun.com/j2se/1.4.2/docs/api/java/util/EventObject.html"><property>java.util.EventObject.getSource()</property></ulink></code> call.
</para>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/calendar.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/calendar.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -96,7 +96,7 @@
<listitem>
<para>
<code>ajax</code> — in this mode the <emphasis role="bold"><property><rich:calendar></property></emphasis> requests portions of data for element rendering from special Data Model.
- The default calendar Data Model could be redefined with the help of <emphasis><property>dataModel</property></emphasis> attribute that points to the object that implements <code><ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">CalendarDataModel</ulink></code> interface.
+ The default calendar Data Model could be redefined with the help of <emphasis><property>dataModel</property></emphasis> attribute that points to the object that implements <code><ulink url="&apidoc_framework;/org/richfaces/model/CalendarDataModel.html">CalendarDataModel</ulink></code> interface.
If <emphasis><property>"dataModel"</property></emphasis> attribute has <emphasis><property>"null"</property></emphasis> value, data requests are not sent.
In this case the "<code>ajax</code>" mode is equal to the "<code>client</code>".
</para>
@@ -581,7 +581,7 @@
<code>RICH_CALENDAR_CANCEL_LABEL </code> there. </para>
<para>You could also pack <code>org.richfaces.renderkit.calendar</code>
<ulink
- url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..."
+ url="&apidoc;/org/richfaces/renderkit/CalendarRendererBase.html#CALENDAR_BUNDLE"
>resource</ulink> bundle with your JARs defining the same
properties. </para>
<note>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -75,7 +75,7 @@
</para>
<para>
Attribute <emphasis><property>"type"</property></emphasis> defines the fully qualified Java class name for the listener.
- This class should implement <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."><code>org.richfaces.event.NodeExpandedListener</code></ulink>interface.
+ This class should implement <ulink url="&apidoc_framework;/org/richfaces/event/TreeListenerEventsProducer.html#addChangeExpandListener(org.richfaces.event.NodeExpandedListener)"><code>org.richfaces.event.NodeExpandedListener</code></ulink>interface.
</para>
<para>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/componentControl.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/componentControl.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/componentControl.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -58,10 +58,6 @@
<para>To create the simplest variant on a page use the following syntax:</para>
-
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
<programlisting role="XML"><![CDATA[...
<rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="Expand" />
...]]></programlisting>
@@ -81,73 +77,52 @@
-
-
-
<section>
<title>Details of Usage</title>
<para>
- <emphasis role="bold"><property><rich:componentControl></property></emphasis>
- is a command component, that allows to call JavaScript API function on some defined event.
- Look at the example:
- </para>
- <programlisting role="XML"><![CDATA[...
-<rich:componentControl attachTo="doExpandCalendarID" event="onclick" for="ccCalendarID" operation="Expand"/>
+ <emphasis role="bold"><property><rich:componentControl></property></emphasis> is a command component, that allows to call JavaScript API function on some defined event.
+ Look at the example:
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<rich:componentControl attachTo="doExpandCalendarID" event="onclick" operation="Expand" for="ccCalendarID" />
...
]]></programlisting>
<para>
- In other words it means "clicking on the component with ID 'doExpandCalendarID',
- expands the component with ID 'ccCalendarID'".
- It can be said, that <emphasis role="bold"><property><rich:componentControl></property></emphasis>
- connects two components with the help of JavaScript API function.
+ In other words it means "clicking on the component with ID <code>doExpandCalendarID</code> expands the component with ID <code>ccCalendarID</code>".
+ It can be said, that <emphasis role="bold"><property><rich:componentControl></property></emphasis> makes interact two components with the help of JavaScript API function.
</para>
<para>
- Component ID, to wich the event, that invokes JavaScript API function is applied,
- is defined with <emphasis><property>"attachTo"</property></emphasis> attribute
- (see the exapmle above).
- If <emphasis><property>"attachTo"</property></emphasis> attribute is not defined,
- the component will be attached to the parent component.
+ The ID of the component the event that invokes JavaScript API function is applied, is defined with <emphasis><property>"attachTo"</property></emphasis> attribute (see the exapmle above).
+ If <emphasis><property>"attachTo"</property></emphasis> attribute is not specified, the <emphasis role="bold"><property><rich:componentControl></property></emphasis> is supposed to be attached to it's parent.
</para>
+
+ <programlisting role="XML"><![CDATA[<h:commandButton value="Show Modal Panel">
+ <!--componentControl is attached to the commandButton-->
+ <rich:componentControl for="ccModalPanelID" event="onclick" operation="show"/>
+</h:commandButton>]]></programlisting>
<para>
- <emphasis role="bold">Example:</emphasis>
+ It is possible to invoke the <emphasis role="bold"><property><rich:componentControl></property></emphasis> handler operation as usual JavaScript function.
+ For this purpose it is necessary to specify the name of the JS function with the help of the <emphasis><property>"name"</property></emphasis> attribute:
</para>
- <programlisting role="XML"><![CDATA[...
-<h:commandButton value="Show Modal Panel">
- <rich:componentControl for="ccModalPanelID" event="onclick" operation="show"/> <!--attached to the commandButton-->
-</h:commandButton>
-...]]></programlisting>
- <para>
- On the result page the component is rendered to JavaScript code.
- This means, that it is possible to invoke the <emphasis role="bold"><property><rich:componentControl></property></emphasis>
- handler operation as usual JavaScript function.
- This function is called by name, specified in the component <emphasis><property>"name"</property></emphasis> attribute.
- The definition of <emphasis><property>"name"</property></emphasis> attribute is shown on the example below:
- </para>
- <programlisting role="XML"><![CDATA[...
-<rich:componentControl name="func" event="onRowClick" for="menu" operation="show" />
-...]]></programlisting>
- <para>
- The generated JavaScript function will look as shown below:
- </para>
- <programlisting role="text/javascript"><![CDATA[function func (event) {
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="text/javascript"><![CDATA[function func (event) {
}]]></programlisting>
+ <programlisting role="XML"><![CDATA[<rich:componentControl name="func" event="onRowClick" for="menu" operation="show" />]]></programlisting>
+
<para>
- An important <emphasis role="bold"><property><rich:componentControl></property></emphasis> feature,
- is that it allows transferring parameters, with the help of special attribute <emphasis><property>"params"</property></emphasis>.
+ An important <emphasis role="bold"><property><rich:componentControl></property></emphasis> feature, is that it allows transferring parameters, with the help of special attribute <emphasis><property>"params"</property></emphasis>:
</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+
<programlisting role="XML"><![CDATA[...
-<rich:componentControl name="func" event="onRowClick" for="menu" operation="show" params=”#{car.model}"/>
+<rich:componentControl name="func" event="onRowClick" for="menu" operation="show" params="#{car.model}"/>
...]]></programlisting>
<para>
The alternative way for parameters transferring uses <emphasis role="bold"><property><f:param></property></emphasis> attribute.
- As the code above, the following code will represent the same functionality.
+ As the code above, the following code will represent the same functionality:
</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+
<programlisting role="XML"><![CDATA[...
<rich:componentControl event="onRowClick" for="menu" operation="show">
<f:param value="#{car.model}" name="model"/>
@@ -264,17 +239,17 @@
<itemizedlist>
<listitem>
<para>
- "immediate" - attached during execution of <emphasis role="bold"><property><rich:componentControl></property></emphasis> script
+ <code>immediate</code> — attached during execution of <emphasis role="bold"><property><rich:componentControl></property></emphasis> script
</para>
</listitem>
<listitem>
<para>
- "onavailable" - attached after the target component is initialized
+ <code>onavailable</code> — attached after the target component is initialized
</para>
</listitem>
<listitem>
<para>
- "onload" - attached after the page is loaded
+ <code>onload</code> — attached after the page is loaded
</para>
</listitem>
</itemizedlist>
@@ -298,46 +273,29 @@
</emphasis>
</para>
- <para>In order to use <emphasis role="bold">
- <property><rich:componentControl></property>
- </emphasis> with another component you should place the id of this component into <emphasis>
- <property>"for"</property>
- </emphasis> attribute field. All operations with defined component you can find in the JavaScript API section of defined component.</para>
<para>
- <emphasis role="bold">Example:</emphasis>
+ In order to use <emphasis role="bold"><property><rich:componentControl></property></emphasis> with another component you should place the id of this component into <emphasis><property>"for"</property></emphasis> attribute field.
+ All operations with defined component you can find in the JavaScript API section of defined component.
</para>
- <programlisting role="XML"><![CDATA[...
-<f:view>
- <h:form>
- <br />
- <rich:toolTip id="toolTipFor" followMouse="false" direction="top-right" mode="ajax" value="This is button"
- horizontalOffset="5" verticalOffset="5" layout="block" />
- </h:form>
- <h:commandButton id="ButtonID" value="Button">
- <rich:componentControl for="toolTipFor" attachTo="ButtonID" operation="show" event="onclick"/>
- </h:commandButton>
-</f:view>
-...]]></programlisting>
+
+ <programlisting role="XML"><![CDATA[<h:form>
+ <rich:toolTip id="toolTip" mode="ajax" value="and then just touch me." direction="top-right" />
+</h:form>
+<h:commandButton id="ButtonID" value="Push me">
+ <rich:componentControl attachTo="ButtonID" event="onmouseover" operation="show" for="toolTip" />
+</h:commandButton>]]></programlisting>
<para>This is a result:</para>
<figure>
- <title><emphasis role="bold">
- <property><rich:toolTip></property>
- </emphasis> shows with the help of <emphasis role="bold">
- <property><rich:componentControl></property>
- </emphasis>.</title>
+ <title>
+ <emphasis role="bold"><property><rich:toolTip></property></emphasis> is shown with the help of <emphasis role="bold"><property><rich:componentControl></property></emphasis>.
+ </title>
<mediaobject>
<imageobject>
<imagedata fileref="images/componentControl_init.png"/>
</imageobject>
</mediaobject>
</figure>
-
- <para>
- As it could be seen in the picture above, the <emphasis role="bold">
- <property><rich:toolTip></property>
- </emphasis> shows after you click the button.
- </para>
-
+
<!--para>One more example of <emphasis role="bold">
<property><rich:componentControl></property>
</emphasis> usage is placed below:</para>
@@ -377,13 +335,11 @@
<section>
<title>Relevant Resources Links</title>
- <para><ulink
- url="http://livedemo.exadel.com/richfaces-demo/richfaces/componentControl.jsf?..."
- >On RichFaces LiveDemo page </ulink> you can see an example of <emphasis role="bold">
- <property><rich:componentControl></property>
- </emphasis> usage and sources for the given example. </para>
<para>
- <ulink url="http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/tlddocs/f/param.html">On RichFaces LiveDemo page </ulink> you can found some additional information about <emphasis role="bold"><property><f:param></property></emphasis> component.
+ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/componentControl.jsf?...">ComponentControl page</ulink> at RichFaces LiveDemo for examples of component usage and their sources.
+ </para>
+ <para>
+ Information on JSF <emphasis role="bold"><property><f:param></property></emphasis> component You can find at <ulink url="http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/tlddocs/f/param.html"><f:param> TLD reference</ulink> in Java Server Faces technology section at Sun portal.
</para>
</section>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/contextMenu.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/contextMenu.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/contextMenu.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -42,9 +42,7 @@
<section>
<title>Creating the Component with a Page Tag</title>
<para>To create the simplest variant on a page use the following syntax:</para>
- <programlisting role="XML"><![CDATA[...
-<rich:contextMenu event="oncontextmenu" attached="true">
-...]]></programlisting>
+ <programlisting role="XML"><![CDATA[<rich:contextMenu />]]></programlisting>
</section>
<section>
@@ -68,33 +66,20 @@
</emphasis> event by default to call a context menu by clicking on the right mouse
button.</para>
- <para><property>
- <link linkend="menuGroup"><rich:menuGroup></link>
- </property>, <property>
- <link linkend="menuItem"><rich:menuItem></link>
- </property> and <property>
- <link linkend="menuSeparator"><rich:menuSeparator></link>
- </property> components are used as nested elements for <emphasis role="bold">
- <property><rich:contextMenu></property>
- </emphasis>in the same way as for <emphasis role="bold">
- <property><rich:dropDownMenu></property>
- </emphasis>. </para>
- <para>
- By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> completely disables
- right mouse click on a page in the context menu area only.
- But if you want to disable browser's context menu completely you should set the
- <emphasis><property>"disableDefaultMenu"</property></emphasis> attribute value to "true".
- </para>
- <para>If <emphasis><property>"attached"</property></emphasis> value is "true" (default value),
- component is attached to the parent component or to the component, which
- <emphasis><property>"id"</property></emphasis> is specified in the
- <emphasis><property>"attachTo"</property></emphasis> attribute.
- </para>
<para>
- <emphasis role="bold">Example:</emphasis>
+ <property><link linkend="menuGroup"><rich:menuGroup></link></property>, <property><link linkend="menuItem"><rich:menuItem></link></property> and <property><link linkend="menuSeparator"><rich:menuSeparator></link></property> components
+ can be used as nested elements for <emphasis role="bold"><property><rich:contextMenu></property></emphasis>in the same way as for <emphasis role="bold"><property><rich:dropDownMenu></property></emphasis>.
</para>
- <programlisting role="XML"><![CDATA[...
-<rich:contextMenu event="oncontextmenu" attachTo="pic1" submitMode="none">
+ <para>
+ By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> disables right mouse click on a page in the context menu area only.
+ But if you want to disable browser's context menu completely you should set the <emphasis><property>"disableDefaultMenu"</property></emphasis> attribute value to "true".
+ </para>
+ <para>
+ If <emphasis><property>"attached"</property></emphasis> value is "true" (default value), component is attached to the parent component or to the component,
+ which <emphasis><property>"id"</property></emphasis> is specified in the <emphasis><property>"attachTo"</property></emphasis> attribute:
+ </para>
+
+ <programlisting role="XML"><![CDATA[<rich:contextMenu event="oncontextmenu" attachTo="pic1" submitMode="none">
<rich:menuItem value="Zoom In" onclick="enlarge();" id="zin"/>
<rich:menuItem value="Zoom Out" onclick="decrease();" id="zout"/>
</rich:contextMenu>
@@ -107,13 +92,11 @@
<h:panelGroup id="picture1">
<h:graphicImage value="/richfaces/jQuery/images/pic2.png" id="pic1"/>
</h:panelGroup>
-</h:panelGrid>
-...]]></programlisting>
+</h:panelGrid>]]></programlisting>
<para>The <code>"enlarge()"</code> and
<code>"decrease()"</code> functions definition is placed
below.</para>
- <programlisting role="JAVA"><![CDATA[...
-<script type="text/javascript">
+ <programlisting role="JAVA"><![CDATA[<script type="text/javascript">
function enlarge(){
document.getElementById('pic').width=document.getElementById('pic').width*1.1;
document.getElementById('pic').height=document.getElementById('pic').height*1.1;
@@ -122,8 +105,7 @@
document.getElementById('pic').width=document.getElementById('pic').width*0.9;
document.getElementById('pic').height=document.getElementById('pic').height*0.9;
}
-</script>
-...]]></programlisting>
+</script>]]></programlisting>
<para>In the example a picture zooming possibility with <emphasis role="bold">
<property><rich:contextMenu></property>
@@ -262,23 +244,19 @@
<itemizedlist>
<listitem>
- <para><code>Server</code> (default)</para>
+ <para><code>Server</code> — default value, uses regular form submition request;</para>
</listitem>
</itemizedlist>
- <para>Regular form submition request is used</para>
-
<itemizedlist>
<listitem>
- <para><code>Ajax</code></para>
+ <para><code>Ajax</code> — Ajax submission is used for switching;</para>
</listitem>
</itemizedlist>
- <para>Ajax submission is used for switching</para>
-
<itemizedlist>
<listitem>
- <para><code>None</code></para>
+ <para><code>None</code> — neither <code>Server</code> nor <code>Ajax</code> is used.</para>
</listitem>
</itemizedlist>
@@ -575,9 +553,6 @@
</emphasis> components on a page using CSS, it's enough to create classes with the
same names (possible classes could be found in the tables <link linkend="cMC"> above</link>) and define necessary properties in them. </para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
<programlisting role="CSS"><![CDATA[...
.rich-menu-item{
font-style:italic;
@@ -601,9 +576,6 @@
><property><rich:contextMenu></property></emphasis> component. In this case you should create own style classes and use them in corresponding <emphasis role="bold"
><property><rich:contextMenu></property></emphasis> <emphasis><property>styleClass</property></emphasis> attributes. An example is placed below:</para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
<programlisting role="CSS"><![CDATA[...
.myClass{
font-weight:bold;
@@ -611,10 +583,7 @@
...]]></programlisting>
<para>The <emphasis><property>"rowClasses"</property></emphasis> attribute for <emphasis role="bold"
><property><h:panelGrid> </property></emphasis> is defined as it's shown in the example below:</para>
-
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
+
<programlisting role="XML"><![CDATA[<h:panelGrid ... rowClasses="myClass"/>
]]></programlisting>
@@ -638,7 +607,7 @@
<section>
<title>Relevant Resources Links</title>
<para>
- Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/contextMenu.jsf?c=con...">ContextMenu page</ulink> at RichFaces LiveDemo fro examples of component usage and their sources.
+ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/contextMenu.jsf?c=con...">ContextMenu page</ulink> at RichFaces LiveDemo for examples of component usage and their sources.
</para>
</section>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/datascroller.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/datascroller.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -217,7 +217,7 @@
<property><rich:datascroller></property>
</emphasis> page links the input field rerenders and current page
number changes. </para>
- <para> This is a result: </para>
+ <para>The result should be like below: </para>
<figure>
<title>The <emphasis>
<property>"page"</property>
@@ -622,7 +622,7 @@
<row>
<entry>rich-dtascroller-table</entry>
<entry>Defines styles for a wrapper
- table element of a
+ <table> element of a
datascroller</entry>
</row>
<row>
@@ -763,7 +763,7 @@
<property><rich:dataTable></property>
</emphasis> and <emphasis role="bold">
<property><rich:datascroller></property>
- </emphasis> in a context of Extended Data Model see on the<ulink
+ </emphasis> in a context of Extended Data Model see on the <ulink
url="http://www.jboss.com/index.html?module=bb&op=viewtopic&t=115636"
>RichFaces Users Forum</ulink>.</para>
</section>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dragListener.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dragListener.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dragListener.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -104,7 +104,7 @@
This class should implement
<ulink
- url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">
+ url="&apidoc_framework;/org/richfaces/event/DropListener.html">
<code>org.richfaces.event.DropListener</code>
</ulink>
interface.
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dropListener.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dropListener.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/dropListener.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -103,7 +103,7 @@
defines the fully qualified Java class name for the
listener. This class should implement
<ulink
- url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">
+ url="&apidoc_framework;/org/richfaces/event/DropListener.html">
<code>org.richfaces.event.DropListener</code>
</ulink>
interface.
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/fileUpload.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -551,18 +551,18 @@
- <para> The <emphasis role="bold">
+ <!--para> The <emphasis role="bold">
<property><rich:fileUpload></property>
</emphasis> component could work together with Seam framework. <ulink
url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."
>On RichFaces LiveDemo page </ulink> you can see how to configure filter for this framework in web.xml file
in order to handle <emphasis role="bold">
<property><rich:fileUpload></property>
- </emphasis> requests. </para>
+ </emphasis> requests. </para-->
<para>To make <property><rich:fileUpload></property> component work properly
with MyFaces extensions, the order in which filters are defined and mapped in web.xml,
is important. See <ulink
- url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."
+ url="http://www.jboss.org/community/docs/DOC-13537"
>corresponding FAQ chapter</ulink>. </para>
</section>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -857,7 +857,7 @@
<property><rich:modalPanel></property>
</emphasis> component (the same could also be
found in the "<ulink
- url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."
+ url="http://www.jboss.org/community/wiki/PanelsandOutput#Organizewizards"
> How to organize wizards using the
<rich:modalPanel>
component?</ulink>" chapter of RichFaces
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -76,7 +76,7 @@
</para>
<para>
Attribute <emphasis><property>"type"</property></emphasis> defines the fully qualified Java class name for listener.
- This class should implement <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."> <code>org.richfaces.event.NodeSelectedListener</code></ulink>.
+ This class should implement <ulink url="&apidoc_framework;/org/richfaces/event/NodeSelectedListener.html"> <code>org.richfaces.event.NodeSelectedListener</code></ulink>.
interface</para>
<para>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -77,8 +77,8 @@
</emphasis> also has optional footer and header that could be
implemented using the corresponding facets. Columns of the table are
optionally resizable. Resizing is available using "drag and drop" of
- the column vertical borders. There is possibility to expand or
- collapse the columns through JS API on the client side. You can define
+ the column vertical borders. <!--There is possibility to expand or
+ collapse the columns through JS API on the client side. -->You can define
the number of the fixed columns from the left side using attribute <emphasis>
<property>"frozenColCount"</property>
</emphasis> that is not scrolled via horizontal scroll. </para>
@@ -103,14 +103,14 @@
</itemizedlist>
- <para> The columns provides the possibility of expanding/collapsing on the
+ <!--para> The columns provides the possibility of expanding/collapsing on the
client side through the next JS API:</para> <itemizedlist>
<listitem>
<para><code>collapse(columnId)</code> - Performs
the collapse action for the column with
the corresponding id</para>
</listitem>
- </itemizedlist>
+ </itemizedlist-->
<para> It's possible to sort the table content after
clicks on the header. The feature is optional (to disable it, use attribute sortable on rich:column ). Every column should be
pointed to the comparator method that is used for sorting the table.
@@ -150,7 +150,7 @@
<property>one and multi-selection rows mode</property>.</para>
<para>This attribute is a reference to object to the instance of
- <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."> <code>org.richfaces.model.selection.Selection</code></ulink>.
+ <ulink url="&apidoc_framework;/org/richfaces/model/selection/Selection.html"> <code>org.richfaces.model.selection.Selection</code></ulink>.
interface
@@ -296,7 +296,7 @@
</section>
- <section>
+ <!--section>
<title>JavaScript API</title>
<table>
<title>JavaScript API</title>
@@ -324,7 +324,7 @@
</tgroup>
</table>
- </section>
+ </section-->
<section>
<title>Facets</title>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/tree.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/included/tree.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -105,7 +105,7 @@
<property><rich:tree></property>
</emphasis> component interacts with data model via
<code>"TreeNode"</code> interface (<ulink
- url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..."
+ url="&apidoc_framework;/org/richfaces/model/TreeNode.html"
> org.richfaces.model.TreeNode </ulink>) that is used for
the <emphasis role="bold">
<property><rich:tree></property>
@@ -114,7 +114,7 @@
<code>"TreeNode"</code> interface or use a
default one, which is defined with a default class
<code>"TreeNodeImpl"</code> (<ulink
- url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..."
+ url="&apidoc_framework;/org/richfaces/model/TreeNodeImpl.html"
> org.richfaces.model.TreeNodeImpl </ulink>). </para>
<para> The <emphasis>
<property>"value"</property>
@@ -186,11 +186,11 @@
approach implies using a
<code>"XmlTreeDataBuilder"</code> class
(<ulink
- url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..."
+ url="&apidoc;/org/richfaces/component/xml/XmlTreeDataBuilder.html"
> org.richfaces.component.xml.XmlTreeDataBuilder </ulink>)
that allows to transform XML into structures of objects containing
<code>"XmlNodeData"</code> (<ulink
- url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..."
+ url="&apidoc_framework;/org/richfaces/component/xml/XmlNodeData.html"
> org.richfaces.component.xml.XmlNodeData </ulink>)
instances as data, which could be represented by the <emphasis
role="bold">
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/master.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/master.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/master.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -125,7 +125,17 @@
<!ENTITY rich_insert SYSTEM "../../../target/generated/rich_insert.xml">
<!ENTITY rich_message SYSTEM "../../../target/generated/rich_message.xml">
<!ENTITY rich_messages SYSTEM "../../../target/generated/rich_messages.xml">
- <!ENTITY rich_jQuery SYSTEM "../../../target/generated/rich_jQuery.xml">
+ <!ENTITY rich_jQuery SYSTEM "../../../target/generated/rich_jQuery.xml">
+
+ <!ENTITY cdkguide "../../cdkguide/html_single/index.html">
+ <!ENTITY devguide "../../devguide/html_single/index.html">
+ <!ENTITY migrationguide "../../migrationguide/html_single/index.html">
+ <!ENTITY photoalbumguide "../../realworld/html_single/index.html">
+ <!ENTITY realworld "../../realworld/html_single/index.html">
+ <!ENTITY tlddoc "../../tlddoc/index.html">
+ <!ENTITY apidoc "../../apidoc/index.html">
+ <!ENTITY apidoc_framework "../../apidoc_framework/index.html">
+
]>
<book>
<bookinfo>
@@ -153,7 +163,7 @@
</para>
</abstract>
<!--citebiblioid>
-<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">PDF version</ulink>.
+<ulink url="../../devguide/en/pdf/richfaces-usersguide.pdf">PDF version</ulink>.
</citebiblioid-->
</bookinfo>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -13,6 +13,10 @@
<title>Initialization Parameters</title>
<tgroup cols="3">
+ <colspec colnum="1" colwidth="2*"/>
+ <colspec colnum="2" colwidth="1*"/>
+ <colspec colnum="3" colwidth="2*"/>
+
<thead>
<row>
<entry>Name</entry>
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-08-10 15:43:40 UTC (rev 15150)
+++ tags/3.3.2.CR1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-08-10 16:41:24 UTC (rev 15151)
@@ -137,14 +137,13 @@
</itemizedlist>
<para> For more information about framework and libraries loading see the following section
in the <ulink
- url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."
- >FAQ</ulink>. </para>
+ url="http://www.jboss.org/community/wiki/Commonclientside#resourcesfromjars">FAQ</ulink>. </para>
<note>
<title>Note:</title>
<para> In order to prevent JavaScript versions conflict you should use only one version
of the framework or library. You could find more information about libraries
exclusion in the <ulink
- url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/..."
+ url="http://www.jboss.org/community/wiki/Commonclientside#jsconflicts"
>FAQ</ulink>. </para>
</note>
</section>
@@ -2263,6 +2262,8 @@
<title> Html Elements Skin Bindings for input, select, textarea, button, keygen,
isindex, legend </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2288,6 +2289,8 @@
<table>
<title> Html Elements Skin Bindings for fieldset </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2305,6 +2308,8 @@
<table>
<title>Html Elements Skin Bindings for hr</title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2322,6 +2327,8 @@
<table>
<title>Html Elements Skin Bindings for a</title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2339,6 +2346,8 @@
<table>
<title> Html Elements Skin Bindings for a:hover </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2356,6 +2365,8 @@
<table>
<title> Html Elements Skin Bindings for a:visited </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2374,6 +2385,8 @@
<title> Rich Elements Skin Bindings for .rich-input, .rich-select,
.rich-textarea, .rich-keygen, .rich-isindex, .rich-link </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2399,6 +2412,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-fieldset </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2416,6 +2431,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-hr </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2441,6 +2458,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-link </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2458,6 +2477,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-link:hover </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2475,6 +2496,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-link:visited </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2492,6 +2515,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-field </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2529,6 +2554,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-field-edit </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2558,6 +2585,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-field-error </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2600,6 +2629,8 @@
<title> Rich Elements Skin Bindings for .rich-button, .rich-button-disabled,
.rich-button-over </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2649,6 +2680,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-button-press </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2666,6 +2699,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-container fieldset, .rich-fieldset </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2699,6 +2734,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-legend </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2728,6 +2765,8 @@
<table>
<title> Rich Elements Skin Bindings for .rich-form </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS Properties</entry>
@@ -2754,6 +2793,8 @@
<title> Html Elements Skin Bindings for input, select, textarea, button, keygen,
isindex </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2779,6 +2820,8 @@
<table>
<title> Html Elements Skin Bindings for *|button </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2819,6 +2862,8 @@
button[type=submit], input[type=reset], input[type=submit],
input[type=button] </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2858,6 +2903,8 @@
<title> Html Elements Skin Bindings for *|button[disabled], .rich-container
*|button[disabled], .rich-button-disabled </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2898,6 +2945,8 @@
.rich-container input[type="button"][disabled],
.rich-input-button-disabled </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2935,6 +2984,8 @@
input[type="submit"][disabled],
input[type="button"][disabled] </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2960,6 +3011,8 @@
<table>
<title> Html Elements Skin Bindings for *|textarea </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -2999,6 +3052,8 @@
<title> Html Elements Skin Bindings for textarea[type=textarea],
input[type=text], input[type=password], select </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -3038,6 +3093,8 @@
<title> Html Elements Skin Bindings for *|textarea[disabled], .rich-container
*|textarea[disabled] </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -3057,6 +3114,8 @@
input[type="text"][disabled],
input[type="password"][disabled] </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -3076,6 +3135,8 @@
input[type="text"][disabled],
input[type="password"][disabled] </title>
<tgroup cols="2">
+ <colspec colnum="1" colwidth="1*"/>
+ <colspec colnum="2" colwidth="3*"/>
<thead>
<row>
<entry>CSS properties</entry>
@@ -3531,8 +3592,7 @@
input[type="button"]</code>. So, the CSS code should look like
this. </para>
<programlisting role="CSS"><![CDATA[
-button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"] {
- font-weight: bold;
+button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"] { font-weight: bold;
}]]></programlisting>
<para>All the changes that were planned to be preformed are done and now you can
proceed to building the new PlugnSkinDemo skin and import it into the project.
Modified: tags/3.3.2.CR1/docs/userguide/en/src/main/resources/images/componentControl_init.png
===================================================================
(Binary files differ)
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15150 - tags/3.3.2.CR1/examples/photoalbum/source/web/src/main/webapp/includes/index.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-08-10 11:43:40 -0400 (Mon, 10 Aug 2009)
New Revision: 15150
Modified:
tags/3.3.2.CR1/examples/photoalbum/source/web/src/main/webapp/includes/index/header.xhtml
Log:
link to guide changed
Modified: tags/3.3.2.CR1/examples/photoalbum/source/web/src/main/webapp/includes/index/header.xhtml
===================================================================
(Binary files differ)
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15149 - branches/community/3.3.X/test-applications/jsp/src/main/webapp/PickList.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-08-10 11:06:32 -0400 (Mon, 10 Aug 2009)
New Revision: 15149
Modified:
branches/community/3.3.X/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
Log:
pickList: exception after Process Validations phase after moving items to source list
https://jira.jboss.org/jira/browse/RF-7673
Modified: branches/community/3.3.X/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
===================================================================
--- branches/community/3.3.X/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2009-08-10 14:37:17 UTC (rev 15148)
+++ branches/community/3.3.X/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2009-08-10 15:06:32 UTC (rev 15149)
@@ -3,7 +3,8 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="pickListSubviewID">
- <rich:pickList id="pickListID" value="#{pickList.arrValue}"
+ <rich:pickList id="pickListID"
+ value="#{pickList.value}"
showButtonsLabel="#{pickList.showButtonLabels}"
valueChangeListener="#{pickList.valueChangeListener}"
controlClass="#{style.controlClass}"
@@ -40,7 +41,7 @@
<f:selectItems value="#{pickList.data}"/>
</rich:pickList>
<h:panelGrid columns="2">
- <a4j:commandButton value="refresh" reRender="pickListvalueCLID"></a4j:commandButton>
+ <a4j:commandButton value="refresh" reRender="pickListvalueCLID" ></a4j:commandButton>
<h:outputText id="pickListvalueCLID" value="#{pickList.valueCL}"></h:outputText>
</h:panelGrid>
</f:subview>
\ No newline at end of file
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15148 - in tags/3.3.2.CR1/samples/richfaces-demo/src/main: resources/org/richfaces/demo/common and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-08-10 10:37:17 -0400 (Mon, 10 Aug 2009)
New Revision: 15148
Modified:
tags/3.3.2.CR1/samples/richfaces-demo/src/main/java/org/richfaces/demo/extendeddatamodel/AuctionDataModel.java
tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/path.properties
tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml
Log:
links update merge
Modified: tags/3.3.2.CR1/samples/richfaces-demo/src/main/java/org/richfaces/demo/extendeddatamodel/AuctionDataModel.java
===================================================================
--- tags/3.3.2.CR1/samples/richfaces-demo/src/main/java/org/richfaces/demo/extendeddatamodel/AuctionDataModel.java 2009-08-10 12:28:57 UTC (rev 15147)
+++ tags/3.3.2.CR1/samples/richfaces-demo/src/main/java/org/richfaces/demo/extendeddatamodel/AuctionDataModel.java 2009-08-10 14:37:17 UTC (rev 15148)
@@ -62,7 +62,7 @@
int firstRow = ((SequenceRange)range).getFirstRow();
int numberOfRows = ((SequenceRange)range).getRows();
wrappedKeys = new ArrayList<Integer>();
- for (AuctionItem item:dataProvider.getItemsByrange(new Integer(firstRow), numberOfRows, null, true)) {
+ for (AuctionItem item:getDataProvider().getItemsByrange(new Integer(firstRow), numberOfRows, null, true)) {
wrappedKeys.add(item.getPk());
wrappedData.put(item.getPk(), item);
visitor.process(context, item.getPk(), argument);
Modified: tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-08-10 12:28:57 UTC (rev 15147)
+++ tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-08-10 14:37:17 UTC (rev 15148)
@@ -1,95 +1,95 @@
# list of components in comma-separated format
#id=name,iconImage,captionImage,devGuideLocation,tldDocLocation,javaDocLocation
-panel= richOutputs, Panel, /images/ico_panel.gif, /images/cn_panel.gif, panel.html, jbossrichfaces/freezone/docs/tlddoc/rich/panel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanel.html, /richfaces/panel.jsf
-separator= richOutputs, Separator, /images/ico_separator.gif, /images/cn_separator.gif, separator.html, jbossrichfaces/freezone/docs/tlddoc/rich/separator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISeparator.html, /richfaces/separator.jsf
-spacer= richOutputs, Spacer, /images/ico_spacer.gif, /images/cn_spacer.gif, spacer.html, jbossrichfaces/freezone/docs/tlddoc/rich/spacer.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISpacer.html, /richfaces/spacer.jsf
-tabPanel= richOutputs, Tab Panel, /images/ico_tabpanel.gif, /images/cn_tabpanel.gif, tabPanel.html, jbossrichfaces/freezone/docs/tlddoc/rich/tabPanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITabPanel.html, /richfaces/tabPanel.jsf
-inputNumberSlider= richInputs, Input Number Slider, /images/ico_DataFilterSlider.gif, /images/cn_slider.gif, inputNumberSlider.html, jbossrichfaces/freezone/docs/tlddoc/rich/inputNumberSlider.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInputNumberSlider.html, /richfaces/inputNumberSlider.jsf
-inputNumberSpinner= richInputs, Input Number Spinner, /images/ico_spinner.gif, /images/cn_spinner.gif, inputNumberSpinner.html, jbossrichfaces/freezone/docs/tlddoc/rich/inputNumberSpinner.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInputNumberSpinner.html, /richfaces/inputNumberSpinner.jsf
-dataFilterSlider= richDataIterators, Data Filter Slider, /images/ico_DataFilterSlider.gif, /images/cn_DataFilterSlider.gif, dataFilterSlider.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataFilterSlider.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataFltrSlider.html, /richfaces/dataFilterSlider.jsf
-dataTable=richDataIterators, Data Table, /images/ico_DataTable.gif, /images/cn_DataTable.gif, dataTable.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataTable.html, /richfaces/dataTable.jsf
-column= richDataIterators, Column, /images/ico_Column.gif, /images/cn_Column.gif, column.html, jbossrichfaces/freezone/docs/tlddoc/rich/column.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIColumn.html, /richfaces/dataTable.jsf
-columnGroup= richDataIterators, Column Group, /images/ico_ColumnGroup.gif, /images/cn_ColumnGroup.gif, columnGroup.html, jbossrichfaces/freezone/docs/tlddoc/rich/columnGroup.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIColumnGroup.html, /richfaces/dataTable.jsf
-dataDefinitionList= richDataIterators, Data Definition List, /images/ico_DataDefinitionList.gif, /images/cn_DataDefinitionList.gif, dataDefinitionList.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataDefinitionList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataDefinitionList.html, /richfaces/dataLists.jsf
-dataGrid= richDataIterators, Data Grid, /images/ico_DataGrid.gif, /images/cn_DataGrid.gif, dataGrid.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataGrid.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataGrid.html, /richfaces/dataGrid.jsf
-dataList= richDataIterators, Data List, /images/ico_DataList.gif, /images/cn_DataList.gif, dataList.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataList.html, /richfaces/dataLists.jsf
-dataOrderedList= richDataIterators, Data Ordered List, /images/ico_DataOrderedList.gif, /images/cn_DataOrderedList.gif, dataOrderedList.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataOrderedList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/taglib/DataOrderedListTag.html, /richfaces/dataLists.jsf
-gmap= richMisc, Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, gmap.html, jbossrichfaces/freezone/docs/tlddoc/rich/gmap.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIGmap.html, /richfaces/gmap.jsf
-jQuery= richMisc, jQuery, /images/ico_common.gif, /images/cn_jQuery.gif, jQuery.html, jbossrichfaces/freezone/docs/tlddoc/rich/jQuery.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIJQuery.html, /richfaces/jQuery.jsf
-paint2d= richOutputs, Paint2D, /images/ico_Paint2D.gif, /images/cn_Paint2D.gif, paint2D.html, jbossrichfaces/freezone/docs/tlddoc/rich/paint2D.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPaint2D.html, /richfaces/paint2D.jsf
-toolBar= richOutputs, Tool Bar, /images/ico_ToolBar.gif, /images/cn_ToolBar.gif, toolBar.html, jbossrichfaces/freezone/docs/tlddoc/rich/toolBar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIToolBar.html, /richfaces/toolBar.jsf
-toolTip= richOutputs, ToolTip, /images/ico_ToolTip.gif, /images/cn_ToolTip.gif, toolTip.html, jbossrichfaces/freezone/docs/tlddoc/rich/toolTip.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIToolTip.html, /richfaces/toolTip.jsf
-simpleTogglePanel= richOutputs, Simple Toggle Panel, /images/ico_SimpleTogglePanel.gif, /images/cn_SimpleTogglePanel.gif, simpleTogglePanel.html, jbossrichfaces/freezone/docs/tlddoc/rich/simpleTogglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISimpleTogglePanel.html, /richfaces/simpleTogglePanel.jsf
-dragIndicator= richDragDrop, Drag Indicator, /images/ico_DragIndicator.gif, /images/cn_DragIndicator.gif, dragIndicator.html, jbossrichfaces/freezone/docs/tlddoc/rich/dragIndicator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDragIndicator.html, /richfaces/dragSupport.jsf
-dragSupport= richDragDrop, Drag Support, /images/ico_DragSupport.gif, /images/cn_DragSupport.gif, dragSupport.html, jbossrichfaces/freezone/docs/tlddoc/rich/dragSupport.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDragSupport.html, /richfaces/dragSupport.jsf
-dropSupport= richDragDrop, Drop Support, /images/ico_DropSupport.gif, /images/cn_DropSupport.gif, dropSupport.html, jbossrichfaces/freezone/docs/tlddoc/rich/dropSupport.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropSupport.html, /richfaces/dragSupport.jsf
-dndParam= richDragDrop, Drag-Drop Parameter, /images/ico_DropSupport.gif, /images/cn_DragDropParameter.gif, dndParam.html, jbossrichfaces/freezone/docs/tlddoc/rich/dndParam.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDndParam.html, /richfaces/dragSupport.jsf
-panelBar= richOutputs, Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, panelBar.html, jbossrichfaces/freezone/docs/tlddoc/rich/panelBar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelBar.html, /richfaces/panelBar.jsf
-modalPanel= richOutputs, Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, modalPanel.html, jbossrichfaces/freezone/docs/tlddoc/rich/modalPanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIModalPanel.html, /richfaces/modalPanel.jsf
-togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, togglePanel.html, jbossrichfaces/freezone/docs/tlddoc/rich/togglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf
-panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, panelMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf
-suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, suggestionbox.html, jbossrichfaces/freezone/docs/tlddoc/rich/suggestionbox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf
-dataTableScroller= richDataIterators, Data Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, datascroller.html, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf
-dropDownMenu= richMenu, Drop Down Menu, /images/ico_DropDownMenu.gif, /images/cn_DropDownMenu.gif, dropDownMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/dropDownMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf
-menuGroup= richMenu, Menu Group, /images/ico_MenuGroup.gif, /images/cn_MenuGroup.gif, menuGroup.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuGroup.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuGroup.html, /richfaces/dropDownMenu.jsf
-menuItem= richMenu, Menu Item, /images/ico_MenuItem.gif, /images/cn_MenuItem.gif, menuItem.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuItem.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuItem.html, /richfaces/dropDownMenu.jsf
-menuSeparator= richMenu, Menu Separator, /images/ico_MenuSeparator.gif, /images/cn_MenuSeparator.gif, menuSeparator.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuSeparator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuSeparator.html, /richfaces/dropDownMenu.jsf
-calendar= richInputs, Calendar, /images/ico_Calendar.gif, /images/cn_Calendar.gif, calendar.html, jbossrichfaces/freezone/docs/tlddoc/rich/calendar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UICalendar.html, /richfaces/calendar.jsf
-message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, message.html, jbossrichfaces/freezone/docs/tlddoc/rich/message.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRichMessage.html, /richfaces/message.jsf
-messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, messages.html, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRichMessages.html, /richfaces/messages.jsf
-virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, virtualEarth.html, jbossrichfaces/freezone/docs/tlddoc/rich/virtualEarth.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIVirtualEarth.html, /richfaces/virtualEarth.jsf
-insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, insert.html, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/ui/component/UIInsert.html, /richfaces/insert.jsf
-scrollableDataTable=richDataIterators, Scrollable Data Table,/images/ico_ScrollableDataTable.gif, /images/cn_ScrollableDataTable.gif, scrollableDataTable.html, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable.html,jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf
-tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, tree.html, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf
-treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, treeNodesAdaptor.html, jbossrichfaces/freezone/docs/tlddoc/rich/treeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
-recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor,/images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif,recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/tlddoc/rich/recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
-ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, ArchitectureOverview.html, jbossajax4jsf/freezone/docs/tlddoc/overview-summary.html, jbossajax4jsf/freezone/docs/apidoc/overview-summary.html, /richfaces/ajaxAttributes.jsf
-actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, actionparam.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/actionparam.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIActionParameter.html, /richfaces/actionparam.jsf
-commandButton= ajaxSupport, Command Button, /images/ico_common.gif, /images/cn_commandButton.gif, commandButton.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/commandButton.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxCommandButton.html, /richfaces/commandButton.jsf
-commandLink= ajaxSupport, Command Link, /images/ico_common.gif, /images/cn_commandLink.gif, commandLink.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/commandLink.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxCommandLink.html, /richfaces/commandLink.jsf
-form= ajaxSupport, Ajax Form, /images/ico_common.gif, /images/cn_ajaxForm.gif, form.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/form.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxForm.html, /richfaces/form.jsf
-support= ajaxSupport, Ajax Support, /images/ico_common.gif, /images/cn_ajaxSupport.gif, support.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/support.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxSupport.html, /richfaces/support.jsf
-jsFunction= ajaxSupport, JS Function, /images/ico_common.gif, /images/cn_jsFunction.gif, jsFunction.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/jsFunction.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxFunction.html, /richfaces/jsFunction.jsf
-poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_poll.gif, poll.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/poll.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPoll.html, /richfaces/poll.jsf
-push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_push.gif, push.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/push.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPush.html, /richfaces/push.jsf , new
-status= ajaxSupport, Status, /images/ico_common.gif, /images/cn_status.gif, status.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/status.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxStatus.html, /richfaces/status.jsf
-ajaxListener= ajaxSupport, Ajax Listener, /images/ico_common.gif, /images/cn_ajaxListener.gif, ajaxListener.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/ajaxListener.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.html, /richfaces/ajaxListener.jsf
-region= ajaxSupport, Ajax Region, /images/ico_common.gif, /images/cn_ajaxRegion.gif, region.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/region.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/region.jsf
-loadBundle= ajaxResources, Bundle, /images/ico_common.gif, /images/cn_Bundle.gif, loadBundle.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/loadBundle.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UILoadBundle.html, /richfaces/bundle.jsf
-loadScript= ajaxResources, Script, /images/ico_common.gif, /images/cn_Script.gif, loadScript.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/loadScript.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/LoadScriptTag.html, /richfaces/script.jsf
-loadStyle= ajaxResources, Style, /images/ico_common.gif, /images/cn_Style.gif, loadStyle.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/loadStyle.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/LoadStyleTag.html, /richfaces/style.jsf
-keepAlive= ajaxResources, Keep Alive, /images/ico_common.gif, /images/cn_KeepAlive.gif, keepAlive.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/keepAlive.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.html, /richfaces/keepAlive.jsf
-include= ajaxOutput, Include, /images/ico_common.gif, /images/cn_include2.gif, include.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/include.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIInclude.html, /richfaces/include.jsf
-mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif, /images/cn_MediaOutput.gif, mediaOutput.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/mediaOutput.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/resource/UIMediaOutput.html, /richfaces/mediaOutput.jsf
-outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_OutputPanel.gif, outputPanel.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/outputPanel.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxOutputPanel.html, /richfaces/outputPanel.jsf
-repeat= richDataIterators, Repeat, /images/ico_Repeat.gif, /images/cn_Repeat.gif, repeat.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/repeat.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/repeat/UIRepeat.html, /richfaces/repeat.jsf
-htmlCommandLink= ajaxMisc, Html Command Link, /images/ico_common.gif, /images/cn_HtmlCommandLink.gif, htmlCommandLink.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/htmlCommandLink.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/HtmlCommandLinkTag.html, /richfaces/htmlCommandLink.jsf
-log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, log.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/log.jsf
-page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, page.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/AjaxPage.html, /richfaces/page.jsf
-portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, portlet.html, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf
-effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, effect.html, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
-contextMenu= richMenu, Context Menu, /images/ico_ContextMenu.gif, /images/cn_contextMenu.gif, contextMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/contextMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIContextMenu.html, /richfaces/contextMenu.jsf
-componentControl=richMisc, Component Control, \t/images/ico_common.gif, \t\t/images/cn_componentControl.gif, componentControl.html, jbossrichfaces/freezone/docs/tlddoc/rich/componentControl.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIComponentControl.html, /richfaces/componentControl.jsf
-orderingList=richSelect, Ordering List, \t\t/images/ico_OrderingList.gif, \t/images/cn_orderingList.gif, orderingList.html, jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIOrderingList.html, \t\t/richfaces/orderingList.jsf
-listShuttle=richSelect, List Shuttle, \t\t/images/ico_ListShuttle.gif, /images/cn_listShuttle.gif, listShuttle.html, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIListShuttle.html, \t\t/richfaces/listShuttle.jsf
-pickList=richSelect, Pick List, \t\t\t/images/ico_pickList.gif, /images/cn_PickList.gif, pickList.html, jbossrichfaces/freezone/docs/tlddoc/rich/pickList.html, \t\tjbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPickList.html, \t\t\t\t/richfaces/pickList.jsf
-progressBar=richOutputs, Progress Bar, \t\t/images/ico_progressBar.gif, /images/cn_ProgressBar.gif, progressBar.html, jbossrichfaces/freezone/docs/tlddoc/rich/progressBar.html, \t\tjbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIProgressBar.html, \t/richfaces/progressBar.jsf
-comboBox=richInputs, Combo Box, \t\t/images/ico_ComboBox.gif, \t\t/images/cn_ComboBox.gif, comboBox.html, jbossrichfaces/freezone/docs/tlddoc/rich/comboBox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIComboBox.html, \t\t\t\t\t/richfaces/comboBox.jsf
-inplaceInput= richInputs, Inplace Input, /images/ico_InplaceInput.gif, \t\t/images/cn_InplaceInput.gif, inplaceInput.html, jbossrichfaces/freezone/docs/tlddoc/rich/inplaceInput.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInplaceInput.html, \t\t\t\t\t/richfaces/inplaceInput.jsf
-inplaceSelect= richInputs, Inplace Select, /images/ico_InplaceSelect.gif, \t\t/images/cn_InplaceSelect.gif, inplaceSelect.html, jbossrichfaces/freezone/docs/tlddoc/rich/inplaceSelect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInplaceSelect.html, \t\t\t\t\t/richfaces/inplaceSelect.jsf
-sorting=richDataIterators, Table Sorting, \t/images/ico_TableSorting.gif, \t\t/images/cn_TableSorting.gif, dataTable.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataTable.html, \t\t\t\t\t/richfaces/sortingFeature.jsf
-filtering=richDataIterators, Table Filtering, \t/images/ico_TableFiltering.gif, \t\t/images/cn_TableFiltering.gif, dataTable.html, jbossrichfaces/freezone/docs/tlddoc/rich/dataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDataTable.html, \t\t\t\t\t/richfaces/filteringFeature.jsf , new
-columns =richDataIterators, \t Columns, \t\t\t/images/ico_columns.gif, \t\t/images/cn_Columns.gif, columns.html, jbossrichfaces/freezone/docs/tlddoc/rich/columns.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/taglib/ColumnsTag.html, \t\t\t\t\t/richfaces/columns.jsf
-fileUpload =richInputs, \t File Upload, \t\t/images/ico_FileUpload.gif, \t\t/images/cn_FileUpload.gif, fileUpload.html, jbossrichfaces/freezone/docs/tlddoc/rich/fileUpload.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIFileUpload.html, \t\t\t\t\t/richfaces/fileUpload.jsf
-StandardSkinning =richMisc, \t Standard Skinning, \t\t/images/ico_StandardComponentsSkinning.gif, \t\t/images/cn_StandardComponentsSkinning.gif, ArchitectureOverview.html\#StControlsSkinning, jbossrichfaces/freezone/docs/tlddoc/rich/StandardSkinning.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/standardSkinning.jsf
-plugnskin =richMisc, \t Plug'n'Skin, \t\t/images/ico_plugnskin.gif, \t\t/images/cn_plugnskin.gif, ArchitectureOverview.html\#PlugnSkin, jbossrichfaces/freezone/docs/tlddoc/rich/plugnskin.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/plugnskin.jsf
-hotKey=richMisc, \t Hot Key, \t\t/images/ico_HotKey.gif, \t\t/images/cn_HotKey.gif, hotKey.html, jbossrichfaces/freezone/docs/tlddoc/rich/hotKey.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIHotKey.html, \t\t\t\t\t/richfaces/hotKey.jsf
-ajaxValidator=richValidators, \t Ajax Validator, \t\t/images/ico_AjaxValidator.gif, \t\t/images/cn_AjaxValidator.gif, ajaxValidator.html, jbossrichfaces/freezone/docs/tlddoc/rich/ajaxValidator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIBeanValidator.html, \t\t\t\t\t/richfaces/ajaxValidator.jsf
-beanValidator=richValidators, \t Bean Validator, \t\t/images/ico_BeanValidator.gif, \t\t/images/cn_BeanValidator.gif, beanValidator.html, jbossrichfaces/freezone/docs/tlddoc/rich/beanValidator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIBeanValidator.html, \t\t\t\t\t/richfaces/beanValidator.jsf
-graphValidator=richValidators, \t Graph Validator, \t\t/images/ico_GraphValidator.gif, \t\t/images/cn_GraphValidator.gif, graphValidator.html, jbossrichfaces/freezone/docs/tlddoc/rich/graphValidator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIGraphValidator.html, \t\t\t\t\t/richfaces/graphValidator.jsf
-stateAPI=richMisc, \t State Manager API, \t\t/images/ico_StateManagerAPI.gif, \t\t/images/cn_StateManagerAPI.gif, ArchitectureOverview.html\#statemanagerapi, jbossrichfaces/freezone/docs/tlddoc/rich/graphValidator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIhotkey.html, \t\t\t\t\t/richfaces/stateAPI.jsf
-extendedDataTable= richDataIterators, Extended Data Table, /images/ico_ExtendedDataTable.gif, /images/cn_ExtendedDataTable.gif, extendedDataTable.html, jbossrichfaces/freezone/docs/tlddoc/rich/extendedDataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIExtendedDataTable.html, /richfaces/extendedDataTable.jsf, new
-editor=richInputs, Editor, /images/ico_Editor.gif, /images/cn_Editor.gif, editor.html, jbossrichfaces/freezone/docs/tlddoc/rich/editor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEditor.html, /richfaces/editor.jsf
-queue=ajaxSupport, Queue, /images/ico_common.gif, /images/cn_Queue.gif, queue.html, jbossrichfaces/freezone/docs/tlddoc/a4j/queue.html, jbossrichfaces/freezone/docs/apidoc/org/ajax4jsf/component/UIQueue.html, /richfaces/queue.jsf
-colorPicker= richInputs, Color Picker, /images/ico_ColorPicker.gif, /images/cn_ColorPicker.gif, ColorPicker.html, jbossrichfaces/freezone/docs/tlddoc/rich/colorPicker.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIColorPicker.html, /richfaces/colorPicker.jsf
-layouts=richMisc, Semantic Layouts, /images/ico_SemanticLayoutComponents.gif, /images/cn_SemanticLayoutComponents.gif, Layouts.html, jbossrichfaces/freezone/docs/tlddoc/rich/Page.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPage.html, /richfaces/layouts.jsf
\ No newline at end of file
+panel= richOutputs, Panel, /images/ico_panel.gif, /images/cn_panel.gif, rich_panel.html, rich/panel.html, org/richfaces/component/UIPanel.html, /richfaces/panel.jsf
+separator= richOutputs, Separator, /images/ico_separator.gif, /images/cn_separator.gif, rich_separator.html, rich/separator.html, org/richfaces/component/UISeparator.html, /richfaces/separator.jsf
+spacer= richOutputs, Spacer, /images/ico_spacer.gif, /images/cn_spacer.gif, rich_spacer.html, rich/spacer.html, org/richfaces/component/UISpacer.html, /richfaces/spacer.jsf
+tabPanel= richOutputs, Tab Panel, /images/ico_tabpanel.gif, /images/cn_tabpanel.gif, rich_tabPanel.html, rich/tabPanel.html, org/richfaces/component/UITabPanel.html, /richfaces/tabPanel.jsf
+inputNumberSlider= richInputs, Input Number Slider, /images/ico_DataFilterSlider.gif, /images/cn_slider.gif, rich_inputNumberSlider.html, rich/inputNumberSlider.html, org/richfaces/component/UIInputNumberSlider.html, /richfaces/inputNumberSlider.jsf
+inputNumberSpinner= richInputs, Input Number Spinner, /images/ico_spinner.gif, /images/cn_spinner.gif, rich_inputNumberSpinner.html, rich/inputNumberSpinner.html, org/richfaces/component/UIInputNumberSpinner.html, /richfaces/inputNumberSpinner.jsf
+dataFilterSlider= richDataIterators, Data Filter Slider, /images/ico_DataFilterSlider.gif, /images/cn_DataFilterSlider.gif, rich_dataFilterSlider.html, rich/dataFilterSlider.html, org/richfaces/component/UIDataFltrSlider.html, /richfaces/dataFilterSlider.jsf
+dataTable=richDataIterators, Data Table, /images/ico_DataTable.gif, /images/cn_DataTable.gif, rich_dataTable.html, rich/dataTable.html, org/richfaces/component/UIDataTable.html, /richfaces/dataTable.jsf
+column= richDataIterators, Column, /images/ico_Column.gif, /images/cn_Column.gif, rich_column.html, rich/column.html, org/richfaces/component/UIColumn.html, /richfaces/dataTable.jsf
+columnGroup= richDataIterators, Column Group, /images/ico_ColumnGroup.gif, /images/cn_ColumnGroup.gif, rich_columnGroup.html, rich/columnGroup.html, org/richfaces/component/UIColumnGroup.html, /richfaces/dataTable.jsf
+dataDefinitionList= richDataIterators, Data Definition List, /images/ico_DataDefinitionList.gif, /images/cn_DataDefinitionList.gif, rich_dataDefinitionList.html, rich/dataDefinitionList.html, org/richfaces/component/UIDataDefinitionList.html, /richfaces/dataLists.jsf
+dataGrid= richDataIterators, Data Grid, /images/ico_DataGrid.gif, /images/cn_DataGrid.gif, rich_dataGrid.html, rich/dataGrid.html, org/richfaces/component/UIDataGrid.html, /richfaces/dataGrid.jsf
+dataList= richDataIterators, Data List, /images/ico_DataList.gif, /images/cn_DataList.gif, rich_dataList.html, rich/dataList.html, org/richfaces/component/UIDataList.html, /richfaces/dataLists.jsf
+dataOrderedList= richDataIterators, Data Ordered List, /images/ico_DataOrderedList.gif, /images/cn_DataOrderedList.gif, rich_dataOrderedList.html, rich/dataOrderedList.html, org/richfaces/taglib/DataOrderedListTag.html, /richfaces/dataLists.jsf
+gmap= richMisc, Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, rich_gmap.html, rich/gmap.html, org/richfaces/component/UIGmap.html, /richfaces/gmap.jsf
+jQuery= richMisc, jQuery, /images/ico_common.gif, /images/cn_jQuery.gif, rich_jQuery.html, rich/jQuery.html, org/richfaces/component/UIJQuery.html, /richfaces/jQuery.jsf
+paint2d= richOutputs, Paint2D, /images/ico_Paint2D.gif, /images/cn_Paint2D.gif, rich_paint2D.html, rich/paint2D.html, org/richfaces/component/UIPaint2D.html, /richfaces/paint2D.jsf
+toolBar= richOutputs, Tool Bar, /images/ico_ToolBar.gif, /images/cn_ToolBar.gif, rich_toolBar.html, rich/toolBar.html, org/richfaces/component/UIToolBar.html, /richfaces/toolBar.jsf
+toolTip= richOutputs, ToolTip, /images/ico_ToolTip.gif, /images/cn_ToolTip.gif, rich_toolTip.html, rich/toolTip.html, org/richfaces/component/UIToolTip.html, /richfaces/toolTip.jsf
+simpleTogglePanel= richOutputs, Simple Toggle Panel, /images/ico_SimpleTogglePanel.gif, /images/cn_SimpleTogglePanel.gif, rich_simpleTogglePanel.html, rich/simpleTogglePanel.html, org/richfaces/component/UISimpleTogglePanel.html, /richfaces/simpleTogglePanel.jsf
+dragIndicator= richDragDrop, Drag Indicator, /images/ico_DragIndicator.gif, /images/cn_DragIndicator.gif, rich_dragIndicator.html, rich/dragIndicator.html, org/richfaces/component/UIDragIndicator.html, /richfaces/dragSupport.jsf
+dragSupport= richDragDrop, Drag Support, /images/ico_DragSupport.gif, /images/cn_DragSupport.gif, rich_dragSupport.html, rich/dragSupport.html, org/richfaces/component/UIDragSupport.html, /richfaces/dragSupport.jsf
+dropSupport= richDragDrop, Drop Support, /images/ico_DropSupport.gif, /images/cn_DropSupport.gif, rich_dropSupport.html, rich/dropSupport.html, org/richfaces/component/UIDropSupport.html, /richfaces/dragSupport.jsf
+dndParam= richDragDrop, Drag-Drop Parameter, /images/ico_DropSupport.gif, /images/cn_DragDropParameter.gif, rich_dndParam.html, rich/dndParam.html, org/richfaces/component/UIDndParam.html, /richfaces/dragSupport.jsf
+panelBar= richOutputs, Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, rich_panelBar.html, rich/panelBar.html, org/richfaces/component/UIPanelBar.html, /richfaces/panelBar.jsf
+modalPanel= richOutputs, Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, rich_modalPanel.html, rich/modalPanel.html, org/richfaces/component/UIModalPanel.html, /richfaces/modalPanel.jsf
+togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, rich_togglePanel.html, rich/togglePanel.html, org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf
+panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, rich_panelMenu.html, rich/panelMenu.html, org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf
+suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, rich_suggestionbox.html, rich/suggestionbox.html, org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf
+dataTableScroller= richDataIterators, Data Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, rich_datascroller.html, rich/datascroller.html, org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf
+dropDownMenu= richMenu, Drop Down Menu, /images/ico_DropDownMenu.gif, /images/cn_DropDownMenu.gif, rich_dropDownMenu.html, rich/dropDownMenu.html, org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf
+menuGroup= richMenu, Menu Group, /images/ico_MenuGroup.gif, /images/cn_MenuGroup.gif, rich_menuGroup.html, rich/menuGroup.html, org/richfaces/component/UIMenuGroup.html, /richfaces/dropDownMenu.jsf
+menuItem= richMenu, Menu Item, /images/ico_MenuItem.gif, /images/cn_MenuItem.gif, rich_menuItem.html, rich/menuItem.html, org/richfaces/component/UIMenuItem.html, /richfaces/dropDownMenu.jsf
+menuSeparator= richMenu, Menu Separator, /images/ico_MenuSeparator.gif, /images/cn_MenuSeparator.gif, rich_menuSeparator.html, rich/menuSeparator.html, org/richfaces/component/UIMenuSeparator.html, /richfaces/dropDownMenu.jsf
+calendar= richInputs, Calendar, /images/ico_Calendar.gif, /images/cn_Calendar.gif, rich_calendar.html, rich/calendar.html, org/richfaces/component/UICalendar.html, /richfaces/calendar.jsf
+message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, rich_message.html, rich/message.html, org/richfaces/component/UIRichMessage.html, /richfaces/message.jsf
+messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, rich_messages.html, rich/messages.html, org/richfaces/component/UIRichMessages.html, /richfaces/messages.jsf
+virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, rich_virtualEarth.html, rich/virtualEarth.html, org/richfaces/component/UIVirtualEarth.html, /richfaces/virtualEarth.jsf
+insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, rich_insert.html, rich/insert.html, org/richfaces/ui/component/UIInsert.html, /richfaces/insert.jsf
+scrollableDataTable=richDataIterators, Scrollable Data Table,/images/ico_ScrollableDataTable.gif, /images/cn_ScrollableDataTable.gif, rich_scrollableDataTable.html, rich/scrollableDataTable.html, org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf
+tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, rich_tree.html, rich/tree.html, org/richfaces/component/UITree.html, /richfaces/tree.jsf
+treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, rich_treeNodesAdaptor.html, rich/treeNodesAdaptor.html, org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
+recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor,/images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif,rich_recursiveTreeNodesAdaptor.html, rich/recursiveTreeNodesAdaptor.html, org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf
+ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, ArchitectureOverview.html, overview-summary.html, jbossajax4jsf/freezone/docs/apidoc/overview-summary.html, /richfaces/ajaxAttributes.jsf
+actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, a4j_actionparam.html, a4j/actionparam.html, org/ajax4jsf/component/UIActionParameter.html, /richfaces/actionparam.jsf
+commandButton= ajaxSupport, Command Button, /images/ico_common.gif, /images/cn_commandButton.gif, a4j_commandButton.html, a4j/commandButton.html, org/ajax4jsf/component/UIAjaxCommandButton.html, /richfaces/commandButton.jsf
+commandLink= ajaxSupport, Command Link, /images/ico_common.gif, /images/cn_commandLink.gif, a4j_commandLink.html, a4j/commandLink.html, org/ajax4jsf/component/UIAjaxCommandLink.html, /richfaces/commandLink.jsf
+form= ajaxSupport, Ajax Form, /images/ico_common.gif, /images/cn_ajaxForm.gif, a4j_form.html, a4j/form.html, org/ajax4jsf/component/UIAjaxForm.html, /richfaces/form.jsf
+support= ajaxSupport, Ajax Support, /images/ico_common.gif, /images/cn_ajaxSupport.gif, a4j_support.html, a4j/support.html, org/ajax4jsf/component/UIAjaxSupport.html, /richfaces/support.jsf
+jsFunction= ajaxSupport, JS Function, /images/ico_common.gif, /images/cn_jsFunction.gif, a4j_jsFunction.html, a4j/jsFunction.html, org/ajax4jsf/component/UIAjaxFunction.html, /richfaces/jsFunction.jsf
+poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_poll.gif, a4j_poll.html, a4j/poll.html, org/ajax4jsf/component/UIPoll.html, /richfaces/poll.jsf
+push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_push.gif, a4j_push.html, a4j/push.html, org/ajax4jsf/component/UIPush.html, /richfaces/push.jsf , new
+status= ajaxSupport, Status, /images/ico_common.gif, /images/cn_status.gif, a4j_status.html, a4j/status.html, org/ajax4jsf/component/UIAjaxStatus.html, /richfaces/status.jsf
+ajaxListener= ajaxSupport, Ajax Listener, /images/ico_common.gif, /images/cn_ajaxListener.gif, a4j_ajaxListener.html, a4j/ajaxListener.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/html/jsp/AjaxListenerTag.html, /richfaces/ajaxListener.jsf
+region= ajaxSupport, Ajax Region, /images/ico_common.gif, /images/cn_ajaxRegion.gif, a4j_region.html, a4j/region.html, org/ajax4jsf/component/UIAjaxRegion.html, /richfaces/region.jsf
+loadBundle= ajaxResources, Bundle, /images/ico_common.gif, /images/cn_Bundle.gif, a4j_loadBundle.html, a4j/loadBundle.html, org/ajax4jsf/component/UILoadBundle.html, /richfaces/bundle.jsf
+loadScript= ajaxResources, Script, /images/ico_common.gif, /images/cn_Script.gif, a4j_loadScript.html, a4j/loadScript.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/LoadScriptTag.html, /richfaces/script.jsf
+loadStyle= ajaxResources, Style, /images/ico_common.gif, /images/cn_Style.gif, a4j_loadStyle.html, a4j/loadStyle.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/LoadStyleTag.html, /richfaces/style.jsf
+keepAlive= ajaxResources, Keep Alive, /images/ico_common.gif, /images/cn_KeepAlive.gif, a4j_keepAlive.html, a4j/keepAlive.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.html, /richfaces/keepAlive.jsf
+include= ajaxOutput, Include, /images/ico_common.gif, /images/cn_include2.gif, a4j_include.html, a4j/include.html, org/ajax4jsf/component/UIInclude.html, /richfaces/include.jsf
+mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif, /images/cn_MediaOutput.gif, a4j_mediaOutput.html, a4j/mediaOutput.html, org/ajax4jsf/component/resource/UIMediaOutput.html, /richfaces/mediaOutput.jsf
+outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_OutputPanel.gif, a4j_outputPanel.html, a4j/outputPanel.html, org/ajax4jsf/component/UIAjaxOutputPanel.html, /richfaces/outputPanel.jsf
+repeat= richDataIterators, Repeat, /images/ico_Repeat.gif, /images/cn_Repeat.gif, a4j_repeat.html, a4j/repeat.html, org/ajax4jsf/component/repeat/UIRepeat.html, /richfaces/repeat.jsf
+htmlCommandLink= ajaxMisc, Html Command Link, /images/ico_common.gif, /images/cn_HtmlCommandLink.gif, a4j_htmlCommandLink.html, a4j/htmlCommandLink.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/HtmlCommandLinkTag.html, /richfaces/htmlCommandLink.jsf
+log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, a4j_log.html, a4j/log.html, org/ajax4jsf/component/UIAjaxLog.html, /richfaces/log.jsf
+page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, a4j_page.html, a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/ajax/AjaxPage.html, /richfaces/page.jsf
+portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, a4j_portlet.html, a4j/portlet.html, org/ajax4jsf/component/UIPortlet.html, /richfaces/portlet.jsf
+effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, rich_effect.html, rich/effect.html, org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
+contextMenu= richMenu, Context Menu, /images/ico_ContextMenu.gif, /images/cn_contextMenu.gif, rich_contextMenu.html, rich/contextMenu.html, org/richfaces/component/UIContextMenu.html, /richfaces/contextMenu.jsf
+componentControl=richMisc, Component Control, \t/images/ico_common.gif, \t\t/images/cn_componentControl.gif, rich_componentControl.html, rich/componentControl.html, org/richfaces/component/UIComponentControl.html, /richfaces/componentControl.jsf
+orderingList=richSelect, Ordering List, \t\t/images/ico_OrderingList.gif, \t/images/cn_orderingList.gif, rich_orderingList.html, rich/orderingList.html, org/richfaces/component/UIOrderingList.html, \t\t/richfaces/orderingList.jsf
+listShuttle=richSelect, List Shuttle, \t\t/images/ico_ListShuttle.gif, /images/cn_listShuttle.gif, rich_listShuttle.html, rich/listShuttle.html, org/richfaces/component/UIListShuttle.html, \t\t/richfaces/listShuttle.jsf
+pickList=richSelect, Pick List, \t\t\t/images/ico_pickList.gif, /images/cn_PickList.gif, rich_pickList.html, rich/pickList.html, \t\t org/richfaces/component/UIPickList.html, \t\t\t\t/richfaces/pickList.jsf
+progressBar=richOutputs, Progress Bar, \t\t/images/ico_progressBar.gif, /images/cn_ProgressBar.gif, rich_progressBar.html, rich/progressBar.html, \t\t org/richfaces/component/UIProgressBar.html, \t/richfaces/progressBar.jsf
+comboBox=richInputs, Combo Box, \t\t/images/ico_ComboBox.gif, \t\t/images/cn_ComboBox.gif, rich_comboBox.html, rich/comboBox.html, org/richfaces/component/UIComboBox.html, \t\t\t\t\t/richfaces/comboBox.jsf
+inplaceInput= richInputs, Inplace Input, /images/ico_InplaceInput.gif, \t\t/images/cn_InplaceInput.gif, rich_inplaceInput.html, rich/inplaceInput.html, org/richfaces/component/UIInplaceInput.html, \t\t\t\t\t/richfaces/inplaceInput.jsf
+inplaceSelect= richInputs, Inplace Select, /images/ico_InplaceSelect.gif, \t\t/images/cn_InplaceSelect.gif, rich_inplaceSelect.html, rich/inplaceSelect.html, org/richfaces/component/UIInplaceSelect.html, \t\t\t\t\t/richfaces/inplaceSelect.jsf
+sorting=richDataIterators, Table Sorting, \t/images/ico_TableSorting.gif, \t\t/images/cn_TableSorting.gif, rich_dataTable.html, rich/dataTable.html, org/richfaces/component/UIDataTable.html, \t\t\t\t\t/richfaces/sortingFeature.jsf
+filtering=richDataIterators, Table Filtering, \t/images/ico_TableFiltering.gif, \t\t/images/cn_TableFiltering.gif, rich_dataTable.html, rich/dataTable.html, org/richfaces/component/UIDataTable.html, \t\t\t\t\t/richfaces/filteringFeature.jsf , new
+columns =richDataIterators, \t Columns, \t\t\t/images/ico_columns.gif, \t\t/images/cn_Columns.gif, rich_columns.html, rich/columns.html, org/richfaces/taglib/ColumnsTag.html, \t\t\t\t\t/richfaces/columns.jsf
+fileUpload =richInputs, \t File Upload, \t\t/images/ico_FileUpload.gif, \t\t/images/cn_FileUpload.gif, rich_fileUpload.html, rich/fileUpload.html, org/richfaces/component/UIFileUpload.html, \t\t\t\t\t/richfaces/fileUpload.jsf
+StandardSkinning =richMisc, \t Standard Skinning, \t\t/images/ico_StandardComponentsSkinning.gif, \t\t/images/cn_StandardComponentsSkinning.gif, ArchitectureOverview.html\#StControlsSkinning, rich/StandardSkinning.html, org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/standardSkinning.jsf
+plugnskin =richMisc, \t Plug'n'Skin, \t\t/images/ico_plugnskin.gif, \t\t/images/cn_plugnskin.gif, ArchitectureOverview.html\#PlugnSkin, rich/plugnskin.html, org/richfaces/component/UIfileUpload.html, \t\t\t\t\t/richfaces/plugnskin.jsf
+hotKey=richMisc, \t Hot Key, \t\t/images/ico_HotKey.gif, \t\t/images/cn_HotKey.gif, rich_hotKey.html, rich/hotKey.html, org/richfaces/component/UIHotKey.html, \t\t\t\t\t/richfaces/hotKey.jsf
+ajaxValidator=richValidators, \t Ajax Validator, \t\t/images/ico_AjaxValidator.gif, \t\t/images/cn_AjaxValidator.gif, ajaxValidator.html, rich/ajaxValidator.html, org/richfaces/component/UIBeanValidator.html, \t\t\t\t\t/richfaces/ajaxValidator.jsf
+beanValidator=richValidators, \t Bean Validator, \t\t/images/ico_BeanValidator.gif, \t\t/images/cn_BeanValidator.gif, beanValidator.html, rich/beanValidator.html, org/richfaces/component/UIBeanValidator.html, \t\t\t\t\t/richfaces/beanValidator.jsf
+graphValidator=richValidators, \t Graph Validator, \t\t/images/ico_GraphValidator.gif, \t\t/images/cn_GraphValidator.gif, graphValidator.html, rich/graphValidator.html, org/richfaces/component/UIGraphValidator.html, \t\t\t\t\t/richfaces/graphValidator.jsf
+stateAPI=richMisc, \t State Manager API, \t\t/images/ico_StateManagerAPI.gif, \t\t/images/cn_StateManagerAPI.gif, ArchitectureOverview.html\#statemanagerapi, rich/graphValidator.html, org/richfaces/component/UIhotkey.html, \t\t\t\t\t/richfaces/stateAPI.jsf
+extendedDataTable=richDataIterators, Extended Data Table, /images/ico_ExtendedDataTable.gif, /images/cn_ExtendedDataTable.gif, rich_extendedDataTable.html, rich/extendedDataTable.html, org/richfaces/component/UIExtendedDataTable.html, /richfaces/extendedDataTable.jsf, new
+editor=richInputs, Editor, /images/ico_Editor.gif, /images/cn_Editor.gif, rich_editor.html, rich/editor.html, org/richfaces/component/UIEditor.html, /richfaces/editor.jsf
+queue=ajaxSupport, Queue, /images/ico_common.gif, /images/cn_Queue.gif, queue.html, a4j/queue.html, org/ajax4jsf/component/UIQueue.html, /richfaces/queue.jsf
+colorPicker= richInputs, Color Picker, /images/ico_ColorPicker.gif, /images/cn_ColorPicker.gif, rich_colorPicker.html, rich/colorPicker.html, org/richfaces/component/UIColorPicker.html, /richfaces/colorPicker.jsf
+layouts=richMisc, Semantic Layouts, /images/ico_SemanticLayoutComponents.gif, /images/cn_SemanticLayoutComponents.gif, rich_layouts.html, rich/Page.html, org/richfaces/component/UIPage.html, /richfaces/layouts.jsf
\ No newline at end of file
Modified: tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/path.properties
===================================================================
--- tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/path.properties 2009-08-10 12:28:57 UTC (rev 15147)
+++ tags/3.3.2.CR1/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/path.properties 2009-08-10 14:37:17 UTC (rev 15148)
@@ -1,3 +1,3 @@
-dgPath=http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone/docs/devguide/en/html/
-apiPath=http://labs.jboss.com/file-access/default/members/
-tldPath=http://labs.jboss.com/file-access/default/members/
+dgPath=http://docs.jboss.org/richfaces/latest_3_3_X/en/devguide/html/
+apiPath=http://docs.jboss.org/richfaces/latest_3_3_X/en/apidoc/
+tldPath=http://docs.jboss.org/richfaces/latest_3_3_X/en/tlddoc/
Modified: tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
===================================================================
--- tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2009-08-10 12:28:57 UTC (rev 15147)
+++ tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2009-08-10 14:37:17 UTC (rev 15148)
@@ -5,6 +5,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
+<f:loadBundle var="path" basename="org/richfaces/demo/common/path"/>
<div class="page_brick"></div>
<table class="top_navbar" cellpadding="0" cellspacing="0" border="0">
<tbody>
@@ -19,7 +20,7 @@
<h:outputLink value="http://jboss.com/index.html?module=bb&op=viewforum&f=261">Support</h:outputLink>
</td>
<td>
- <h:outputLink value="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone...">Developer Guide</h:outputLink>
+ <h:outputLink value="#{path.dgPath}">Developer Guide</h:outputLink>
</td>
</tr>
</tbody>
Modified: tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml
===================================================================
--- tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2009-08-10 12:28:57 UTC (rev 15147)
+++ tags/3.3.2.CR1/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2009-08-10 14:37:17 UTC (rev 15148)
@@ -10,8 +10,8 @@
<strong>#{componentNavigator.currentComponent.name}</strong>
<ul>
<li><h:outputLink target="_blank" value="#{path.dgPath}#{componentNavigator.currentComponent != null ? componentNavigator.currentComponent.devGuideLocation : 'index.html'}">Developers Guide</h:outputLink></li>
- <li class="tldDoc"><h:outputLink target="_blank" value="#{path.tldPath}#{componentNavigator.currentComponent !=null ? componentNavigator.currentComponent.tldDocLocation : 'jbossrichfaces/freezone/docs/tlddoc/overview-summary.html'}">Tld Documentation</h:outputLink></li>
- <li class="uiClass"><h:outputLink target="_blank" value="#{path.apiPath}#{componentNavigator.currentComponent !=null ? componentNavigator.currentComponent.javaDocLocation : 'jbossrichfaces/freezone/docs/apidoc/overview-summary.html'}">Component Class Documentation</h:outputLink></li>
+ <li class="tldDoc"><h:outputLink target="_blank" value="#{path.tldPath}#{componentNavigator.currentComponent !=null ? componentNavigator.currentComponent.tldDocLocation : ''}">Tld Documentation</h:outputLink></li>
+ <li class="uiClass"><h:outputLink target="_blank" value="#{path.apiPath}#{componentNavigator.currentComponent !=null ? componentNavigator.currentComponent.javaDocLocation : ''}">Component Class Documentation</h:outputLink></li>
</ul>
</rich:panel>
</ui:composition>
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15147 - root/framework/trunk/impl/src/main/java/org/ajax4jsf/config.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-08-10 08:28:57 -0400 (Mon, 10 Aug 2009)
New Revision: 15147
Modified:
root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java
Log:
fix regexp pattern
Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java 2009-08-10 12:26:11 UTC (rev 15146)
+++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java 2009-08-10 12:28:57 UTC (rev 15147)
@@ -27,7 +27,7 @@
private Map<InitParam, String> initParams = new EnumMap<InitParam, String>(InitParam.class);
- private static final Pattern ALLOWABLE_BOOLEANS = Pattern.compile("true|false",Pattern.CASE_INSENSITIVE);
+ private static final Pattern ALLOWABLE_BOOLEANS = Pattern.compile("^true|false$",Pattern.CASE_INSENSITIVE);
private static final Pattern ALLOWABLE_NUMBER = Pattern.compile("^\\d+$");
14 years, 9 months
- 1
- 0
JBoss Rich Faces SVN: r15146 - Reports/3.3.2 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2009-08-10 08:26:11 -0400 (Mon, 10 Aug 2009)
New Revision: 15146
Modified:
branches/community/3.3.X/test-applications/qa/Test Reports/3.3.2/RFTestReport3.3.2.CR1(08.03-07).xls
Log:
Modified: branches/community/3.3.X/test-applications/qa/Test Reports/3.3.2/RFTestReport3.3.2.CR1(08.03-07).xls
===================================================================
(Binary files differ)
14 years, 9 months
- 1
- 0