richfaces-svn-commits
February 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 648 discussions
JBoss Rich Faces SVN: r21743 - in trunk: ui/output/api/src/main/java/org/richfaces/event and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-17 14:14:59 -0500 (Thu, 17 Feb 2011)
New Revision: 21743
Modified:
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java
trunk/ui/output/api/src/main/java/org/richfaces/event/ItemChangeEvent.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
Log:
RF-10054 Panels: attributes bypassUpdates and immediate ignored
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java 2011-02-17 19:09:37 UTC (rev 21742)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java 2011-02-17 19:14:59 UTC (rev 21743)
@@ -28,6 +28,6 @@
}
public void updateCurrent(ItemChangeEvent event) {
- setCurrent(event.getNewItem());
+ setCurrent(event.getNewItemName());
}
}
Modified: trunk/ui/output/api/src/main/java/org/richfaces/event/ItemChangeEvent.java
===================================================================
--- trunk/ui/output/api/src/main/java/org/richfaces/event/ItemChangeEvent.java 2011-02-17 19:09:37 UTC (rev 21742)
+++ trunk/ui/output/api/src/main/java/org/richfaces/event/ItemChangeEvent.java 2011-02-17 19:14:59 UTC (rev 21743)
@@ -38,8 +38,11 @@
private static final long serialVersionUID = -4747704006016875163L;
- private final String oldItem;
- private final String newItem;
+ private final String oldItemName;
+ private final String newItemName;
+
+ private final UIComponent oldItem;
+ private final UIComponent newItem;
// ------------------------------------------------------------ Constructors
@@ -52,28 +55,38 @@
*
* @param component Source {@link UIComponent} for this event
*
- * @param oldItem
- * @param newItem
+ * @param oldItemName
+ * @param newItemName
*
* @throws IllegalArgumentException if <code>component</code> is
* <code>null</code>
*/
- public ItemChangeEvent(UIComponent component, String oldItem, String newItem) {
+ public ItemChangeEvent(UIComponent component, String oldItemName, UIComponent oldItem,
+ String newItemName, UIComponent newItem) {
super(component);
+ this.oldItemName = oldItemName;
+ this.newItemName = newItemName;
this.oldItem = oldItem;
this.newItem = newItem;
}
-
// -------------------------------------------------------------- Properties
- public String getOldItem() {
+ public String getOldItemName() {
+ return oldItemName;
+ }
+
+ public String getNewItemName() {
+ return newItemName;
+ }
+
+ public UIComponent getOldItem() {
return oldItem;
}
- public String getNewItem() {
+ public UIComponent getNewItem() {
return newItem;
- }
+ }
// ------------------------------------------------- Event Broadcast Methods
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-02-17 19:09:37 UTC (rev 21742)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-02-17 19:14:59 UTC (rev 21743)
@@ -24,6 +24,8 @@
import javax.el.MethodExpression;
import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import org.richfaces.cdk.annotations.Attribute;
@@ -99,11 +101,9 @@
public void queueEvent(FacesEvent facesEvent) {
PanelToggleEvent event = null;
if ((facesEvent instanceof ItemChangeEvent) && (facesEvent.getComponent() == this)) {
- event = new PanelToggleEvent(this, Boolean.valueOf(((ItemChangeEvent) facesEvent).getNewItem()));
-
+ event = new PanelToggleEvent(this, Boolean.valueOf(((ItemChangeEvent) facesEvent).getNewItemName()));
setEventPhase(event);
}
-
super.queueEvent(event != null ? event : facesEvent);
}
@@ -215,4 +215,14 @@
public void setValue(Object value) {
setExpanded(Boolean.parseBoolean((String) value));
}
+
+ @Override
+ public void broadcast(FacesEvent event) throws AbortProcessingException {
+ super.broadcast(event);
+
+ if (event instanceof PanelToggleEvent
+ && (isBypassUpdates() || isImmediate())) {
+ FacesContext.getCurrentInstance().renderResponse();
+ }
+ }
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-17 19:09:37 UTC (rev 21742)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-17 19:14:59 UTC (rev 21743)
@@ -95,15 +95,16 @@
setSubmittedActiveItem(null);
if (previous == null || !previous.equalsIgnoreCase(activeItem)) {
- AbstractPanelMenuItem prevItm = getItem(previous);
+ AbstractPanelMenuItem prevItm = null;
+ if (previous != null) {
+ prevItm = getItem(previous);
+ }
AbstractPanelMenuItem actItm = getItem(activeItem);
- ItemChangeEvent event = new ItemChangeEvent(this, previous, activeItem);
- if (isImmediate() ||
- ((prevItm != null && prevItm.isImmediate()) ||
- (actItm != null && actItm.isImmediate()))) {
+ ItemChangeEvent event = new ItemChangeEvent(this, previous,prevItm, activeItem, actItm);
+ if (isImmediate() || (actItm != null && actItm.isImmediate())) {
event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- } else if (prevItm.isBypassUpdates() || actItm.isBypassUpdates()) {
+ } else if (actItm.isBypassUpdates()) {
event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
} else {
event.setPhaseId(PhaseId.INVOKE_APPLICATION);
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-02-17 19:09:37 UTC (rev 21742)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-02-17 19:14:59 UTC (rev 21743)
@@ -22,12 +22,16 @@
package org.richfaces.component;
-import org.richfaces.cdk.annotations.*;
-import org.richfaces.renderkit.html.DivPanelRenderer;
-
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorHolder;
+import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.JsfComponent;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+import org.richfaces.renderkit.html.DivPanelRenderer;
+
/**
* @author akolonitsky
* @since 2010-10-19
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-17 19:09:37 UTC (rev 21742)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-17 19:14:59 UTC (rev 21743)
@@ -57,6 +57,7 @@
import org.richfaces.event.ItemChangeEvent;
import org.richfaces.event.ItemChangeListener;
import org.richfaces.event.ItemChangeSource;
+import org.richfaces.renderkit.util.RendererUtils;
import com.google.common.base.Strings;
@@ -215,10 +216,8 @@
} finally {
popComponentFromEL(context);
}
-
- if (isImmediate()) {
- executeValidate(context);
- }
+
+ createItemChangeEvent(context);
}
/**
@@ -303,7 +302,6 @@
popComponentFromEL(context);
- executeValidate(context);
try {
updateModel(context);
} catch (RuntimeException e) {
@@ -387,21 +385,7 @@
}
}
- private void executeValidate(FacesContext context) {
- try {
- validate(context);
- } catch (RuntimeException e) {
- context.renderResponse();
- throw e;
- }
-
- if (!isValid()) {
- context.validationFailed();
- context.renderResponse();
- }
- }
-
- public void validate(FacesContext context) {
+ private void createItemChangeEvent(FacesContext context) {
if (context == null) {
throw new NullPointerException();
}
@@ -416,19 +400,36 @@
setValue(activeItem);
setSubmittedActiveItem(null);
if (previous == null || !previous.equalsIgnoreCase(activeItem)) {
- queueEvent(new ItemChangeEvent(this, previous, activeItem));
+ UIComponent prevComp = null;
+ UIComponent actvComp = (UIComponent)getItem(activeItem);
+
+ if (previous != null) {
+ prevComp = (UIComponent)getItem(previous);
+ }
+ new ItemChangeEvent(this, previous, prevComp, activeItem, actvComp).queue();
}
}
-
+
@Override
public void queueEvent(FacesEvent event) {
if ((event instanceof ItemChangeEvent) && (event.getComponent() == this)) {
- setEventPhase(event);
+ setEventPhase((ItemChangeEvent)event);
}
-
super.queueEvent(event);
}
+ protected void setEventPhase(ItemChangeEvent event) {
+ if (isImmediate() || (event.getNewItem() != null &&
+ RendererUtils.getInstance().isBooleanAttribute(event.getNewItem(), "immediate"))) {
+ event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else if (isBypassUpdates() || (event.getNewItem() != null &&
+ RendererUtils.getInstance().isBooleanAttribute(event.getNewItem(), "bypassUpdates"))) {
+ event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
+ } else {
+ event.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ }
+ }
+
protected void setEventPhase(FacesEvent event) {
if (isImmediate()) {
event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
@@ -443,8 +444,7 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
- if (event instanceof ItemChangeEvent
- && (isBypassUpdates() || isImmediate())) {
+ if (event instanceof ItemChangeEvent) {
FacesContext.getCurrentInstance().renderResponse();
}
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21742 - trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-17 14:09:37 -0500 (Thu, 17 Feb 2011)
New Revision: 21742
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
Log:
https://issues.jboss.org/browse/RF-10544 Tooltip - hovering with direction=auto causes script to hang up (MyFaces)
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-02-17 19:01:06 UTC (rev 21741)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-02-17 19:09:37 UTC (rev 21742)
@@ -31,6 +31,7 @@
import org.richfaces.context.ExtendedPartialViewContext;
import org.richfaces.renderkit.HtmlConstants;
import org.richfaces.renderkit.MetaComponentRenderer;
+import org.richfaces.renderkit.RenderKitUtils;
import org.richfaces.renderkit.util.RendererUtils;
import javax.faces.application.ResourceDependencies;
@@ -176,19 +177,30 @@
AbstractTooltip tooltip = (AbstractTooltip) component;
Map<String, Object> options = new HashMap<String, Object>();
- options.put("ajax", getAjaxOptions(context, tooltip));
- options.put("jointPoint", tooltip.getJointPoint() != null ? tooltip.getJointPoint().getValue() : Positioning.DEFAULT);
- options.put("direction", tooltip.getDirection() != null ? tooltip.getDirection().getValue() : Positioning.DEFAULT);
- options.put("attached", tooltip.isAttached());
- options.put("offset", getOffset(tooltip));
- options.put("mode", tooltip.getMode());
- options.put("hideDelay", tooltip.getHideDelay());
- options.put("hideEvent", tooltip.getHideEvent());
- options.put("showDelay", tooltip.getShowDelay());
- options.put("showEvent", tooltip.getShowEvent());
- options.put("followMouse", tooltip.isFollowMouse());
- options.put("target", RENDERER_UTILS.findComponentFor(component, tooltip.getTarget()).getClientId(context));
+ RenderKitUtils.addToScriptHash(options, "ajax", getAjaxOptions(context, tooltip), TooltipMode.DEFAULT);
+
+ Positioning jointPoint = tooltip.getJointPoint();
+ if (jointPoint == null) {
+ jointPoint = org.richfaces.component.Positioning.DEFAULT;
+ }
+ Positioning direction =tooltip.getDirection();
+ if (direction == null) {
+ direction = org.richfaces.component.Positioning.DEFAULT;
+ }
+
+ RenderKitUtils.addToScriptHash(options, "jointPoint", jointPoint.getValue(), Positioning.DEFAULT.getValue());
+ RenderKitUtils.addToScriptHash(options, "direction", direction.getValue(), Positioning.DEFAULT.getValue());
+ RenderKitUtils.addToScriptHash(options, "attached", tooltip.isAttached(), true);
+ RenderKitUtils.addToScriptHash(options, "offset", getOffset(tooltip));
+ RenderKitUtils.addToScriptHash(options, "mode", tooltip.getMode(), TooltipMode.DEFAULT);
+ RenderKitUtils.addToScriptHash(options, "hideDelay", tooltip.getHideDelay(), 0);
+ RenderKitUtils.addToScriptHash(options, "hideEvent", tooltip.getHideEvent(), "mouseleave");
+ RenderKitUtils.addToScriptHash(options, "showDelay", tooltip.getShowDelay(), 0);
+ RenderKitUtils.addToScriptHash(options, "showEvent", tooltip.getShowEvent(), "mouseenter");
+ RenderKitUtils.addToScriptHash(options, "followMouse", tooltip.isFollowMouse(), true);
+ RenderKitUtils.addToScriptHash(options, "target", RENDERER_UTILS.findComponentFor(component, tooltip.getTarget()).getClientId(context));
+
addEventOption(context, tooltip, options, HIDE);
addEventOption(context, tooltip, options, SHOW);
addEventOption(context, tooltip, options, BEFORE_HIDE);
@@ -198,7 +210,15 @@
}
public Integer[] getOffset(AbstractTooltip tooltip) {
- return new Integer[] {tooltip.getHorizontalOffset(), tooltip.getVerticalOffset()};
+ int horizontalOffset=tooltip.getHorizontalOffset();
+ int verticalOffset=tooltip.getVerticalOffset();
+ if (horizontalOffset == Integer.MIN_VALUE){
+ horizontalOffset = 10;
+ }
+ if (verticalOffset == Integer.MIN_VALUE) {
+ verticalOffset = 10;
+ }
+ return new Integer[] {horizontalOffset, verticalOffset};
}
private void encodeContentEnd(ResponseWriter writer, FacesContext context, AbstractTooltip tooltip) throws IOException {
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21741 - trunk/core/impl/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-17 14:01:06 -0500 (Thu, 17 Feb 2011)
New Revision: 21741
Removed:
trunk/core/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java
Log:
Removed deprecated GradientA.java
Deleted: trunk/core/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java 2011-02-17 18:32:04 UTC (rev 21740)
+++ trunk/core/impl/src/main/java/org/richfaces/renderkit/html/GradientA.java 2011-02-17 19:01:06 UTC (rev 21741)
@@ -1,36 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.renderkit.html;
-
-import javax.faces.context.FacesContext;
-
-import org.richfaces.skin.Skin;
-
-public class GradientA extends BaseGradient {
-
- @Override
- protected void initializeProperties(FacesContext context, Skin skin) {
- super.initializeProperties(context, skin);
- setBaseColorParam(Skin.HEADER_GRADIENT_COLOR);
- setGradientColorParam(Skin.HEADER_BACKGROUND_COLOR);
- }
-}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21740 - in trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources: src/main and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-17 13:32:04 -0500 (Thu, 17 Feb 2011)
New Revision: 21740
Removed:
trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/
Modified:
trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml
trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml
trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml
Log:
https://issues.jboss.org/browse/RF-10452
Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2011-02-17 17:44:39 UTC (rev 21739)
+++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2011-02-17 18:32:04 UTC (rev 21740)
@@ -36,24 +36,6 @@
<build>
<finalName>${artifactId}</finalName>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/java-gae-jsf-ri</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -105,6 +87,10 @@
<skin>ruby</skin>
<skin>wine</skin>
</skins>
+ <excludedFiles>
+ <exclude>^\Qorg.richfaces.renderkit.html.images.\E.*</exclude>
+ <exclude>^\Qorg.richfaces.renderkit.html.iconimages.\E.*</exclude>
+ </excludedFiles>
<includedContentTypes>
<include>application/javascript</include>
<include>text/css</include>
@@ -208,12 +194,12 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml
===================================================================
--- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-02-17 17:44:39 UTC (rev 21739)
+++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-02-17 18:32:04 UTC (rev 21740)
@@ -9,4 +9,8 @@
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties" />
</system-properties>
+
+ <resource-files>
+ <exclude path="/static-resources/**" />
+ </resource-files>
</appengine-web-app>
\ No newline at end of file
Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml
===================================================================
--- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml 2011-02-17 17:44:39 UTC (rev 21739)
+++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml 2011-02-17 18:32:04 UTC (rev 21740)
@@ -35,6 +35,18 @@
<param-value>client</param-value>
</context-param>
<context-param>
+ <param-name>org.apache.myfaces.SECRET</param-name>
+ <param-value>UmljaEZhY2VzVGVtcEtleQ==</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.MAC_SECRET</param-name>
+ <param-value>UmljaEZhY2VzVGVtcEtleQ==</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.algorithm</param-name>
+ <param-value>Blowfish</param-value>
+ </context-param>
+ <context-param>
<param-name>org.richfaces.staticResourceLocation</param-name>
<param-value>${symbol_pound}{facesContext.externalContext.requestContextPath}/static-resources/${symbol_pound}{resourceLocation}</param-value>
</context-param>
@@ -44,32 +56,17 @@
<param-value>org.ajax4jsf.cache.lru.LRUMapCacheFactory</param-value>
</context-param>
+ <!--
+ We need to set annotation lifecycyle provider manually as org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider.
+ Other providers use some classes that are restricted on Google App Engine.
+ -->
<context-param>
- <description>
- Set this flag to true if you want the JavaServer Faces
- Reference Implementation to validate the XML in your
- faces-config.xml resources against the DTD. Default
- value is false.
- </description>
- <param-name>com.sun.faces.validateXml</param-name>
- <param-value>true</param-value>
+ <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name>
+ <param-value>org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider</param-value>
</context-param>
- <!-- ***** Accommodate Single-Threaded Requirement of Google AppEngine -->
- <context-param>
- <description>
- When enabled, the runtime initialization and default ResourceHandler
- implementation will use threads to perform their functions. Set this
- value to false if threads aren't desired (as in the case of running
- within the Google Application Engine).
- Note that when this option is disabled, the ResourceHandler will not
- pick up new versions of resources when ProjectStage is development.
- </description>
- <param-name>com.sun.faces.enableThreading</param-name>
- <param-value>false</param-value>
- </context-param>
<context-param>
- <param-name>com.sun.faces.expressionFactory</param-name>
+ <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
<param-value>com.sun.el.ExpressionFactoryImpl</param-value>
</context-param>
<context-param>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21739 - in trunk/examples/richfaces-showcase: src/main and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-17 12:44:39 -0500 (Thu, 17 Feb 2011)
New Revision: 21739
Removed:
trunk/examples/richfaces-showcase/src/main/java-gae-jsf-ri/
Modified:
trunk/examples/richfaces-showcase/pom.xml
trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml
trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml
Log:
https://issues.jboss.org/browse/RF-10450
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2011-02-17 15:34:11 UTC (rev 21738)
+++ trunk/examples/richfaces-showcase/pom.xml 2011-02-17 17:44:39 UTC (rev 21739)
@@ -183,24 +183,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/java-gae-jsf-ri</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
@@ -245,6 +227,10 @@
<skin>ruby</skin>
<skin>wine</skin>
</skins>
+ <excludedFiles>
+ <exclude>^\Qorg.richfaces.renderkit.html.images.\E.*</exclude>
+ <exclude>^\Qorg.richfaces.renderkit.html.iconimages.\E.*</exclude>
+ </excludedFiles>
<includedContentTypes>
<include>application/javascript</include>
<include>text/css</include>
Modified: trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-02-17 15:34:11 UTC (rev 21738)
+++ trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-02-17 17:44:39 UTC (rev 21739)
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>richfaces-showcase</application>
- <version>21</version>
+ <version>28</version>
<sessions-enabled>true</sessions-enabled>
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties"/>
</system-properties>
+ <resource-files>
+ <exclude path="/static-resources/**" />
+ </resource-files>
+
</appengine-web-app>
Modified: trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml 2011-02-17 15:34:11 UTC (rev 21738)
+++ trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml 2011-02-17 17:44:39 UTC (rev 21739)
@@ -45,9 +45,29 @@
<param-value>client</param-value>
</context-param>
<context-param>
+ <param-name>org.apache.myfaces.SECRET</param-name>
+ <param-value>-- Insert some secret here --</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.MAC_SECRET</param-name>
+ <param-value>-- Insert some secret here --</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.algorithm</param-name>
+ <param-value>Blowfish</param-value>
+ </context-param>
+ <context-param>
<param-name>org.richfaces.staticResourceLocation</param-name>
<param-value>#{facesContext.externalContext.requestContextPath}/static-resources/#{resourceLocation}</param-value>
</context-param>
+ <!--
+ We need to set annotation lifecycyle provider manually as org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider.
+ Other providers use some classes that are restricted on Google App Engine.
+ -->
+ <context-param>
+ <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name>
+ <param-value>org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider</param-value>
+ </context-param>
<context-param>
<param-name>org.ajax4jsf.cache.CACHE_MANAGER_FACTORY_CLASS</param-name>
@@ -55,34 +75,11 @@
</context-param>
<context-param>
- <description>
- Set this flag to true if you want the JavaServer Faces
- Reference Implementation to validate the XML in your
- faces-config.xml resources against the DTD. Default
- value is false.
- </description>
- <param-name>com.sun.faces.validateXml</param-name>
- <param-value>true</param-value>
+ <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
</context-param>
- <!-- ***** Accommodate Single-Threaded Requirement of Google AppEngine -->
- <context-param>
- <description>
- When enabled, the runtime initialization and default ResourceHandler
- implementation will use threads to perform their functions. Set this
- value to false if threads aren't desired (as in the case of running
- within the Google Application Engine).
- Note that when this option is disabled, the ResourceHandler will not
- pick up new versions of resources when ProjectStage is development.
- </description>
- <param-name>com.sun.faces.enableThreading</param-name>
- <param-value>false</param-value>
- </context-param>
<context-param>
- <param-name>com.sun.faces.expressionFactory</param-name>
- <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
- </context-param>
- <context-param>
<param-name>org.richfaces.executeAWTInitializer</param-name>
<param-value>false</param-value>
</context-param>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21738 - in trunk: ui/input/ui/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-17 10:34:11 -0500 (Thu, 17 Feb 2011)
New Revision: 21738
Added:
trunk/core/impl/src/main/resources/META-INF/resources/richfaces-utils.js
Modified:
trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java
Log:
https://jira.jboss.org/browse/RF-8454
Added: trunk/core/impl/src/main/resources/META-INF/resources/richfaces-utils.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/richfaces-utils.js (rev 0)
+++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces-utils.js 2011-02-17 15:34:11 UTC (rev 21738)
@@ -0,0 +1,87 @@
+// RichFaces.utils
+// RichFaces.utils.cache
+(function ($, rf) {
+ rf.utils = rf.utils || {};
+
+ rf.utils.Cache = function (key, items, values, useCache) {
+ this.key = key.toLowerCase();
+ this.cache = {};
+ this.cache[this.key] = items || [];
+ this.originalValues = typeof values == "function" ? values(items) : values || this.cache[this.key];
+ this.values = processValues(this.originalValues);
+ this.useCache = useCache || checkValuesPrefix.call(this);
+ };
+
+ var processValues = function (values) {
+ var processedValues = [];
+ for (var i = 0; i<values.length; i++) {
+ processedValues.push(values[i].toLowerCase());
+ }
+ return processedValues;
+ };
+
+ var checkValuesPrefix = function () {
+ var result = true;
+ for (var i = 0; i<this.values.length; i++) {
+ if (this.values[i].indexOf(this.key)!=0) {
+ result = false;
+ break;
+ }
+ }
+ return result;
+ };
+
+ var getItems = function (key, filterFunction) {
+ key = key.toLowerCase();
+ var newCache = [];
+
+ if (key.length < this.key.length) {
+ return newCache;
+ }
+
+ if (this.cache[key]) {
+ newCache = this.cache[key];
+ } else {
+ var useCustomFilterFunction = typeof filterFunction == "function";
+ var itemsCache = this.cache[this.key];
+ for (var i = 0; i<this.values.length; i++) {
+ var value = this.values[i];
+ if (useCustomFilterFunction && filterFunction(key, value)) {
+ newCache.push(itemsCache[i]);
+ } else {
+ var p = value.indexOf(key);
+ if (p == 0) {
+ newCache.push(itemsCache[i]);
+ }
+ }
+ }
+
+ if ((!this.lastKey || key.indexOf(this.lastKey)!=0) && newCache.length > 0) {
+ this.cache[key] = newCache;
+ if (newCache.length==1) {
+ this.lastKey = key;
+ }
+ }
+ }
+
+ return newCache;
+ };
+
+ var getItemValue = function (item) {
+ return this.originalValues[this.cache[this.key].index(item)];
+ };
+
+ var isCached = function (key) {
+ key = key.toLowerCase();
+ return this.cache[key] || this.useCache && key.indexOf(this.key)==0;
+ };
+
+ $.extend(rf.utils.Cache.prototype, (function () {
+ return {
+ getItems: getItems,
+ getItemValue: getItemValue,
+ isCached: isCached
+ };
+ })());
+
+})(jQuery, RichFaces);
\ No newline at end of file
Modified: trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-17 15:26:41 UTC (rev 21737)
+++ trunk/core/impl/src/main/resources/META-INF/resources/richfaces.js 2011-02-17 15:34:11 UTC (rev 21738)
@@ -594,93 +594,4 @@
} else {
window.attachEvent("onunload", richfaces.cleanDom);
}
-}(jQuery, RichFaces));
-
-// RichFaces.utils
-// RichFaces.utils.cache
-(function ($, rf) {
- rf.utils = rf.utils || {};
-
- rf.utils.Cache = function (key, items, values, useCache) {
- this.key = key.toLowerCase();
- this.cache = {};
- this.cache[this.key] = items || [];
- this.originalValues = typeof values == "function" ? values(items) : values || this.cache[this.key];
- this.values = processValues(this.originalValues);
- this.useCache = useCache || checkValuesPrefix.call(this);
- };
-
- var processValues = function (values) {
- var processedValues = [];
- for (var i = 0; i<values.length; i++) {
- processedValues.push(values[i].toLowerCase());
- }
- return processedValues;
- };
-
- var checkValuesPrefix = function () {
- var result = true;
- for (var i = 0; i<this.values.length; i++) {
- if (this.values[i].indexOf(this.key)!=0) {
- result = false;
- break;
- }
- }
- return result;
- };
-
- var getItems = function (key, filterFunction) {
- key = key.toLowerCase();
- var newCache = [];
-
- if (key.length < this.key.length) {
- return newCache;
- }
-
- if (this.cache[key]) {
- newCache = this.cache[key];
- } else {
- var useCustomFilterFunction = typeof filterFunction == "function";
- var itemsCache = this.cache[this.key];
- for (var i = 0; i<this.values.length; i++) {
- var value = this.values[i];
- if (useCustomFilterFunction && filterFunction(key, value)) {
- newCache.push(itemsCache[i]);
- } else {
- var p = value.indexOf(key);
- if (p == 0) {
- newCache.push(itemsCache[i]);
- }
- }
- }
-
- if ((!this.lastKey || key.indexOf(this.lastKey)!=0) && newCache.length > 0) {
- this.cache[key] = newCache;
- if (newCache.length==1) {
- this.lastKey = key;
- }
- }
- }
-
- return newCache;
- };
-
- var getItemValue = function (item) {
- return this.originalValues[this.cache[this.key].index(item)];
- };
-
- var isCached = function (key) {
- key = key.toLowerCase();
- return this.cache[key] || this.useCache && key.indexOf(this.key)==0;
- };
-
- $.extend(rf.utils.Cache.prototype, (function () {
- return {
- getItems: getItems,
- getItemValue: getItemValue,
- isCached: isCached
- };
- })());
-
-})(jQuery, RichFaces);
-
+}(jQuery, RichFaces));
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2011-02-17 15:26:41 UTC (rev 21737)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2011-02-17 15:34:11 UTC (rev 21738)
@@ -67,6 +67,7 @@
*/
@ResourceDependencies({
@ResourceDependency(library = "org.richfaces", name = "ajax.reslib"),
+ @ResourceDependency(name = "richfaces-utils.js"),
@ResourceDependency(library = "org.richfaces", name = "base-component.reslib"),
@ResourceDependency(name = "jquery.position.js"), @ResourceDependency(name = "richfaces-event.js"),
@ResourceDependency(name = "richfaces-selection.js"),
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java 2011-02-17 15:26:41 UTC (rev 21737)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/SelectRendererBase.java 2011-02-17 15:34:11 UTC (rev 21738)
@@ -40,7 +40,8 @@
*/
@ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"),
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"),
- @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "jquery.position.js"),
+ @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-utils.js"),
+ @ResourceDependency(name = "jquery.position.js"),
@ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"),
@ResourceDependency(name = "richfaces-selection.js"),
@ResourceDependency(library = "org.richfaces", name = "inputBase.js"),
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21737 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richTab and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-02-17 10:26:41 -0500 (Thu, 17 Feb 2011)
New Revision: 21737
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java
Log:
added issue tracking info
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-02-17 15:08:29 UTC (rev 21736)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-02-17 15:26:41 UTC (rev 21737)
@@ -164,6 +164,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testLeftActiveIcon() {
JQueryLocator icon = leftIcon.format(1).getDescendant(jq("div.rf-ac-itm-ico-act"));
JQueryLocator input = pjq("select[id$=leftActiveIconInput]");
@@ -212,6 +213,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testName() {
selenium.type(pjq("input[id$=nameInput]"), "new name");
selenium.waitForPageToLoad();
@@ -231,7 +233,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9821")
+ @IssueTracking("https://issues.jboss.org/browse/RF-9821 https://issues.jboss.org/browse/RF-10488")
public void testOnenter() {
testFireEvent(Event.CLICK, itemHeaders[0], "enter");
}
@@ -262,7 +264,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9821")
+ @IssueTracking("https://issues.jboss.org/browse/RF-9821 https://issues.jboss.org/browse/RF-10488")
public void testOnleave() {
selenium.type(pjq("input[type=text][id$=onleaveInput]"), "metamerEvents += \"leave \"");
selenium.waitForPageToLoad();
@@ -315,6 +317,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testRightActiveIcon() {
JQueryLocator icon = rightIcon.format(1).getDescendant(jq("div.rf-ac-itm-ico-act"));
JQueryLocator input = pjq("select[id$=rightActiveIconInput]");
@@ -373,6 +376,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testSwitchTypeNull() {
guardXhr(selenium).click(itemHeaders[0]);
waitGui.failWith("Item 1 is not displayed.").until(isDisplayed.locator(itemContents[0]));
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-02-17 15:08:29 UTC (rev 21736)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-02-17 15:26:41 UTC (rev 21737)
@@ -219,6 +219,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testName() {
selenium.type(pjq("input[type=text][id$=nameInput]"), "metamer");
selenium.waitForPageToLoad();
@@ -241,7 +242,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9537")
+ @IssueTracking("https://issues.jboss.org/browse/RF-9537 https://issues.jboss.org/browse/RF-10488")
public void testOnenter() {
selenium.type(pjq("input[type=text][id$=onenterInput]"), "metamerEvents += \"enter \"");
selenium.waitForPageToLoad();
@@ -349,6 +350,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testSwitchTypeNull() {
guardXhr(selenium).click(inactiveHeaders[1]);
waitGui.failWith("Tab 2 is not displayed.").until(isDisplayed.locator(itemContents[1]));
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java 2011-02-17 15:08:29 UTC (rev 21736)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java 2011-02-17 15:26:41 UTC (rev 21737)
@@ -81,6 +81,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testName() {
selenium.type(pjq("input[type=text][id$=nameInput]"), "metamer");
selenium.waitForPageToLoad();
@@ -103,7 +104,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9895")
+ @IssueTracking("https://issues.jboss.org/browse/RF-9895 https://issues.jboss.org/browse/RF-10488")
public void testOnenter() {
selenium.type(pjq("input[type=text][id$=onenterInput]"), "metamerEvents += \"enter \"");
selenium.waitForPageToLoad();
@@ -192,6 +193,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10488")
public void testSwitchTypeNull() {
guardXhr(selenium).click(link2);
waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(item2));
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21736 - in modules/tests/metamer/trunk/application/src/main/webapp: components/a4jAjax and 65 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-17 10:08:29 -0500 (Thu, 17 Feb 2011)
New Revision: 21736
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
Log:
refactored - metadata should be immediate child of UIViewRoot (RFPL-1135)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jActionListener/all.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -25,16 +25,19 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
+
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
-
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="a4jActionListener.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputText id="input" value="#{a4jAjaxBean.input}"/>
<h:commandButton id="commandButton" value="Submit" >
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputText id="input" value="#{a4jAjaxBean.input}"/>
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputText id="input" value="#{a4jAjaxBean.input}"/>
<h:commandLink id="commandLink" value="Submit">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid columns="2">
<h:inputText id="input" value="#{a4jAjaxBean.input}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputSecret id="input" value="#{a4jAjaxBean.input}">
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputText.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputText id="input" value="#{a4jAjaxBean.input}">
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextWrapped.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputTextarea id="input" value="#{a4jAjaxBean.input}">
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectBooleanCheckbox id="selectBooleanCheckbox" value="#{a4jAjaxBean.boolVal}">
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectManyCheckbox id="selectManyCheckbox" value="#{a4jAjaxBean.cars}">
<f:selectItem itemValue="Audi" itemLabel="Audi"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectManyListbox id="selectManyListbox" value="#{a4jAjaxBean.cars}">
<f:selectItem itemValue="Audi"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectManyMenu id="selectManyMenu" value="#{a4jAjaxBean.cars}" >
<f:selectItem itemValue="Audi" itemLabel="Audi"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectOneListbox id="selectOneListbox" value="#{a4jAjaxBean.car}">
<f:selectItem itemValue="Audi"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectOneMenu id="selectOneMenu" value="#{a4jAjaxBean.car}" >
<f:selectItem itemValue="Audi" itemLabel="Audi"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:selectOneRadio id="selectOneRadio" value="#{a4jAjaxBean.car}">
<f:selectItem itemValue="Audi" itemLabel="Audi"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,14 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<script type="text/javascript">
function add(element) {
element.innerHTML = 1 + parseInt(element.innerHTML);
@@ -42,9 +44,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:queue id="queue1"
ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/namedQueue.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,14 +28,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<script type="text/javascript">
function add(element) {
element.innerHTML = 1 + parseInt(element.innerHTML);
@@ -43,9 +45,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:queue id="queue1"
name="namedQueue"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,14 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<script type="text/javascript">
function add(element) {
element.innerHTML = 1 + parseInt(element.innerHTML);
@@ -42,9 +44,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:queue id="queue1"
ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,14 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<script type="text/javascript">
function add(element) {
element.innerHTML = 1 + parseInt(element.innerHTML);
@@ -42,9 +44,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:queue id="queue1"
ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="panel" columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="panel" columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jJSFunction/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,19 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jJSFunction.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<fieldset id="outputFieldset">
<legend>standard outputs</legend>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jLog/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,19 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jLog.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:inputText id="nameInput" styleClass="nameInput" value="#{a4jLogBean.name}" />
<a4j:commandButton id="submitButton" value="Submit" render="out" execute="@form" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jMediaOutput.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jMediaOutput.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jMediaOutput.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jMediaOutput.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:commandButton id="button" value="Increase Counter" action="#{a4jOutputPanelBean.increaseCounterAction}"/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jParam/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,20 +27,19 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<h:outputStylesheet library="css" name="a4jParam.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:commandButton id="button1" value="A4J Command Button" render="output1,output2" >
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,21 +27,21 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
<f:viewParam name="enabled" value="#{a4jPollBean.attributes['enabled'].value}" />
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="a4jPoll.css"/>
<h:outputScript library="script" name="date-format.js" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGroup id="pollPanel">
<a4j:poll id="poll"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPush/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jPush.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jPush.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,13 +29,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="dontRenderForm" value="true" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="a4jQueue.css" />
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,13 +29,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="dontRenderForm" value="true" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="a4jQueue.css" />
<script type="text/javascript">
function add(element) {
@@ -44,12 +47,8 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
-
-
+
<a4j:queue id="a4jQueue"
ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}"
name="#{a4jQueueBean.attributes['name'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/nested.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,14 +26,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<h:outputStylesheet library="css" name="a4jRegion.css" />
<script type="text/javascript">/*<![CDATA[*/
@@ -53,9 +55,6 @@
/*]]>*/</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRegion/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jRegion.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jRegion.css" />
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/matrix.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,17 +26,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jRepeat.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jRepeat.css" />
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jRepeat/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jRepeat.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jRepeat.css" />
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/instantAttributes.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,18 +29,15 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="dontRenderForm" value="true" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:form id="componentForm">
<fieldset style="height: 3em"><legend>status
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/referencedUsage.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,18 +26,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<a4j:jsFunction id="statusFunction1" name="statusFunction1" status="status1" action="#{a4jStatusBean.delay}" />
<a4j:jsFunction id="statusFunction2" name="statusFunction2" status="status2" action="#{a4jStatusBean.delay}" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,9 +28,9 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="status" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/viewUsage.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,18 +29,15 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="dontRenderForm" value="true" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<fieldset style="height: 3em">
<legend>status (outside form)</legend>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/commandButton/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,18 +26,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="panel" columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/expressionLanguage/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="hDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="hDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="hDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="hDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="hDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:accordion id="accordion"
activeItem="#{richAccordionBean.attributes['activeItem'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:accordion id="accordion" activeItem="item3">
<rich:accordionItem id="item1"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:autocomplete id="autocomplete"
autofill="#{richAutocompleteBean.attributes['autofill'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/dataModel.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,13 +26,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.yellowDay {
background: yellow !important;
@@ -49,9 +52,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<div style="padding: 250px">
<rich:calendar id="calendar"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.yellowDay {
background: yellow !important;
@@ -78,9 +81,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<div style="padding: 250px">
<rich:calendar id="calendar"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.yellowDay {
background: yellow !important;
@@ -78,9 +81,6 @@
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<div style="padding: 250px">
<rich:calendar id="calendar"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
#{nonexistingbean.aaa}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:collapsiblePanel id="collapsiblePanel"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,19 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- <br/>
- </ui:define>
-
<ui:define name="component">
<rich:dataTable id="dataTable" value="#{richSubTableBean.lists}" var="list" keepSaved="true">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:dataTable id="dataTable" value="#{richSubTableBean.lists}" var="list" keepSaved="true">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,9 +28,9 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,9 +28,9 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,9 +27,9 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,9 +27,9 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/sorting-using-column.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,9 +27,9 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,9 +27,9 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/comparator.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,9 +28,9 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,9 +28,9 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,19 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
-
- </ui:define>
-
<ui:define name="component">
<rich:dataTable id="richDataTable"
rendered="true"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumn/sorting.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,9 +29,9 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/body.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:dataTable id="richDataTable" rows="10" value="#{model.employees}" var="record">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richColumnGroup/headerFooter.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:dataTable id="richDataTable" rows="10" value="#{model.employees}" var="record">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richComponentControl/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="richComponentControl.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- <br/>
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richComponentControl.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/a4jRepeat.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataGrid.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hGraphicImage.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataGrid.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/hSelectBooleanCheckbox.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataGrid.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataGrid.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataGrid/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataGrid.css" />
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataScroller.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,13 +29,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,13 +29,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,12 +29,15 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
- <ui:define name="head">
- <f:metadata>
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richDataTable" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richDataTable.css"/>
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -32,21 +32,19 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richTree" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
<ui:define name="head">
- <f:metadata>
- <f:viewParam name="templates" value="#{templateBean.templates}">
- <f:converter converterId="templatesListConverter" />
- </f:viewParam>
- <f:event type="preRenderView"
- listener="#{richTreeBean.preRenderView}" />
- </f:metadata>
<h:outputStylesheet library="css" name="richDragBehavior.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:dragIndicator id="indicator"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragSource/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -32,21 +32,19 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richTree" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
<ui:define name="head">
- <f:metadata>
- <f:viewParam name="templates" value="#{templateBean.templates}">
- <f:converter converterId="templatesListConverter" />
- </f:viewParam>
- <f:event type="preRenderView"
- listener="#{richTreeBean.preRenderView}" />
- </f:metadata>
<h:outputStylesheet library="css" name="richDragBehavior.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:dragIndicator id="indicator" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/sideMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-ddm-lbl-unsel {
border:1px solid #{a4jSkin.panelBorderColor} !important;
@@ -49,9 +52,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid styleClass="vertical-menu-cell" columnClasses="optionList" columns="1" cellspacing="0" cellpadding="0">
<rich:dropDownMenu id="menu1"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropDownMenu/topMenu.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.pic {
margin-bottom: -4px;
@@ -49,9 +52,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:toolbar id="toolbar" height="26px">
<rich:dropDownMenu id="menu1"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -32,15 +32,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richTree" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
<ui:define name="head">
- <f:metadata>
- <f:viewParam name="templates" value="#{templateBean.templates}">
- <f:converter converterId="templatesListConverter" />
- </f:viewParam>
- <f:event type="preRenderView"
- listener="#{richTreeBean.preRenderView}" />
- </f:metadata>
<h:outputStylesheet library="css" name="richDragBehavior.css" />
</ui:define>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt-c {
height: 30px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt-c {
height: 70px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt {
width: 215px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,13 +29,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt-c {
height: 30px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,13 +29,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt {
width: 300px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt {
width: 300px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt {
width: 215px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt-c {
height: 30px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,13 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richEDT" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.rf-edt-c {
height: 30px !important;
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:fileUpload id="fileUpload"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFunctions/all.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,20 +26,19 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richFunctions.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<f:subview id="subview">
<h:outputLabel value="input: " for="input" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richHashParam/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:popupPanel id="popupPanel" resizeable="true"
header="Popup panel shown using rich:componentControl and rich:hashParam">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inplaceInput id="inplaceInput"
changedStateClass="#{richInplaceInputBean.attributes['changedStateClass'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inplaceInput id="inplaceInput"
changedStateClass="#{richInplaceInputBean.attributes['changedStateClass'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inplaceSelect id="inplaceSelect"
changedStateClass="#{richInplaceSelectBean.attributes['changedStateClass'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inplaceSelect id="inplaceSelect"
changedStateClass="#{richInplaceSelectBean.attributes['changedStateClass'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inputNumberSlider id="slider"
accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inputNumberSlider id="slider"
accesskey="#{richInputNumberSliderBean.attributes['accesskey'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,21 +27,21 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<script type="text/javascript">
testedComponentId = "#{rich:clientId('spinner')}";
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inputNumberSpinner id="spinner"
accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSpinner/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,21 +27,21 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<script type="text/javascript">
testedComponentId = "#{rich:clientId('spinner')}";
</script>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:inputNumberSpinner id="spinner"
accesskey="#{richInputNumberSpinnerBean.attributes['accesskey'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="richJQuery.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richJQuery.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/scroller.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,15 +28,17 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richList" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richList.css" />
-
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,15 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richList.css" />
-
</ui:define>
<ui:define name="outOfTemplateBefore">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.pic {
margin-bottom: -4px;
@@ -49,9 +52,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:toolbar id="toolbar" height="26px" width="500px;">
<rich:dropDownMenu id="menu1" menu="ajax">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.pic {
margin-bottom: -4px;
@@ -49,9 +52,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:toolbar id="toolbar" height="26px">
<rich:dropDownMenu id="menu1" mode="ajax">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuSeparator/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,13 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.pic {
margin-bottom: -4px;
@@ -49,9 +52,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:toolbar id="toolbar" height="26px">
<rich:dropDownMenu id="menu1" mode="ajax">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/customLook.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,20 +26,20 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<h:outputStylesheet library="css" name="richPanel.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<style type="text/css">
.rf-panel-header {
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/nested.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,17 +26,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="richPanel.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richPanel.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="richPanel.css"/>
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="richPanel.css"/>
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:panelMenu id="panelMenu"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuGroup/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:panelMenu id="panelMenu" style="width: 300px;"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenuItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:panelMenu id="panelMenu" style="width: 250px; "
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/outsideForm.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,18 +29,15 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="dontRenderForm" value="true" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:commandButton id="openPanelButton" value="Call the popup">
<rich:componentControl target="popupPanel" operation="show" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPopupPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:commandButton id="openPanelButton" value="Call the popup">
<rich:componentControl target="popupPanel" operation="show" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:progressBar id="progressBar"
data="#{richProgressBarBean.attributes['data'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<script type="text/javascript">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="settingsPanel" columns="2">
Children rendered: <h:selectBooleanCheckbox id="childrenRendered" value="#{richProgressBarBean.childrenRendered}" onclick="submit()" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/fAjax.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:select id="select"
converterMessage="#{richSelectBean.attributes['converterMessage'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:select id="select"
converterMessage="#{richSelectBean.attributes['converterMessage'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:tabPanel id="tabPanel">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:tabPanel id="tabPanel"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/accordion.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="panel1Controls" columns="6">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/tabPanel.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="panel1Controls" columns="6">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToggleControl/togglePanel.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:panelGrid id="panel1Controls" columns="6">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/rf9013.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -26,18 +26,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:commandLink id="tcLink1" value="Toggle Panel Item 1">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:outputText id="time" value="#{phasesBean.date}">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanelItem/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,18 +27,15 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h:commandLink id="tcLink1" value="Toggle Panel Item 1">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbar/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,12 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.pic {
margin-right: 2px;
@@ -46,9 +50,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:toolbar id="toolbar"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richToolbarGroup/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,12 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
<style type="text/css">
.pic {
margin-right: 2px;
@@ -46,9 +50,6 @@
</style>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:toolbar id="toolbar" height="28">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,14 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<h:outputStylesheet>
.sample-panel {
border: 1px solid black;
@@ -43,9 +45,6 @@
</h:outputStylesheet>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<rich:panel id="panel" style="width: 200px">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTooltip/targetting.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,14 +27,16 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
+ </ui:define>
+ <ui:define name="head">
<h:outputStylesheet>
.sample-panel {
border: 1px solid black;
@@ -43,9 +45,6 @@
</h:outputStylesheet>
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<div id="regular-div" class="sample-panel">Div with clientId="regular-div"</div>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -28,20 +28,16 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richTree" />
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
<f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" />
</f:metadata>
-
</ui:define>
- <ui:define name="outOfTemplateBefore">
- </ui:define>
-
<ui:define name="component">
<h3><b>rich:tree</b></h3>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -29,18 +29,14 @@
<ui:composition template="/templates/template.xhtml">
<ui:param name="componentId" value="richTree" />
- <ui:define name="head">
- <f:metadata>
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
<f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" />
</f:metadata>
-
</ui:define>
-
- <ui:define name="outOfTemplateBefore">
- </ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/uiRepeat/simple.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -27,17 +27,17 @@
-->
<ui:composition template="/templates/template.xhtml">
-
- <ui:define name="head">
- <f:metadata>
+
+ <ui:define name="view">
+ <f:metadata>
<f:viewParam name="templates" value="#{templateBean.templates}">
<f:converter converterId="templatesListConverter" />
</f:viewParam>
</f:metadata>
- <h:outputStylesheet library="css" name="a4jRepeat.css" />
</ui:define>
- <ui:define name="outOfTemplateBefore">
+ <ui:define name="head">
+ <h:outputStylesheet library="css" name="a4jRepeat.css" />
</ui:define>
<ui:define name="component">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2011-02-17 15:08:16 UTC (rev 21735)
+++ modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2011-02-17 15:08:29 UTC (rev 21736)
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:f="http://java.sun.com/jsf/core">
<!--
JBoss, Home of Professional Open Source
@@ -25,7 +25,11 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-
+
+ <f:view>
+
+ <ui:insert name="view"/>
+
<h:head>
<title><ui:insert name="pageTitle">Metamer</ui:insert></title>
<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
@@ -35,9 +39,11 @@
<h:outputStylesheet library="css" name="common.ecss" />
<h:outputScript library="script" name="common.js" />
<ui:insert name="head"/>
+
</h:head>
<h:body>
+
<h:form id="executeCheckerForm">
<h:selectBooleanCheckbox id="executeChecker" value="#{richBean.executeChecker}" style="display: none" />
</h:form>
@@ -88,4 +94,6 @@
</div>
</h:body>
+
+ </f:view>
</html>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21735 - trunk/bom.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-17 10:08:16 -0500 (Thu, 17 Feb 2011)
New Revision: 21735
Modified:
trunk/bom/pom.xml
Log:
https://issues.jboss.org/browse/RF-10506
Modified: trunk/bom/pom.xml
===================================================================
--- trunk/bom/pom.xml 2011-02-17 15:06:29 UTC (rev 21734)
+++ trunk/bom/pom.xml 2011-02-17 15:08:16 UTC (rev 21735)
@@ -149,12 +149,12 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
</dependency>
<!-- Misc -->
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21734 - trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-17 10:06:29 -0500 (Thu, 17 Feb 2011)
New Revision: 21734
Modified:
trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js
Log:
Fixed small typo in RegEx in push.js
Modified: trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js
===================================================================
--- trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js 2011-02-17 14:55:54 UTC (rev 21733)
+++ trunk/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js 2011-02-17 15:06:29 UTC (rev 21734)
@@ -51,7 +51,7 @@
var pushSessionId = null;
- var suspendMessageEndMarker = /(<!--[^>]+-->\s*)+/;
+ var suspendMessageEndMarker = /^(<!--[^>]+-->\s*)+/;
var messageCallback = function(response) {
var dataString = response.responseBody.replace(suspendMessageEndMarker, "");
15 years, 2 months
- 1
- 0