Author: awiner
Date: Fri Oct 20 09:27:15 2006
New Revision: 466184
URL: http://svn.apache.org/viewvc?view=rev&rev=466184
Log:
Merge back JSF 1.2 modifications, one step at a time. Having svn problems with
some files
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/pom.xml
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/pom.xml?view=diff&rev=466184&r1=466183&r2=466184
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/pom.xml
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/pom.xml
Fri Oct 20 09:27:15 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>incubator-1.2-m1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -95,6 +95,7 @@
<faceletHandlerClass>org.apache.myfaces.trinidadinternal.facelets.TrinidadComponentHandler</faceletHandlerClass>
<typePrefix>org.apache</typePrefix>
<packageContains>org.apache</packageContains>
+ <jsfVersion>1.2</jsfVersion>
<force>true</force>
</configuration>
<executions>
@@ -169,6 +170,11 @@
</dependency>
<dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-build</artifactId>
</dependency>
@@ -179,8 +185,8 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<!-- "test" scope dependencies -->
@@ -215,11 +221,13 @@
<scope>test</scope>
</dependency>
+<!--
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
<scope>test</scope>
</dependency>
+-->
<dependency>
<groupId>commons-beanutils</groupId>
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld?view=diff&rev=466184&r1=466183&r2=466184
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld
Fri Oct 20 09:27:15 2006
@@ -14,200 +14,136 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";>
-<taglib>
+<taglib
+ xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd";
+ version="2.1">
+
+ <display-name>Apache Trinidad Core</display-name>
<tlib-version>11-m3</tlib-version>
- <jsp-version>1.2</jsp-version>
<short-name>tr</short-name>
<uri>http://myfaces.apache.org/trinidad</uri>
- <display-name>Apache Trinidad Core</display-name>
- <tag>
- <name>attribute</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.AttributeTag</tag-class>
- <body-content>empty</body-content>
- <description>
- The Attribute tag adds a property with the specified name and value
- to the component associated with the parent tag. It behaves the same
- as the JSF Attribute tag except that it creates a value binding for
- expressions instead of immediately evaluating it.
- </description>
- <attribute>
- <name>name</name>
- <rtexprvalue>false</rtexprvalue>
- <description>
- the name of the attribute
- </description>
- </attribute>
- <attribute>
- <name>value</name>
- <rtexprvalue>false</rtexprvalue>
- <description>
- the value of the attribute
- </description>
- </attribute>
- </tag>
-
-
- <tag>
- <name>validator</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.ValidatorTag</tag-class>
- <body-content>empty</body-content>
- <description>
- The Validator tag adds a new validator instance to the component
- associated with the parent tag. The new validator instance is found
- by evaluating a binding expression, or looking up a validator ID.
- This implements the JSF 1.2 definition of <f:validator>.
- </description>
- <attribute>
- <name>validatorId</name>
- <rtexprvalue>false</rtexprvalue>
- <description>
- the ID of a validator instance registered in faces-config.xml
- </description>
- </attribute>
- <attribute>
- <name>binding</name>
- <rtexprvalue>false</rtexprvalue>
- <description>
- the value binding expression to a property that returns a
- ValidatorInstance.
- </description>
- </attribute>
- </tag>
-
<tag>
<name>forEach</name>
<tag-class>org.apache.myfaces.trinidadinternal.taglib.ForEachTag</tag-class>
<description>
-The forEach tag is a replacement for the JSTL &lt;c:forEach&gt; tag
- that works with Apache Trinidad components. Today,
&lt;c:forEach&gt; cannot
- be used with any JSF components or tags. This tag brings that
functionality
- to JSF, but it is limited to Apache Trinidad tags. This tag also has
several limitations not found in &lt;c:forEach&gt;:
- <ul>
- <li>&lt;tr:forEach&gt; does not currently support
scenarios where the size of the "items" list or array changes from one request
to the next. It may be possible to work around this in specific scenarios by
manually deleting all children of the parent component
(&lt;tr:selectOneListbox&gt; in the above example), but this has not
yet been tested.</li>
- <li>&lt;tr:forEach&gt; does not support arbitrary
java.util.Collections; it can only iterate over java.util.Lists or
arrays.</li>
- <li>&lt;tr:forEach&gt; executes at the time the JSP tag
executes. So it
- does not have access to any EL variables that are created by JSF
components.
- For example, the &lt;tr:table&gt; creates an EL variable using
the value of
- the "var" attribute. However, this EL variable is not available
-to &lt;tr:forEach&gt;
- </li>
- </ul>
+The forEach tag is a replacement for the JSTL &lt;c:forEach&gt; tag.
+As of JSF 1.2/JSP 2.1/JSTL 1.2, the regular &lt;c:forEach&gt; tag
+does work with JSF components. However, it does not support varStatus
+with JSF! (Unlike c:forEach, tr:forEach doesn't currently support anything
+for "items" other than arrays and lists.)
</description>
<attribute>
- <name>items</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the items over which iteration takes place
</description>
+ <name>items</name>
+ <deferred-value/>
</attribute>
<attribute>
- <name>var</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the name of the variable to expose
</description>
+ <name>var</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
- <name>varStatus</name>
- <rtexprvalue>false</rtexprvalue>
<description>
Name of the exported scoped variable for the
status of the iteration.
</description>
+ <name>varStatus</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
- <name>begin</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the beginning index
</description>
+ <name>begin</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
- <name>end</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the ending index
</description>
+ <name>end</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
- <name>step</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the number of steps per iteration
</description>
+ <name>step</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
-
+
<tag>
- <name>setActionListener</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.SetActionListenerTag</tag-class>
- <body-content>empty</body-content>
<description>
The setActionListener tag provides a declarative syntax for assigning
values before an action fires
</description>
+ <name>setActionListener</name>
+
<tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.SetActionListenerTag</tag-class>
+ <body-content>empty</body-content>
<attribute>
- <name>to</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
<description>
the target for the value; must be an EL expression
</description>
+ <name>to</name>
+ <required>true</required>
+ <deferred-value/>
</attribute>
<attribute>
- <name>from</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
<description>
the source of the value; can be an EL expression or a constant value
</description>
+ <name>from</name>
+ <required>true</required>
+ <deferred-value/>
</attribute>
</tag>
<tag>
- <name>returnActionListener</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.ReturnActionListenerTag</tag-class>
- <body-content>empty</body-content>
<description>
The returnActionListener tag is a declarative way to allow an action
source to return
a value from a dialog or process.
</description>
+ <name>returnActionListener</name>
+
<tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.ReturnActionListenerTag</tag-class>
+ <body-content>empty</body-content>
<attribute>
- <name>value</name>
- <rtexprvalue>false</rtexprvalue>
<description>
The value to return as the dialog/process result.
This can be an EL expression or a constant value.
</description>
+ <name>value</name>
+ <deferred-value/>
</attribute>
</tag>
<tag>
- <name>resetActionListener</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.ResetActionListenerTag</tag-class>
- <body-content>empty</body-content>
<description>
The resetActionListener tag provides a declarative syntax for
resetting values before an action fires
</description>
+ <name>resetActionListener</name>
+
<tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.ResetActionListenerTag</tag-class>
+ <body-content>empty</body-content>
</tag>
<tag>
- <name>componentRef</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.ComponentRefTag</tag-class>
<description>
The componentRef tag adds declarative components onto the current
@@ -217,69 +153,68 @@
</description>
+ <name>componentRef</name>
+
<tag-class>org.apache.myfaces.trinidadinternal.taglib.ComponentRefTag</tag-class>
<attribute>
- <name>componentType</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
<description>
Identifies which declarative component to use.
All the available components must be
declared in a region-metadata.xml file.
</description>
+ <name>componentType</name>
+ <required>true</required>
+ <deferred-value/>
</attribute>
<attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
<description>
This ID must be unique within this page.
</description>
+ <name>id</name>
+ <required>true</required>
</attribute>
<attribute>
- <name>value</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
<description>
A value to pass to the component definition.
</description>
+ <name>value</name>
+ <required>false</required>
+ <deferred-value/>
</attribute>
<attribute>
- <name>rendered</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
<description>
Whether or not this component is rendered.
</description>
+ <name>rendered</name>
+ <required>false</required>
+ <deferred-value/>
</attribute>
</tag>
<tag>
- <name>componentDef</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.ComponentDefTag</tag-class>
<description>
The componentDef tag is used to define a component. Its primary purpose
is defining a "var" property so that the definition can refer to attributes
on this component's usage.
</description>
+ <name>componentDef</name>
+
<tag-class>org.apache.myfaces.trinidadinternal.taglib.ComponentDefTag</tag-class>
<attribute>
- <name>var</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the variable name to use when referencing attributes, that may be set
on this new component.
</description>
+ <name>var</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
<tag>
- <name>facetRef</name>
-
<tag-class>org.apache.myfaces.trinidadinternal.taglib.FacetRefTag</tag-class>
<description>
The facetRef tag is used to copy facets from a component
and paste them into its
@@ -289,12 +224,14 @@
<tr:componentDef>. In other words, a single facet cannot be
used more than once.
</description>
+ <name>facetRef</name>
+
<tag-class>org.apache.myfaces.trinidadinternal.taglib.FacetRefTag</tag-class>
<attribute>
- <name>facetName</name>
- <rtexprvalue>false</rtexprvalue>
<description>
the facet name to copy
</description>
+ <name>facetName</name>
+ <rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld?view=diff&rev=466184&r1=466183&r2=466184
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld
Fri Oct 20 09:27:15 2006
@@ -14,13 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";>
-<taglib>
+<taglib
+ xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd";
+ version="2.1">
+ <display-name>Apache Trinidad HTML</display-name>
<tlib-version>11-m3</tlib-version>
- <jsp-version>1.2</jsp-version>
<short-name>trh</short-name>
<uri>http://myfaces.apache.org/trinidad/html</uri>
- <display-name>Apache Trinidad HTML</display-name>
</taglib>
