myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r563680 [6/42] - in /myfaces/trinidad/branches/1.2.2-branch: plugins/ plugins/maven-faces-plugin/ plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/ plugins/maven-faces-plugin/src/main/java/org/apache/my...
Date Tue, 07 Aug 2007 22:18:42 GMT
Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml Tue Aug  7 15:18:22 2007
@@ -55,7 +55,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:required>false</mfp:required>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml Tue Aug  7 15:18:22 2007
@@ -59,7 +59,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:required>true</mfp:required>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml Tue Aug  7 15:18:22 2007
@@ -56,7 +56,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:required>true</mfp:required>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Poll.xml Tue Aug  7 15:18:22 2007
@@ -47,7 +47,7 @@
     <property>
       <description><![CDATA[a method reference to a poll listener]]></description>
       <property-name>pollListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.PollEvent</mfp:parameter-type>
@@ -56,7 +56,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <component-extension>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml Tue Aug  7 15:18:22 2007
@@ -52,7 +52,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:required>true</mfp:required>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectInput.xml Tue Aug  7 15:18:22 2007
@@ -36,8 +36,8 @@
     <component-class>org.apache.myfaces.trinidad.component.UIXSelectInput</component-class>
     <property>
       <description><![CDATA[a reference to an action method sent by the commandButton, or the static outcome of an action]]></description>
-      <property-name>action</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-name>actionExpression</property-name>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:return-type>java.lang.String</mfp:return-type>
@@ -46,6 +46,7 @@
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
         <mfp:state-holder>yes</mfp:state-holder>
+        <mfp:jsp-property-name>action</mfp:jsp-property-name>
       </property-extension>
     </property>
     <property>
@@ -66,7 +67,7 @@
     <property>
       <description><![CDATA[a method reference to an return listener]]></description>
       <property-name>returnListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:parameter-type>
@@ -75,7 +76,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <component-extension>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml Tue Aug  7 15:18:22 2007
@@ -76,7 +76,7 @@
          will be called when a new range is selected.]]>
       </description>
       <property-name>rangeChangeListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
@@ -85,7 +85,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <property>
@@ -105,7 +104,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:required>true</mfp:required>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/ShowDetail.xml Tue Aug  7 15:18:22 2007
@@ -62,7 +62,7 @@
     <property>
       <description><![CDATA[a method reference to a disclosure listener]]></description>
       <property-name>disclosureListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.DisclosureEvent</mfp:parameter-type>
@@ -71,7 +71,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <component-extension>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Table.xml Tue Aug  7 15:18:22 2007
@@ -49,7 +49,7 @@
     <property>
       <description><![CDATA[a method reference to a sort listener]]></description>
       <property-name>sortListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.SortEvent</mfp:parameter-type>
@@ -58,7 +58,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <property>
@@ -66,7 +65,7 @@
          will be called when a new range is selected.]]>
       </description>
       <property-name>rangeChangeListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
@@ -75,7 +74,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml Tue Aug  7 15:18:22 2007
@@ -75,7 +75,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:required>true</mfp:required>
       </property-extension>
     </property>
     <property>
@@ -94,7 +93,7 @@
     <property>
       <description><![CDATA[a method reference to a focus listener]]></description>
       <property-name>focusListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.FocusEvent</mfp:parameter-type>
@@ -103,7 +102,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
 

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml Tue Aug  7 15:18:22 2007
@@ -58,7 +58,7 @@
          will be called when a new range is selected.]]>
       </description>
       <property-name>rangeChangeListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RangeChangeEvent</mfp:parameter-type>
@@ -67,7 +67,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
     <component-extension>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/RowDisclosureEvent.xml Tue Aug  7 15:18:22 2007
@@ -28,7 +28,7 @@
     <property>
       <description><![CDATA[a method reference to an ExpansionListener]]></description>
       <property-name>rowDisclosureListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.RowDisclosureEvent</mfp:parameter-type>
@@ -37,7 +37,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
 

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/includes/SelectionEvent.xml Tue Aug  7 15:18:22 2007
@@ -28,7 +28,7 @@
     <property>
       <description><![CDATA[a method reference to a selection listener]]></description>
       <property-name>selectionListener</property-name>
-      <property-class>javax.faces.el.MethodBinding</property-class>
+      <property-class>javax.el.MethodExpression</property-class>
       <property-extension>
         <mfp:method-binding-signature>
           <mfp:parameter-type>org.apache.myfaces.trinidad.event.SelectionEvent</mfp:parameter-type>
@@ -37,7 +37,6 @@
         <mfp:property-metadata>
           <mfp:preferred>true</mfp:preferred>
         </mfp:property-metadata>
-        <mfp:state-holder>yes</mfp:state-holder>
       </property-extension>
     </property>
 

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/pom.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/pom.xml Tue Aug  7 15:18:22 2007
@@ -23,19 +23,18 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <name>Apache MyFaces Trinidad Examples</name>
   <artifactId>trinidad-example</artifactId>
 
-  <!-- FIXME: These connections are wrong for a SNAPSHOT
+<!-- TODO: enter proper values for this on the 1.2 branch
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.0.1</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/myfaces/trinidad/tags/trinidad-1.0.1</developerConnection>
   </scm>
   -->
-
 
   <modules>
     <module>trinidad-blank</module>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-blank/pom.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-blank/pom.xml Tue Aug  7 15:18:22 2007
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -109,15 +109,11 @@
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-api</artifactId>
-      <version>1.1.5</version>
-      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-impl</artifactId>
-      <version>1.1.5</version>
-      <scope>compile</scope>
     </dependency>
 
     <!-- Apache Trinidad -->

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/pom.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/pom.xml Tue Aug  7 15:18:22 2007
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<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"> 
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -18,17 +19,16 @@
     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"> 
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <name>Apache MyFaces Trinidad Demo</name>
-  <description>Apache MyFaces Trinidad Demo</description>
+  <name>Apache Trinidad Demo</name>
+  <description>Apache Trinidad Demo</description>
 
   <artifactId>trinidad-demo</artifactId>
   <packaging>war</packaging>
@@ -38,7 +38,7 @@
       <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-jdev-plugin</artifactId>
-        <version>1.0.2</version>
+        <version>1.2.2-SNAPSHOT</version>
         <configuration>
           <libraries>
             <library>JSP Runtime</library>
@@ -74,10 +74,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>jstl</groupId>
       <artifactId>jstl</artifactId>
-      <version>1.1.2</version>
-      <scope>runtime</scope>
     </dependency>
 
 <!-- Dependencies pulled in via myfaces/ri pom
@@ -120,30 +118,32 @@
       <artifactId>jsp-api</artifactId>
     </dependency>
 
-
-    <!-- Dependencies for Facelets
+    <!-- For SourceCodeServlet -->
     <dependency>
-      <groupId>com.sun.facelets</groupId>
-      <artifactId>jsf-facelets</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
-      <version>1.0alpha</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>el-ri</artifactId>
-      <version>1.0alpha</version>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+      <scope>compile</scope>
     </dependency>
-    -->
-
   </dependencies>
 
   <profiles>
+     <profile>
+       <id>jettyConfig</id>
+       <build>
+         <plugins>
+           <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.2rc0</version>
+             <configuration>
+               <scanIntervalSeconds>10</scanIntervalSeconds>
+             </configuration>
+           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <!-- By default the war examples use myfaces! :) -->
     <profile>
       <id>myfaces</id>
@@ -157,19 +157,17 @@
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
           <artifactId>myfaces-api</artifactId>
+          <version>1.2.0</version>
           <scope>compile</scope>
         </dependency>
 
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
           <artifactId>myfaces-impl</artifactId>
+          <version>1.2.0</version>
           <scope>runtime</scope>
         </dependency>
       </dependencies>
-      
-      <properties>
-        <jsf_implementation>MyFaces</jsf_implementation>
-      </properties>
     </profile>
 
     <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
@@ -185,29 +183,13 @@
         <dependency>
           <groupId>javax.faces</groupId>
           <artifactId>jsf-api</artifactId>
-          <version>1.1_02</version>
+          <version>1.2_04</version>
         </dependency>
         <dependency>
           <groupId>javax.faces</groupId>
           <artifactId>jsf-impl</artifactId>
-          <version>1.1_02</version>
-          <scope>runtime</scope>
+          <version>1.2_04</version>
         </dependency>
-
-        <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.1.0</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>commons-digester</groupId>
-          <artifactId>commons-digester</artifactId>
-          <version>1.5</version>
-          <scope>runtime</scope>
-        </dependency>
-
       </dependencies>
 
       <repositories>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java Tue Aug  7 15:18:22 2007
@@ -53,10 +53,10 @@
       }
     }
 
-    List<UIXCommand> children = parent.getChildren();
-    for (UIXCommand child : children)
+    List<UIComponent> children = parent.getChildren();
+    for (UIComponent child : children)
     {
-      FacesBean childFacesBean = child.getFacesBean();
+      FacesBean childFacesBean = ((UIXCommand) child).getFacesBean();
       FacesBean.Type type = childFacesBean.getType();
       PropertyKey selectedKey = type.findKey("selected");
       if (selectedKey != null)

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java Tue Aug  7 15:18:22 2007
@@ -61,7 +61,7 @@
   {
     _addChildren(context, component);
 
-    Map<String, UIComponent> attrs = component.getAttributes();
+    Map<String, Object> attrs = component.getAttributes();
     if (Boolean.TRUE.equals(attrs.get("readOnly")) ||
         Boolean.TRUE.equals(attrs.get("disabled")))
       return;

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-example-assembly/pom.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-example-assembly/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-examples/trinidad-example-assembly/pom.xml Tue Aug  7 15:18:22 2007
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad-example</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -99,4 +99,4 @@
     </profile>
   </profiles>
 
- </project>
\ No newline at end of file
+ </project>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/pom.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/pom.xml Tue Aug  7 15:18:22 2007
@@ -18,11 +18,11 @@
     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">
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
       <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-jdev-plugin</artifactId>
-        <version>1.0.2</version>
+        <version>1.2.2-SNAPSHOT</version>
         <configuration>
           <sourceRoots>
             <sourceRoot>src/main/java-templates/</sourceRoot>
@@ -127,6 +127,7 @@
           <renderKitPrefix>org.apache</renderKitPrefix>
           <packageContains>org.apache</packageContains>
           <removeRenderers>true</removeRenderers>
+          <jsfVersion>1.2</jsfVersion>
           <force>true</force>
         </configuration>
         <executions>
@@ -207,10 +208,15 @@
     </dependency>
 
     <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.myfaces.trinidad</groupId>
       <artifactId>trinidad-build</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.myfaces.trinidad</groupId>
       <artifactId>trinidad-api</artifactId>
@@ -228,7 +234,7 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
- 
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -254,12 +260,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>
@@ -270,13 +270,6 @@
       <groupId>com.sun.facelets</groupId>
       <artifactId>jsf-facelets</artifactId>
     </dependency>
-
-<!--
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
-    </dependency>
--->
 
   </dependencies>
 

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml Tue Aug  7 15:18:22 2007
@@ -1,119 +1,119 @@
-<?xml version="1.0" ?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-	   
--->
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee" >
-
-  <application>
-    <view-handler>org.apache.myfaces.trinidadinternal.application.ViewHandlerImpl</view-handler>
-    <state-manager>org.apache.myfaces.trinidadinternal.application.StateManagerImpl</state-manager>
-    <navigation-handler>org.apache.myfaces.trinidadinternal.application.NavigationHandlerImpl</navigation-handler>
-    <variable-resolver>org.apache.myfaces.trinidadinternal.el.TrinidadVariableResolver</variable-resolver>
-  </application>
-
-  <factory>
-    <render-kit-factory>org.apache.myfaces.trinidadinternal.renderkit.CoreRenderKitFactory</render-kit-factory>
-    <faces-context-factory>
-      org.apache.myfaces.trinidadinternal.context.FacesContextFactoryImpl
-    </faces-context-factory>
-  </factory>
-
-  <lifecycle>
-    <phase-listener>org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener</phase-listener>
-  </lifecycle>
-
-  <converter>
-    <converter-for-class>java.lang.Short</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.ShortConverter</converter-class>
-  </converter>
-  
-  <converter>
-    <converter-for-class>java.lang.Byte</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.ByteConverter</converter-class>
-  </converter>  
-
-  <converter>
-    <converter-for-class>java.lang.Integer</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.IntegerConverter</converter-class>
-  </converter>
-  
-  <converter>
-    <converter-for-class>java.lang.Long</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.LongConverter</converter-class>
-  </converter>
-  
-  <converter>
-    <converter-for-class>java.lang.Float</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.FloatConverter</converter-class>
-  </converter>  
-  
-  <converter>
-    <converter-for-class>java.lang.Double</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.DoubleConverter</converter-class>
-  </converter>        
-
-  <converter>
-    <description>Color Converter</description>
-    <converter-for-class>java.awt.Color</converter-for-class>
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.ColorConverter</converter-class>
-  </converter>
-
-  <converter>
-    <display-name>Date Time Converter</display-name>
-    <converter-for-class>java.util.Date</converter-for-class>   
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
-  </converter>
-  
-  <converter>
-    <display-name>Date Time Converter</display-name>
-    <converter-for-class>java.util.Calendar</converter-for-class>   
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
-  </converter>
-  
-  <converter>
-    <display-name>Number Converter</display-name>
-    <converter-for-class>java.lang.Number</converter-for-class>   
-    <converter-class>org.apache.myfaces.trinidadinternal.convert.NumberConverter</converter-class>
-  </converter>
-  
-  <referenced-bean>
-    <description>implicit object provided by Trinidad</description>
-    <display-name>Request Context</display-name>
-    <referenced-bean-name>requestContext</referenced-bean-name>
-    <referenced-bean-class>org.apache.myfaces.trinidad.context.RequestContext</referenced-bean-class>
-  </referenced-bean>
-
-  <referenced-bean>
-    <description>Trinidad Page Flow Scope Map</description>
-    <display-name>Page Flow Scope</display-name>
-    <referenced-bean-name>pageFlowScope</referenced-bean-name>
-    <referenced-bean-class>java.util.Map</referenced-bean-class>
-  </referenced-bean>
-
-  <render-kit>
-    <render-kit-id>org.apache.myfaces.trinidad.core.desktop</render-kit-id>
-    <render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.desktop.DesktopRenderKit</render-kit-class>
-  </render-kit>
-
-  <render-kit>
-    <render-kit-id>org.apache.myfaces.trinidad.core.pda</render-kit-id>
-    <render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.pda.PdaRenderKit</render-kit-class>
-  </render-kit>
-
+<?xml version="1.0" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+	   
+-->
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee" >
+
+  <application>
+    <view-handler>org.apache.myfaces.trinidadinternal.application.ViewHandlerImpl</view-handler>
+    <state-manager>org.apache.myfaces.trinidadinternal.application.StateManagerImpl</state-manager>
+    <navigation-handler>org.apache.myfaces.trinidadinternal.application.NavigationHandlerImpl</navigation-handler>
+    <el-resolver>org.apache.myfaces.trinidadinternal.el.TrinidadELResolver</el-resolver>
+  </application>
+
+  <factory>
+    <render-kit-factory>org.apache.myfaces.trinidadinternal.renderkit.CoreRenderKitFactory</render-kit-factory>
+    <faces-context-factory>
+      org.apache.myfaces.trinidadinternal.context.FacesContextFactoryImpl
+    </faces-context-factory>
+  </factory>
+
+  <lifecycle>
+    <phase-listener>org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener</phase-listener>
+  </lifecycle>
+
+  <converter>
+    <converter-for-class>java.lang.Short</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.ShortConverter</converter-class>
+  </converter>
+  
+  <converter>
+    <converter-for-class>java.lang.Byte</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.ByteConverter</converter-class>
+  </converter>  
+
+  <converter>
+    <converter-for-class>java.lang.Integer</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.IntegerConverter</converter-class>
+  </converter>
+  
+  <converter>
+    <converter-for-class>java.lang.Long</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.LongConverter</converter-class>
+  </converter>
+  
+  <converter>
+    <converter-for-class>java.lang.Float</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.FloatConverter</converter-class>
+  </converter>  
+  
+  <converter>
+    <converter-for-class>java.lang.Double</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.DoubleConverter</converter-class>
+  </converter>        
+
+  <converter>
+    <description>Color Converter</description>
+    <converter-for-class>java.awt.Color</converter-for-class>
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.ColorConverter</converter-class>
+  </converter>
+
+  <converter>
+    <display-name>Date Time Converter</display-name>
+    <converter-for-class>java.util.Date</converter-for-class>   
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
+  </converter>
+  
+  <converter>
+    <display-name>Date Time Converter</display-name>
+    <converter-for-class>java.util.Calendar</converter-for-class>   
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
+  </converter>
+  
+  <converter>
+    <display-name>Number Converter</display-name>
+    <converter-for-class>java.lang.Number</converter-for-class>   
+    <converter-class>org.apache.myfaces.trinidadinternal.convert.NumberConverter</converter-class>
+  </converter>
+  
+  <referenced-bean>
+    <description>implicit object provided by Trinidad</description>
+    <display-name>Request Context</display-name>
+    <referenced-bean-name>requestContext</referenced-bean-name>
+    <referenced-bean-class>org.apache.myfaces.trinidad.context.RequestContext</referenced-bean-class>
+  </referenced-bean>
+
+  <referenced-bean>
+    <description>Trinidad Page Flow Scope Map</description>
+    <display-name>Page Flow Scope</display-name>
+    <referenced-bean-name>pageFlowScope</referenced-bean-name>
+    <referenced-bean-class>java.util.Map</referenced-bean-class>
+  </referenced-bean>
+
+  <render-kit>
+    <render-kit-id>org.apache.myfaces.trinidad.core.desktop</render-kit-id>
+    <render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.desktop.DesktopRenderKit</render-kit-class>
+  </render-kit>
+
+  <render-kit>
+    <render-kit-id>org.apache.myfaces.trinidad.core.pda</render-kit-id>
+    <render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.pda.PdaRenderKit</render-kit-class>
+  </render-kit>
+
 </faces-config>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/tr-base.tld Tue Aug  7 15:18:22 2007
@@ -1,346 +1,291 @@
-<?xml version = "1.0" ?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-	   
--->
-<!DOCTYPE taglib 
-   PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-          "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-  <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>
-  <listener>
-    <listener-class>org.apache.myfaces.trinidadinternal.webapp.TrinidadListenerImpl</listener-class>
-  </listener>
-        
-    <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 &lt;f:validator&gt;.
-      </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 &amp;lt;c:forEach&amp;gt; tag
-                that works with Apache Trinidad components.  Today, &amp;lt;c:forEach&amp;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 &amp;lt;c:forEach&amp;gt;:
-        &lt;ul&gt;
-        &lt;li&gt;&amp;lt;tr:forEach&amp;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 (&amp;lt;tr:selectOneListbox&amp;gt; in the above example), but this has not yet been tested.&lt;/li&gt;
-        &lt;li&gt;&amp;lt;tr:forEach&amp;gt; does not support arbitrary java.util.Collections; it can only iterate over java.util.Lists or arrays.&lt;/li&gt;
-        &lt;li&gt;&amp;lt;tr:forEach&amp;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 &amp;lt;tr:table&amp;gt; creates an EL variable using the value of
-        the "var" attribute. However, this EL variable is not available 
-to &amp;lt;tr:forEach&amp;gt;     
-        &lt;/li&gt;
-        &lt;/ul&gt;
-      </description>
-
-      <attribute>
-        <name>items</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the items over which iteration takes place 
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>var</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the name of the variable to expose
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>varStatus</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          Name of the exported scoped variable for the
-          status of the iteration.
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>begin</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the beginning index 
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>end</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the ending index 
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>step</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the number of steps per iteration
-        </description>
-      </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>
-
-      <attribute>
-        <name>to</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the target for the value;  must be an EL expression
-        </description>
-      </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>
-      </attribute>
-   </tag>
-
-
-   <tag>
-      <name>fileDownloadActionListener</name>
-      <tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.FileDownloadActionListenerTag</tag-class>
-      <body-content>empty</body-content>
-      <description>
-        The fileDownloadActionListener tag provides a declarative syntax for downloading files to a user from a command component.
-      </description>
-
-      <attribute>
-        <name>contentType</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the content or mime type of the file - e.g., text/html or application/pdf
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>filename</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the desired or proposed filename.  If set, the user will typically be presented with a "Save File" dialog, though this is ultimately at the descretion of the user agent.
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>method</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          an EL binding to the method that will deliver the file contents.  The method must take two parameters, a FacesContext and an OutputStream.
-        </description>
-      </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>
-
-      <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>
-      </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>
-   </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
-      component tree. The declarative component is usually defined in a jsp
-      file.  It is currently experimental and should not be used by
-      developers.
-
-      </description>
-
-      <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>
-      </attribute>
-
-      <attribute>
-        <name>id</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          This ID must be unique within this page. 
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          A value to pass to the component definition.
-        </description>
-      </attribute>
-
-      <attribute>
-        <name>rendered</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          Whether or not this component is rendered.
-        </description>
-      </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>
-      <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>
-      </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
-        definition. This tag may only be used within an &lt;tr:componentDef&gt;
-        tag.
-        Each facet may be used only once within each 
-        &lt;tr:componentDef&gt;. In other words, a single facet cannot be
-        used more than once.
-      </description>
-      <attribute>
-        <name>facetName</name>
-        <rtexprvalue>false</rtexprvalue>
-        <description>
-          the facet name to copy
-        </description>
-      </attribute>
-    </tag>        
-
-</taglib>
+<?xml version = "1.0" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+	   
+-->
+<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>1.2.2</tlib-version>
+  <short-name>tr</short-name>
+  <uri>http://myfaces.apache.org/trinidad</uri>
+  <listener>
+    <listener-class>org.apache.myfaces.trinidadinternal.webapp.TrinidadListenerImpl</listener-class>
+  </listener>
+
+   <tag>
+      <description>
+The forEach tag is a replacement for the JSTL &amp;lt;c:forEach&amp;gt; tag. 
+As of JSF 1.2/JSP 2.1/JSTL 1.2, the regular &amp;lt;c:forEach&amp;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>
+      <name>forEach</name>
+      <tag-class>org.apache.myfaces.trinidadinternal.taglib.ForEachTag</tag-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+        <description>
+          the items over which iteration takes place 
+        </description>
+        <name>items</name>
+        <deferred-value/>
+      </attribute>
+
+      <attribute>
+        <description>
+          the name of the variable to expose
+        </description>
+        <name>var</name>
+        <rtexprvalue>false</rtexprvalue>
+      </attribute>
+
+      <attribute>
+        <description>
+          Name of the exported scoped variable for the
+          status of the iteration.
+        </description>
+        <name>varStatus</name>
+        <rtexprvalue>false</rtexprvalue>
+      </attribute>
+
+      <attribute>
+        <description>
+          the beginning index 
+        </description>
+        <name>begin</name>
+        <deferred-value>
+          <type>java.lang.Integer</type>
+        </deferred-value>
+      </attribute>
+
+      <attribute>
+        <description>
+          the ending index 
+        </description>
+        <name>end</name>
+        <deferred-value>
+          <type>java.lang.Integer</type>
+        </deferred-value>
+      </attribute>
+
+      <attribute>
+        <description>
+          the number of steps per iteration
+        </description>
+        <name>step</name>
+        <deferred-value>
+          <type>java.lang.Integer</type>
+        </deferred-value>
+      </attribute>
+
+   </tag>
+
+   <tag>
+      <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>
+        <description>
+          the target for the value;  must be an EL expression
+        </description>
+        <name>to</name>
+        <required>true</required>
+        <deferred-value/>
+      </attribute>
+
+      <attribute>
+        <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>fileDownloadActionListener</name>
+      <tag-class>org.apache.myfaces.trinidadinternal.taglib.listener.FileDownloadActionListenerTag</tag-class>
+      <body-content>empty</body-content>
+      <description>
+        The fileDownloadActionListener tag provides a declarative syntax for downloading files to a user from a command component.
+      </description>
+
+      <attribute>
+        <description>
+          the content or mime type of the file - e.g., text/html or application/pdf
+        </description>
+        <name>contentType</name>
+        <deferred-value/>
+      </attribute>
+
+      <attribute>
+        <description>
+          the desired or proposed filename.  If set, the user will typically be presented with a "Save File" dialog, though this is ultimately at the descretion of the user agent.
+        </description>
+        <name>filename</name>
+        <deferred-value/>
+      </attribute>
+
+      <attribute>
+        <description>
+          an EL binding to the method that will deliver the file contents.  The method must take two parameters, a FacesContext and an OutputStream.
+        </description>
+        <name>method</name>
+        <required>true</required>
+        <deferred-method>
+          <method-signature>void myMethod(javax.faces.context.FacesContext, java.io.OutputStream)</method-signature>
+        </deferred-method>
+      </attribute>
+   </tag>
+
+   <tag>
+      <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>
+        <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>
+      <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>
+      <description> 
+
+      The componentRef tag adds declarative components onto the current
+      component tree. The declarative component is usually defined in a jsp
+      file.  It is currently experimental and should not be used by
+      developers.
+
+      </description>
+
+      <name>componentRef</name>
+      <tag-class>org.apache.myfaces.trinidadinternal.taglib.ComponentRefTag</tag-class>
+      <body-content>JSP</body-content>
+      <attribute>
+        <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>
+        <description>
+          This ID must be unique within this page. 
+        </description>
+        <name>id</name>
+        <required>true</required>
+      </attribute>
+
+      <attribute>
+        <description>
+          A value to pass to the component definition.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <deferred-value/>
+      </attribute>
+
+      <attribute>
+        <description>
+          Whether or not this component is rendered.
+        </description>
+        <name>rendered</name>
+        <required>false</required>
+        <deferred-value/>
+      </attribute>
+
+   </tag>
+
+
+    <tag>
+      <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>
+      <body-content>JSP</body-content>
+      <attribute>
+        <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>
+      <description>
+        The facetRef tag is used to copy facets from a component
+        and paste them into its
+        definition. This tag may only be used within an &lt;tr:componentDef&gt;
+        tag.
+        Each facet may be used only once within each 
+        &lt;tr:componentDef&gt;. 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>
+      <body-content>JSP</body-content>
+      <attribute>
+        <description>
+          the facet name to copy
+        </description>
+        <name>facetName</name>
+        <rtexprvalue>false</rtexprvalue>
+      </attribute>
+    </tag>        
+
+</taglib>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/conf/META-INF/trh-base.tld Tue Aug  7 15:18:22 2007
@@ -1,30 +1,30 @@
-<?xml version = "1.0" ?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-	   
--->
-<!DOCTYPE taglib 
-   PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-          "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-  <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>
+<?xml version = "1.0" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+	   
+-->
+<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>
+  <short-name>trh</short-name>
+  <uri>http://myfaces.apache.org/trinidad/html</uri>
+</taglib>

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Tue Aug  7 15:18:22 2007
@@ -34,6 +34,7 @@
 
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
+import javax.faces.application.ViewHandlerWrapper;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
@@ -57,10 +58,9 @@
  * @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 ViewHandler
+public class ViewHandlerImpl extends ViewHandlerWrapper
 {
   static public final String ALTERNATE_VIEW_HANDLER =
     "org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER";
@@ -73,16 +73,9 @@
     _loadInternalViews();
   }
 
-  @Override
-  public Locale calculateLocale(FacesContext context)
-  {
-    return _delegate.calculateLocale(context);
-  }
-
-  @Override
-  public String calculateRenderKitId(FacesContext context)
+  protected ViewHandler getWrapped()
   {
-    return _delegate.calculateRenderKitId(context);
+    return _delegate;
   }
 
   @Override
@@ -121,13 +114,13 @@
       }
     }
 
-    return _delegate.createView(context, viewId);
+    return super.createView(context, viewId);
   }
 
   @Override
   public String getActionURL(FacesContext context, String viewId)
   {
-    String actionURL = _delegate.getActionURL(context, viewId);
+    String actionURL = super.getActionURL(context, viewId);
     RequestContext afContext = RequestContext.getCurrentInstance();
     if (afContext != null)
     {
@@ -144,7 +137,7 @@
     FacesContext context,
     String       path)
   {
-    return _delegate.getResourceURL(context, path);
+    return super.getResourceURL(context, path);
   }
 
 
@@ -179,7 +172,7 @@
         }
         else
         {
-          _delegate.renderView(context, viewToRender);
+          super.renderView(context, viewToRender);
         }
 
         if (service != null)
@@ -263,7 +256,7 @@
       return null;
     }
 
-    UIViewRoot result = _delegate.restoreView(context, viewId);
+    UIViewRoot result = super.restoreView(context, viewId);
     // If we've successfully restored a view, then assume that
     // this is a postback request.
     if (result != null)
@@ -292,7 +285,7 @@
         service.isStateless(context))
       return;
 
-    _delegate.writeState(context);
+    super.writeState(context);
   }
 
   synchronized private void _initIfNeeded(FacesContext context)

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/AccessKeyBinding.java Tue Aug  7 15:18:22 2007
@@ -18,8 +18,11 @@
  */
 package org.apache.myfaces.trinidadinternal.binding;
 
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
+import java.io.Serializable;
+
+import javax.el.ValueExpression;
+import javax.el.ELContext;
+import javax.el.PropertyNotWritableException;
 
 import org.apache.myfaces.trinidadinternal.util.nls.StringUtils;
 
@@ -29,25 +32,25 @@
  * access key.
  *
  */
-public class AccessKeyBinding extends ValueBindingAdapter
+public class AccessKeyBinding extends ValueExpression implements Serializable
 {
   /**
    * Constructor purely for serialization.
    */
   public AccessKeyBinding()
   {
-    super(null);
   }
 
-  public AccessKeyBinding(ValueBinding base)
+  public AccessKeyBinding(ValueExpression expr)
   {
-    super(base);
+    _base = expr;
   }
 
+
   @Override
-  public Object getValue(FacesContext context)
+  public Object getValue(ELContext context)
   {
-    Object o = super.getValue(context);
+    Object o = _base.getValue(context);
     if (o == null)
       return null;
 
@@ -60,8 +63,51 @@
   }
 
   @Override
-  public Class<?> getType(FacesContext context)
+  public void setValue(ELContext context, Object value)
+  {
+    throw new PropertyNotWritableException();
+  }
+
+  @Override
+  public Class<?> getType(ELContext context)
+  {
+    return Character.class;
+  }
+
+  @Override
+  public Class<?> getExpectedType()
   {
     return Character.class;
   }
+
+  @Override
+  public boolean isReadOnly(ELContext context)
+  {
+    return true;
+  }
+
+
+  @Override
+  public boolean isLiteralText()
+  {
+    return false;
+  }
+
+  @Override
+  public String getExpressionString()
+  {
+    return null;
+  }
+
+  public int hashCode()
+  {
+    return 0;
+  }
+
+  public boolean equals(Object o)
+  {
+    return (o == this);
+  }
+
+  private ValueExpression _base;
 }

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/StripAccessKeyBinding.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/StripAccessKeyBinding.java?view=diff&rev=563680&r1=563679&r2=563680
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/StripAccessKeyBinding.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/StripAccessKeyBinding.java Tue Aug  7 15:18:22 2007
@@ -18,8 +18,11 @@
  */
 package org.apache.myfaces.trinidadinternal.binding;
 
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
+import java.io.Serializable;
+
+import javax.el.ValueExpression;
+import javax.el.ELContext;
+import javax.el.PropertyNotWritableException;
 
 import org.apache.myfaces.trinidadinternal.util.nls.StringUtils;
 
@@ -29,25 +32,18 @@
  * the mnemonic.
  *
  */
-public class StripAccessKeyBinding extends ValueBindingAdapter
+public class StripAccessKeyBinding extends ValueExpression implements Serializable
 {
-  /**
-   * Constructor purely for serialization.
-   */
-  public StripAccessKeyBinding()
-  {
-    super(null);
-  }
 
-  public StripAccessKeyBinding(ValueBinding base)
+  public StripAccessKeyBinding(ValueExpression base)
   {
-    super(base);
+    _base = base;
   }
 
   @Override
-  public Object getValue(FacesContext context)
+  public Object getValue(ELContext context)
   {
-    Object o = super.getValue(context);
+    Object o = _base.getValue(context);
     if (o == null)
       return null;
 
@@ -60,8 +56,50 @@
   }
 
   @Override
-  public Class<?> getType(FacesContext context)
+  public void setValue(ELContext context, Object value)
+  {
+    throw new PropertyNotWritableException();
+  }
+
+  @Override
+  public Class<?> getType(ELContext context)
+  {
+    return Character.class;
+  }
+
+  @Override
+  public Class<?> getExpectedType()
+  {
+    return Character.class;
+  }
+
+  @Override
+  public boolean isReadOnly(ELContext context)
   {
-    return String.class;
+    return true;
   }
+
+  @Override
+  public boolean isLiteralText()
+  {
+    return false;
+  }
+
+  @Override
+  public String getExpressionString()
+  {
+    return null;
+  }
+
+  public int hashCode()
+  {
+    return 0;
+  }
+
+  public boolean equals(Object o)
+  {
+    return (o == this);
+  }
+
+  private ValueExpression _base;
 }



Mime
View raw message