Author: awiner
Date: Tue Oct 24 15:40:37 2006
New Revision: 467515
URL: http://svn.apache.org/viewvc?view=rev&rev=467515
Log:
"id" is allowed to be an rtexprvalue in JSP 2.1, though not a ValueExpression.
Also, "binding" is really a ValueExpression, not a ValueBinding; make the
metadata say that, though it isn't actually used anywhere
Modified:
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
Modified:
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?view=diff&rev=467515&r1=467514&r2=467515
==============================================================================
---
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
(original)
+++
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
Tue Oct 24 15:40:37 2006
@@ -396,7 +396,7 @@
stream.writeEndElement();
// converters need an id attribute
- _writeTagAttribute(stream, "id", "the identifier for the component", null,
null);
+ _writeTagAttribute(stream, "id", "the identifier for the converter", null,
null);
Iterator properties = converter.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
@@ -517,6 +517,19 @@
stream.writeEndElement();
}
+ else
+ {
+ stream.writeCharacters("\n ");
+ stream.writeStartElement("rtexprvalue");
+ // As of JSF 1.2, "id" can be set via an rtexprvalue (but
+ // *not* by a ValueExpression) - it has to be evaluated
+ // in the JSP
+ if ("id".equals(propertyName))
+ stream.writeCharacters("true");
+ else
+ stream.writeCharacters("false");
+ stream.writeEndElement();
+ }
}
}
@@ -550,7 +563,7 @@
}
// validators need an id attribute
- _writeTagAttribute(stream, "id", "the identifier for the component", null,
null);
+ _writeTagAttribute(stream, "id", "the identifier for the validator", null,
null);
Iterator properties = validator.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
Modified:
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml?view=diff&rev=467515&r1=467514&r2=467515
==============================================================================
---
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
(original)
+++
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
Tue Oct 24 15:40:37 2006
@@ -47,7 +47,7 @@
<description>a binding reference to store the component instance
</description>
<property-name>binding</property-name>
- <property-class>javax.faces.el.ValueBinding</property-class>
+ <property-class>javax.el.ValueExpression</property-class>
</property>
<property>
<property-name>transient</property-name>
Modified:
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?view=diff&rev=467515&r1=467514&r2=467515
==============================================================================
---
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
(original)
+++
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
Tue Oct 24 15:40:37 2006
@@ -54,8 +54,7 @@
* @todo Rename something less generic
* @todo Support extension mapping (*.faces)
* @todo The modification detection only works for a single user. That's
- * OK for now, because it's intended for use while developing, not while
- * deployed - yet it's on all the time. Hrm.
+ * OK for now, because it's intended for use while developing
*/
public class ViewHandlerImpl extends ViewHandlerWrapper
{
