You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/04/13 23:09:09 UTC
svn commit: r393942 - in /incubator/tobago/trunk: ./
core/src/main/java/org/apache/myfaces/tobago/taglib/extension/
core/src/site/ example/ example/facelets/
example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/
example/facelets/sr...
Author: bommel
Date: Thu Apr 13 14:09:07 2006
New Revision: 393942
URL: http://svn.apache.org/viewcvs?rev=393942&view=rev
Log:
more facelets support
Added:
incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/AttributeHandler.java
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/file.xhtml
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectManyListbox.xhtml
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneChoice.xhtml
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneListbox.xhtml
Modified:
incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
incubator/tobago/trunk/core/src/site/site.xml
incubator/tobago/trunk/example/facelets/pom.xml
incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/date.xhtml
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/in.xhtml
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/textarea.xhtml
incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/tobago-extension.taglib.xml
incubator/tobago/trunk/example/facelets/src/main/webapp/helloWorld.xml
incubator/tobago/trunk/example/pom.xml
incubator/tobago/trunk/pom.xml
Modified: incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Thu Apr 13 14:09:07 2006
@@ -43,21 +43,18 @@
@Tag(name = "selectManyListbox")
public class SelectManyListboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, IsDisabled, HasDeprecatedHeight, IsInline,
- HasLabel, //HasLabelAndAccessKey,
- IsRendered, HasBinding, HasTip, HasConverter, HasValidator {
+ HasLabel, IsRendered, HasBinding, HasTip, HasConverter, HasValidator {
private String required;
private String value;
private String disabled;
private String readonly;
private String onchange;
- private String labelWithAccessKey;
private String inline;
private String label;
private String rendered;
private String binding;
private String tip;
- private String accessKey;
private String height;
private String converter;
private String validator;
@@ -146,8 +143,6 @@
disabled = null;
inline = null;
label = null;
- labelWithAccessKey = null;
- accessKey = null;
height = null;
readonly = null;
rendered = null;
@@ -188,14 +183,6 @@
public void setHeight(String height) {
this.height = height;
- }
-
- public void setLabelWithAccessKey(String labelWithAccessKey) {
- this.labelWithAccessKey = labelWithAccessKey;
- }
-
- public void setAccessKey(String accessKey) {
- this.accessKey = accessKey;
}
public void setValidator(String validator) {
Modified: incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ incubator/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Thu Apr 13 14:09:07 2006
@@ -48,21 +48,18 @@
@Tag(name = "selectOneListbox")
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, IsDisabled,
- HasLabel, // HasLabelAndAccessKey,
- IsReadonly, HasOnchangeListener, IsRendered,
+ HasLabel, IsReadonly, HasOnchangeListener, IsRendered,
HasBinding, HasDeprecatedHeight, HasTip , IsRequired, HasConverter, HasValidator {
private String required;
private String value;
private String disabled;
private String readonly;
private String onchange;
- private String labelWithAccessKey;
private String inline;
private String label;
private String rendered;
private String binding;
private String tip;
- private String accessKey;
private String height;
private String converter;
private String validator;
@@ -84,13 +81,6 @@
if (rendered != null) {
labelTag.setRendered(rendered);
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- }*/
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -150,8 +140,6 @@
disabled = null;
inline = null;
label = null;
- labelWithAccessKey = null;
- accessKey = null;
height = null;
readonly = null;
rendered = null;
@@ -194,13 +182,6 @@
this.height = height;
}
- public void setLabelWithAccessKey(String labelWithAccessKey) {
- this.labelWithAccessKey = labelWithAccessKey;
- }
-
- public void setAccessKey(String accessKey) {
- this.accessKey = accessKey;
- }
public void setValidator(String validator) {
this.validator = validator;
Modified: incubator/tobago/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/core/src/site/site.xml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/core/src/site/site.xml (original)
+++ incubator/tobago/trunk/core/src/site/site.xml Thu Apr 13 14:09:07 2006
@@ -2,7 +2,7 @@
<project name="Tobago core">
<bannerLeft>
<name>Tobago</name>
- <src>http://tobago.atanion.net/site/images/tobago_head.gif</src>
+ <src>http://myfaces.apache.org/tobago/images/tobago_head.gif</src>
<href>http://myfaces.apache.org/tobago</href>
</bannerLeft>
<bannerRight>
Modified: incubator/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/pom.xml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/pom.xml (original)
+++ incubator/tobago/trunk/example/facelets/pom.xml Thu Apr 13 14:09:07 2006
@@ -16,8 +16,9 @@
* limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -86,18 +87,15 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.el</groupId>
<artifactId>el-ri</artifactId>
<version>1.0</version>
- <scope>runtime</scope>
</dependency><dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.0.14</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
Added: incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/AttributeHandler.java?rev=393942&view=auto
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/AttributeHandler.java (added)
+++ incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/AttributeHandler.java Thu Apr 13 14:09:07 2006
@@ -0,0 +1,75 @@
+package org.apache.myfaces.tobago.example.facelets;
+
+/*
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import javax.el.ELException;
+import javax.el.MethodExpression;
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+import javax.faces.component.EditableValueHolder;
+
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.FaceletException;
+import com.sun.facelets.el.ELAdaptor;
+import com.sun.facelets.el.LegacyMethodBinding;
+import com.sun.facelets.tag.TagAttribute;
+import com.sun.facelets.tag.TagConfig;
+import com.sun.facelets.tag.TagException;
+import com.sun.facelets.tag.TagHandler;
+
+public final class AttributeHandler extends TagHandler {
+ private static final Class [] VALIDATOR =
+ new Class[] { FacesContext.class, UIComponent.class, Object.class } ;
+
+ private final TagAttribute name;
+
+ private final TagAttribute value;
+
+ public AttributeHandler(TagConfig config) {
+ super(config);
+ this.name = this.getRequiredAttribute("name");
+ this.value = this.getRequiredAttribute("value");
+ }
+
+ public void apply(FaceletContext ctx, UIComponent parent)
+ throws FacesException, FaceletException, ELException {
+ if (parent == null) {
+ throw new TagException(tag, "Parent UIComponent was null");
+ }
+
+ if (parent.getParent() == null) {
+ String nameValue = name.getValue(ctx);
+ if ("rendered".equals(nameValue)) {
+ parent.setRendered(value.getBoolean(ctx));
+ } else if (parent instanceof EditableValueHolder
+ && "validator".equals(nameValue)) {
+ MethodExpression methodExpression = value.getMethodExpression(ctx, null, VALIDATOR);
+ ((EditableValueHolder) parent).setValidator(new LegacyMethodBinding(methodExpression));
+ } else if (!parent.getAttributes().containsKey(nameValue)) {
+ if (value.isLiteral()) {
+ parent.getAttributes().put(nameValue, value.getValue());
+ } else {
+ ELAdaptor.setExpression(parent, nameValue, value
+ .getValueExpression(ctx, Object.class));
+ }
+ }
+ }
+ }
+}
+
+
Modified: incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java (original)
+++ incubator/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java Thu Apr 13 14:09:07 2006
@@ -16,6 +16,11 @@
* limitations under the License.
*/
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+
public class Counter {
private int count;
@@ -25,6 +30,16 @@
public void setCount(int count) {
this.count = count;
+ }
+
+ public void customValidator(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+ if (value == null) {
+ return;
+ }
+ if (!"tobago".equalsIgnoreCase(value.toString())) {
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Please type in 'Tobago'",
+ "Please type in 'Tobago'"));
+ }
}
}
Modified: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/date.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/date.xhtml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/date.xhtml (original)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/date.xhtml Thu Apr 13 14:09:07 2006
@@ -9,18 +9,12 @@
THIS TEXT WILL BE REMOVED
<ui:composition>
<tc:panel>
- <c:if test="${! empty rendered}">
- <f:attribute name="rendered" value="${rendered}" />
- </c:if>
<f:facet name="layout">
<tc:gridLayout columns="fixed;*"/>
</f:facet>
<tc:label value="${label}" for="@auto" tip="${tip}"/>
- <tc:date value="${value}" required="${required}" readonly="${readonly}"
- converter="${converter}" disabled="${disabled}" >
- <c:if test="${! empty validator}">
- <f:attribute name="validator" value="${validator}" />
- </c:if>
+ <tc:date value="${value}" required="${required}"
+ readonly="${readonly}" disabled="${disabled}">
<ui:insert/>
</tc:date>
</tc:panel>
Added: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/file.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/file.xhtml?rev=393942&view=auto
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/file.xhtml (added)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/file.xhtml Thu Apr 13 14:09:07 2006
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component">
+
+THIS TEXT WILL BE REMOVED
+<ui:composition>
+ <tc:panel rendered="${rendered}">
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;*"/>
+ </f:facet>
+ <tc:label value="${label}" for="@auto" tip="${tip}"/>
+ <tc:file value="${value}"
+ readonly="${readonly}" disabled="${disabled}">
+ <ui:insert/>
+ </tc:file>
+ </tc:panel>
+</ui:composition>
+THIS TEXT WILL BE REMOVED AS WELL
+
+</html>
\ No newline at end of file
Modified: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/in.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/in.xhtml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/in.xhtml (original)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/in.xhtml Thu Apr 13 14:09:07 2006
@@ -4,23 +4,18 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:tc="http://myfaces.apache.org/tobago/component">
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension" >
THIS TEXT WILL BE REMOVED
<ui:composition>
<tc:panel>
- <c:if test="${! empty rendered}">
- <f:attribute name="rendered" value="${rendered}" />
- </c:if>
<f:facet name="layout">
<tc:gridLayout columns="fixed;*"/>
</f:facet>
<tc:label value="${label}" for="@auto" tip="${tip}"/>
- <tc:in value="${value}" required="${required}" readonly="${readonly}"
- converter="${converter}" disabled="${disabled}" >
- <c:if test="${! empty validator}">
- <f:attribute name="validator" value="${validator}" />
- </c:if>
+ <tc:in value="${value}" required="${required}"
+ readonly="${readonly}" disabled="${disabled}" >
<ui:insert/>
</tc:in>
</tc:panel>
Added: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectManyListbox.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectManyListbox.xhtml?rev=393942&view=auto
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectManyListbox.xhtml (added)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectManyListbox.xhtml Thu Apr 13 14:09:07 2006
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component">
+
+THIS TEXT WILL BE REMOVED
+<ui:composition>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;*"/>
+ </f:facet>
+ <tc:label value="${label}" for="@auto" tip="${tip}"/>
+ <tc:selectManyListbox value="${value}" required="${required}"
+ readonly="${readonly}" disabled="${disabled}" >
+ <ui:insert/>
+ </tc:selectManyListbox>
+ </tc:panel>
+</ui:composition>
+THIS TEXT WILL BE REMOVED AS WELL
+
+</html>
\ No newline at end of file
Added: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneChoice.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneChoice.xhtml?rev=393942&view=auto
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneChoice.xhtml (added)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneChoice.xhtml Thu Apr 13 14:09:07 2006
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component">
+
+THIS TEXT WILL BE REMOVED
+<ui:composition>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;*"/>
+ </f:facet>
+ <tc:label value="${label}" for="@auto" tip="${tip}"/>
+ <tc:selectOneChoice value="${value}" required="${required}"
+ readonly="${readonly}" disabled="${disabled}">
+ <ui:insert/>
+ </tc:selectOneChoice>
+ </tc:panel>
+</ui:composition>
+THIS TEXT WILL BE REMOVED AS WELL
+
+</html>
\ No newline at end of file
Added: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneListbox.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneListbox.xhtml?rev=393942&view=auto
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneListbox.xhtml (added)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/selectOneListbox.xhtml Thu Apr 13 14:09:07 2006
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component">
+
+THIS TEXT WILL BE REMOVED
+<ui:composition>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="fixed;*"/>
+ </f:facet>
+ <tc:label value="${label}" for="@auto" tip="${tip}"/>
+ <tc:selectOneListbox value="${value}" required="${required}"
+ readonly="${readonly}" disabled="${disabled}">
+ <ui:insert/>
+ </tc:selectOneListbox>
+ </tc:panel>
+</ui:composition>
+THIS TEXT WILL BE REMOVED AS WELL
+
+</html>
\ No newline at end of file
Modified: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/textarea.xhtml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/textarea.xhtml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/textarea.xhtml (original)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/textarea.xhtml Thu Apr 13 14:09:07 2006
@@ -9,18 +9,12 @@
THIS TEXT WILL BE REMOVED
<ui:composition>
<tc:panel>
- <c:if test="${! empty rendered}">
- <f:attribute name="rendered" value="${rendered}" />
- </c:if>
<f:facet name="layout">
<tc:gridLayout columns="fixed;*"/>
</f:facet>
<tc:label value="${label}" for="@auto" tip="${tip}"/>
- <tc:textarea value="${value}" required="${required}" readonly="${readonly}"
- converter="${converter}" disabled="${disabled}" >
- <c:if test="${! empty validator}">
- <f:attribute name="validator" value="${validator}" />
- </c:if>
+ <tc:textarea value="${value}" required="${required}"
+ readonly="${readonly}" disabled="${disabled}">
<ui:insert/>
</tc:textarea>
</tc:panel>
Modified: incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/tobago-extension.taglib.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/tobago-extension.taglib.xml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/tobago-extension.taglib.xml (original)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/facelets/tags/tobago-extension.taglib.xml Thu Apr 13 14:09:07 2006
@@ -3,7 +3,7 @@
"-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
"facelet-taglib_1_0.dtd">
<facelet-taglib>
- <namespace>http://myfaces.apache.org/tobago/extension</namespace>
+ <namespace>http://myfaces.apache.org/tobago/facelet-extension</namespace>
<tag>
<tag-name>in</tag-name>
<source>in.xhtml</source>
@@ -16,4 +16,24 @@
<tag-name>textarea</tag-name>
<source>textarea.xhtml</source>
</tag>
+ <tag>
+ <tag-name>file</tag-name>
+ <source>file.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>selectOneChoice</tag-name>
+ <source>selectOneChoice.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>selectOneListbox</tag-name>
+ <source>selectOneListbox.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>selectManyListbox</tag-name>
+ <source>selectManyListbox.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>attribute</tag-name>
+ <handler-class>org.apache.myfaces.tobago.example.facelets.AttributeHandler</handler-class>
+ </tag>
</facelet-taglib>
Modified: incubator/tobago/trunk/example/facelets/src/main/webapp/helloWorld.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/facelets/src/main/webapp/helloWorld.xml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/facelets/src/main/webapp/helloWorld.xml (original)
+++ incubator/tobago/trunk/example/facelets/src/main/webapp/helloWorld.xml Thu Apr 13 14:09:07 2006
@@ -1,12 +1,14 @@
<f:view xmlns:f="http://java.sun.com/jsf/core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension">
+ xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension">
<tc:page>
<f:facet name="layout">
<tc:gridLayout/>
</f:facet>
<tc:out value="Hello World!"/>
- <tx:in label="foo" value="#{counter.count}"/>
+ <tx:in label="foo" value="#{counter.count}" >
+ <tx:attribute name="validator" value="#{counter.customValidator}" />
+ </tx:in>
<tc:button label="Count++" defaultCommand="true" />
</tc:page>
</f:view>
Modified: incubator/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/example/pom.xml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/example/pom.xml (original)
+++ incubator/tobago/trunk/example/pom.xml Thu Apr 13 14:09:07 2006
@@ -44,4 +44,13 @@
<module>nonfacesrequest</module>
<module>test</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>all-modules</id>
+ <modules>
+ <module>facelets</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: incubator/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/pom.xml?rev=393942&r1=393941&r2=393942&view=diff
==============================================================================
--- incubator/tobago/trunk/pom.xml (original)
+++ incubator/tobago/trunk/pom.xml Thu Apr 13 14:09:07 2006
@@ -329,10 +329,8 @@
</license>
</licenses>
- <!--todo: use profile to activate all modules-->
<modules>
<module>tobago-tool</module>
- <!--<module>example</module>-->
<module>core</module>
<module>theme</module>
</modules>
@@ -347,10 +345,16 @@
<id>website</id>
<url>scpexe://minotaur.apache.org/www/myfaces.apache.org/tobago/</url>
</site>
- <!--<site>-->
- <!--<id>website</id>-->
- <!--<url>scpexe://shrek/home/resource/tobago-site</url>-->
- <!--</site>-->
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>all-modules</id>
+ <modules>
+ <module>example</module>
+ <module>tobago-assembly</module>
+ </modules>
+ </profile>
+ </profiles>
</project>