You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/02/10 14:13:16 UTC

svn commit: r908486 [2/11] - in /myfaces/trinidad/branches/matzewTrinidad2002: ./ src/site/ src/site/apt/ src/site/xdoc/ src/site/xdoc/devguide/ trinidad-api/ trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/ trinidad-api/src/...

Propchange: myfaces/trinidad/branches/matzewTrinidad2002/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 13:12:57 2010
@@ -5,4 +5,4 @@
 /myfaces/trinidad/branches/ar_clientBehaviors:881469-891464
 /myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
 /myfaces/trinidad/branches/trinidad-2.0.x:823098-895949
-/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043
+/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043,896231-908455

Modified: myfaces/trinidad/branches/matzewTrinidad2002/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/pom.xml?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/pom.xml (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/pom.xml Wed Feb 10 13:12:57 2010
@@ -162,6 +162,12 @@
       <url>http://repository.jboss.org/maven2/</url>
       <layout>default</layout>
     </repository>
+    <repository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2/</url>
+      <layout>default</layout>
+    </repository>
   </repositories>
 
   <pluginRepositories>

Modified: myfaces/trinidad/branches/matzewTrinidad2002/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/src/site/apt/download.apt?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/src/site/apt/download.apt (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/src/site/apt/download.apt Wed Feb 10 13:12:57 2010
@@ -33,46 +33,67 @@
   created using GNU tar extensions. Thus they must be untarred with a GNU compatible
   version of tar.
 
-    << Apache MyFaces Trinidad 1.0.10 Distribution  for JSF 1.1 >>
+    << Apache MyFaces Trinidad 2.0.0-alpha Distribution for JSF 2.0 >>
 
     Release notes can be found
-  {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12313343}here}}.
+  {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12314297}here}}.
 
 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.10 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.10-dist.tar.gz} trinidad-1.0.10-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-dist.tar.gz.md5} trinidad-1.0.10-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-dist.tar.gz.asc} trinidad-1.0.10-dist.tar.gz.asc}} |
+| Apache MyFaces Trinidad 2.0.0-alpha (tar.gz)     | {{{http://myfaces.apache.org/dist/binaries/trinidad-2.0.0-alpha-dist.tar.gz} trinidad-2.0.0-alpha-dist.tar.gz}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-dist.tar.gz.md5} trinidad-2.0.0-alpha-dist.tar.gz.md5}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-dist.tar.gz.asc} trinidad-2.0.0-alpha-dist.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.10 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.10-dist.zip} trinidad-1.0.10-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-dist.zip.md5} trinidad-1.0.10-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-dist.zip.asc} trinidad-1.0.10-dist.zip.asc}} |
+| Apache MyFaces Trinidad 2.0.0-alpha (zip)      | {{{http://myfaces.apache.org/dist/binaries/trinidad-2.0.0-alpha-dist.zip} trinidad-2.0.0-alpha-dist.zip}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-dist.zip.md5} trinidad-2.0.0-alpha-dist.zip.md5}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-dist.zip.asc} trinidad-2.0.0-alpha-dist.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.10 Example (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.10-example.tar.gz} trinidad-1.0.10-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-example.tar.gz.md5} trinidad-1.0.10-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-example.tar.gz.asc} trinidad-1.0.10-example.tar.gz.asc}} |
+| Apache MyFaces Trinidad 2.0.0-alpha Example (tar.gz)     | {{{http://myfaces.apache.org/dist/binaries/trinidad-2.0.0-alpha-example.tar.gz} trinidad-2.0.0-alpha-example.tar.gz}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-example.tar.gz.md5} trinidad-2.0.0-alpha-example.tar.gz.md5}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-example.tar.gz.asc} trinidad-2.0.0-alpha-example.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.10  Example (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.10-example.zip} trinidad-1.0.10-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-example.zip.md5} trinidad-1.0.10-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.10-example.zip.asc} trinidad-1.0.10-example.zip.asc}} |
+| Apache MyFaces Trinidad 2.0.0-alpha  Example (zip)      | {{{http://myfaces.apache.org/dist/binaries/trinidad-2.0.0-alpha-example.zip} trinidad-2.0.0-alpha-example.zip}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-example.zip.md5} trinidad-2.0.0-alpha-example.zip.md5}} | {{{http://myfaces.apache.org/dist/myfaces/binaries/trinidad-2.0.0-alpha-example.zip.asc} trinidad-2.0.0-alpha-example.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.10 Source (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.0.10-src-all.tar.gz} trinidad-1.0.10-src-all.tar.gz}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.10-src-all.tar.gz.md5} trinidad-1.0.10-src-all.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.10-src-all.tar.gz.asc} trinidad-1.0.10-src-all.tar.gz.asc}} |
+| Apache MyFaces Trinidad 2.0.0-alpha Source (tar.gz)     | {{{http://myfaces.apache.org/dist/source/trinidad-2.0.0-alpha-src-all.tar.gz} trinidad-2.0.0-alpha-src-all.tar.gz}} | {{{http://myfaces.apache.org/dist/myfaces/source/trinidad-2.0.0-alpha-src-all.tar.gz.md5} trinidad-2.0.0-alpha-src-all.tar.gz.md5}} | {{{http://myfaces.apache.org/dist/myfaces/source/trinidad-2.0.0-alpha-src-all.tar.gz.asc} trinidad-2.0.0-alpha-src-all.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.10  Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.0.10-src-all.zip} trinidad-1.0.10-src-all.zip}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.10-src-all.zip.md5} trinidad-1.0.10-src-all.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.10-src-all.zip.asc} trinidad-1.0.10-src-all.zip.asc}} |
+| Apache MyFaces Trinidad 2.0.0-alpha  Source (zip)      | {{{http://myfaces.apache.org/dist/source/trinidad-2.0.0-alpha-src-all.zip} trinidad-2.0.0-alpha-src-all.zip}} | {{{http://myfaces.apache.org/dist/myfaces/source/trinidad-2.0.0-alpha-src-all.zip.md5} trinidad-2.0.0-alpha-src-all.zip.md5}} | {{{http://myfaces.apache.org/dist/myfaces/source/trinidad-2.0.0-alpha-src-all.zip.asc} trinidad-2.0.0-alpha-src-all.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 
-    << Apache MyFaces Trinidad 1.2.11 Distribution for JSF 1.2 >>
+    << Apache MyFaces Trinidad 1.2.13 Distribution for JSF 1.2 >>
 
     Release notes can be found
-  {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12313510}here}}.
+  {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12314170}here}}.
 
 *-------------------------+---------+----------+-----------+
 |                         | Mirrors | Checksum | Signature |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.2.11 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.11-dist.tar.gz} trinidad-1.2.11-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-dist.tar.gz.md5} trinidad-1.2.11-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-dist.tar.gz.asc} trinidad-1.2.11-dist.tar.gz.asc}} |
+| Apache MyFaces Trinidad 1.2.13 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.13-dist.tar.gz} trinidad-1.2.13-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-dist.tar.gz.md5} trinidad-1.2.13-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-dist.tar.gz.asc} trinidad-1.2.13-dist.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.2.11 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.11-dist.zip} trinidad-1.2.11-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-dist.zip.md5} trinidad-1.2.11-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-dist.zip.asc} trinidad-1.2.11-dist.zip.asc}} |
+| Apache MyFaces Trinidad 1.2.13 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.13-dist.zip} trinidad-1.2.13-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-dist.zip.md5} trinidad-1.2.13-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-dist.zip.asc} trinidad-1.2.13-dist.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.2.11 Example (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.11-example.tar.gz} trinidad-1.2.11-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-example.tar.gz.md5} trinidad-1.2.11-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-example.tar.gz.asc} trinidad-1.2.11-example.tar.gz.asc}} |
+| Apache MyFaces Trinidad 1.2.13 Example (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.13-example.tar.gz} trinidad-1.2.13-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-example.tar.gz.md5} trinidad-1.2.13-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-example.tar.gz.asc} trinidad-1.2.13-example.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.2.11  Example (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.11-example.zip} trinidad-1.2.11-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-example.zip.md5} trinidad-1.2.11-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.11-example.zip.asc} trinidad-1.2.11-example.zip.asc}} |
+| Apache MyFaces Trinidad 1.2.13  Example (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.13-example.zip} trinidad-1.2.13-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-example.zip.md5} trinidad-1.2.13-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.13-example.zip.asc} trinidad-1.2.13-example.zip.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.2.11 Source (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.2.11-src-all.tar.gz} trinidad-1.2.11-src-all.tar.gz}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.11-src-all.tar.gz.md5} trinidad-1.2.11-src-all.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.11-src-all.tar.gz.asc} trinidad-1.2.11-src-all.tar.gz.asc}} |
+| Apache MyFaces Trinidad 1.2.13 Source (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.2.13-src-all.tar.gz} trinidad-1.2.13-src-all.tar.gz}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.13-src-all.tar.gz.md5} trinidad-1.2.13-src-all.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.13-src-all.tar.gz.asc} trinidad-1.2.13-src-all.tar.gz.asc}} |
 *-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.2.11  Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.2.11-src-all.zip} trinidad-1.2.11-src-all.zip}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.11-src-all.zip.md5} trinidad-1.2.11-src-all.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.11-src-all.zip.asc} trinidad-1.2.11-src-all.zip.asc}} |
+| Apache MyFaces Trinidad 1.2.13  Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.2.13-src-all.zip} trinidad-1.2.13-src-all.zip}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.13-src-all.zip.md5} trinidad-1.2.13-src-all.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.13-src-all.zip.asc} trinidad-1.2.13-src-all.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+    << Apache MyFaces Trinidad 1.0.11 Distribution  for JSF 1.1 >>
+
+    Release notes can be found
+  {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12313509}here}}.
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Apache MyFaces Trinidad 1.0.11 (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.11-dist.tar.gz} trinidad-1.0.11-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-dist.tar.gz.md5} trinidad-1.0.11-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-dist.tar.gz.asc} trinidad-1.0.11-dist.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache MyFaces Trinidad 1.0.11 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.11-dist.zip} trinidad-1.0.11-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-dist.zip.md5} trinidad-1.0.11-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-dist.zip.asc} trinidad-1.0.11-dist.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache MyFaces Trinidad 1.0.11 Example (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.11-example.tar.gz} trinidad-1.0.11-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-example.tar.gz.md5} trinidad-1.0.11-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-example.tar.gz.asc} trinidad-1.0.11-example.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache MyFaces Trinidad 1.0.11  Example (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.11-example.zip} trinidad-1.0.11-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-example.zip.md5} trinidad-1.0.11-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.11-example.zip.asc} trinidad-1.0.11-example.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache MyFaces Trinidad 1.0.11 Source (tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.0.11-src-all.tar.gz} trinidad-1.0.11-src-all.tar.gz}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.11-src-all.tar.gz.md5} trinidad-1.0.11-src-all.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.11-src-all.tar.gz.asc} trinidad-1.0.11-src-all.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache MyFaces Trinidad 1.0.11  Source (zip)      | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.0.11-src-all.zip} trinidad-1.0.11-src-all.zip}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.11-src-all.zip.md5} trinidad-1.0.11-src-all.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.11-src-all.zip.asc} trinidad-1.0.11-src-all.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 
 Latest source code from SVN repository
@@ -115,19 +136,19 @@
 
 	  <<<
 	  % pgpk -a KEYS
-	  % pgpv trinidad-1.0.10-dist.tar.gz.asc trinidad-1.0.10-dist.tar.gz
+	  % pgpv trinidad-1.0.11-dist.tar.gz.asc trinidad-1.0.11-dist.tar.gz
 	  >>>
 
 	  <or>
 
 	  <<<
 	  % pgp -ka KEYS
-	  % pgp trinidad-1.0.10-dist.tar.gz.asc trinidad-1.0.10-dist.tar.gz
+	  % pgp trinidad-1.0.11-dist.tar.gz.asc trinidad-1.0.11-dist.tar.gz
 	  >>>
 
 	  <or>
 
 	  <<<
   	% gpg --import KEYS
-	  % gpg --verify trinidad-1.0.10-dist.tar.gz.asc trinidad-1.0.10-dist.tar.gz
+	  % gpg --verify trinidad-1.0.11-dist.tar.gz.asc trinidad-1.0.11-dist.tar.gz
 	  >>>

Modified: myfaces/trinidad/branches/matzewTrinidad2002/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/src/site/site.xml?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/src/site/site.xml (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/src/site/site.xml Wed Feb 10 13:12:57 2010
@@ -44,7 +44,8 @@
 
     <menu name="">
       <item name="Download" href="download.html"/>
-      <item name="Installation" href="installation.html" />
+      <item name="Publications" href="publications.html" />
+      <item name="Installation" href="devguide/installation.html" />
       <item name="Current Release Notes" href="download.html"/>
       <item name="Supported Browsers" href="browsers.html" />
       <item name="Overview" href="spec-diff.html" />
@@ -54,7 +55,7 @@
       <item name="Developer Guide" href="devguide/index.html" />
       <item name="Plugins" href="plugins/index.html"/>
       <item name="Trinidad 1.0.x" href="trinidad-1_0/index.html"/>
-      <item name="Live Demos" href="http://www.irian.at/trinidad-demo/faces/index.jspx" />
+      <item name="Live Demos (Trinidad 1.2.x)" href="http://www.irian.at/trinidad-demo/faces/index.jspx" />
     </menu>
 
     <menu name="Foundation">

Modified: myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/index.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/index.xml?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/index.xml (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/index.xml Wed Feb 10 13:12:57 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
+<!--
     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
@@ -20,21 +20,22 @@
 -->
 <document>
   <properties>
-    <title>Developer Guide Index</title>
+    <title>Developer Guide Index for Apache MyFaces Trinidad</title>
   </properties>
 
   <body>
     <section name="Development Guidelines for Apache MyFaces Trinidad">
       <p>
         <ul>        
-            <li><a href="configuration.html">Configuring Apache Trinidad</a></li>
+            <li><a href="installation.html">Installing Apache MyFaces Trinidad</a></li>
+            <li><a href="configuration.html">Configuring Apache MyFaces Trinidad</a></li>
             <li><a href="ppr.html">AJAX and Partial Page Rendering (PPR)</a></li>
             <li><a href="communicatingBetweenPages.html">Communicating Between Pages: pageFlowScope</a></li>
-            <li><a href="dialogs.html">The Apache Trinidad Dialog Framework</a></li>
+            <li><a href="dialogs.html">The Apache MyFaces Trinidad Dialog Framework</a></li>
             <li><a href="fileUpload.html">File Upload</a></li>            
-            <li><a href="table.html">Using Apache Trinidad Tables</a></li>     
-            <li><a href="tree.html">Using Apache Trinidad Trees</a></li>       
-            <li><a href="chart.html">Using Apache Trinidad Chart</a></li>       
+            <li><a href="table.html">Using Apache MyFaces Trinidad Tables</a></li>     
+            <li><a href="tree.html">Using Apache MyFaces Trinidad Trees</a></li>       
+            <li><a href="chart.html">Using Apache MyFaces Trinidad Chart</a></li>       
             <li><a href="navigation.html">Navigation</a></li>      
             <li><a href="xmlMenuModel.html">XMLMenuModel</a></li>      
             <li><a href="clientValidation.html">Client-side Converters and Validators</a></li> 

Modified: myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/skinning.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/skinning.xml?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/skinning.xml (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/devguide/skinning.xml Wed Feb 10 13:12:57 2010
@@ -889,6 +889,11 @@
         This is to define styles only for a particular accessibility profile.  See the <a href="configuration.html#accessibility-profile">Configuring Apache Trinidad</a> chapter for information on setting the accessibility profile.
         </li>
         <li>
+        <strong>@locale</strong> {/skin definitions go here/} - >
+        A certain locale must be specified, either only the language or both the language and the country.
+        This is to define styles only for a particular language and country.
+        </li>
+        <li>
         <strong>:rtl</strong> - >  pseudo-class to create a style or icon definition when the browser 
         is in a right-to-left language. The best example is that of images that are not symmetric.
         If you set a skin selector that uses a asymmetrical image, when you set your browser to
@@ -896,7 +901,7 @@
         you use the :rtl pseudo-class at the end of your selector and point it to a flipped-looking image.
         </li>
         <li>
-        :lang or @locale  - >  Not yet implemented in Trinidad.         
+        :lang - >  Not yet implemented in Trinidad.         
         </li>          
         </ul>
           
@@ -920,16 +925,27 @@
         }
 
         /* for ie 5 and 6, we also need some margins.*/
-        @agent ie (version: 5) and (version: 6)
+        @agent ie and (version: 5), ie and (version: 6)
         {
           af|someComponent {margin: 5px;}
         }
         
         /* for Firefox 3 (gecko 1.9) use a smaller margin.*/
-        @agent gecko (version: 1.9)
+        @agent gecko and (version: 1.9)
         {
           af|someComponent {margin: 4px;}
         }
+
+        @locale en, de {
+           af|commandButton {
+              color: red;
+           }
+         }
+         @locale ro-RO {
+           af|commandButton {
+             color: blue;
+           }
+         }
         
         /* The following selectors are for all platforms and all browsers */
         

Modified: myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/index.xml?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/index.xml (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/src/site/xdoc/index.xml Wed Feb 10 13:12:57 2010
@@ -52,7 +52,18 @@
 <li>A dialog framework</li>
 <li>pageFlowScope, for communicating between pages</li>
 </ul>
-      </p>
+      </p>
+        <p>
+      Apache MyFaces Trinidad currently supports the following JSF versions:
+<ul>
+<li>JSF 1.1: supported by the Apache MyFaces Trinidad 1.0.x line </li>
+<li>JSF 1.2: supported by the Apache MyFaces Trinidad 1.2.x line </li>
+<li>JSF 2.0: supported by the Apache MyFaces Trinidad 2.0.x line </li>
+</ul>
+      </p>
+<p>
+Go to our <a href="download.html">download section</a> to get the lastest version that fits your needs.
+</p>
       </section>
 
       <section name="Documentation">

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/pom.xml?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/pom.xml Wed Feb 10 13:12:57 2010
@@ -225,6 +225,12 @@
         <configuration>
           <showPackage>false</showPackage>
           <showProtected>true</showProtected>
+          <links>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+            <link>http://java.sun.com/javaee/javaserverfaces/2.0/docs/api</link>
+            <link>http://java.sun.com/javaee/5/docs/api</link>
+          </links>
         </configuration>
       </plugin>
 
@@ -235,6 +241,14 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changelog-plugin</artifactId>
+        <configuration>
+          <basedir>${basedir}</basedir>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
       </plugin>
 

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java Wed Feb 10 13:12:57 2010
@@ -6,9 +6,9 @@
  *  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
@@ -21,25 +21,34 @@
 import java.io.IOException;
 
 import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
-
 import java.util.Map;
 import java.util.Set;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
 import javax.faces.event.PhaseId;
 
 import javax.faces.render.Renderer;
+
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
 import org.apache.myfaces.trinidad.model.CollectionModel;
 import org.apache.myfaces.trinidad.model.LocalRowKeyIndex;
 import org.apache.myfaces.trinidad.model.ModelUtils;
 
+import org.apache.myfaces.trinidad.render.ClientRowKeyManager;
+
 /**
  * This component iterates over some given data.
  * Each child is repeatedly stamped as many times as necessary.
  * Iteration is done starting at the index given by {@link #getFirst()}
  * for as many indices as specified by {@link #getRows()}.
- * If {@link #getRows()} returns 0, then the iteration continues until 
+ * If {@link #getRows()} returns 0, then the iteration continues until
  * there are no more elements in the underlying data.
  */
 public abstract class UIXIteratorTemplate extends UIXCollection implements FlattenedComponent, LocalRowKeyIndex
@@ -70,7 +79,7 @@
     // Mimic what would normally happen in the non-flattening case for encodeBegin():
     __processFlattenedChildrenBegin();
 
-    Runner runner = new Runner(cpContext)
+    Runner runner = new IndexedRunner(cpContext)
     {
       @Override
       protected void process(UIComponent kid, ComponentProcessingContext cpContext) throws IOException
@@ -79,7 +88,7 @@
       }
     };
     boolean processedChildren = runner.run();
-    Exception exp = runner.exception;
+    Exception exp = runner.getException();
     if (exp != null)
     {
       if (exp instanceof RuntimeException)
@@ -125,7 +134,7 @@
     }
     else // this is not the table. it must be the iterator
     {
-      Runner runner = new Runner()
+      Runner runner = new IndexedRunner()
       {
         @Override
         protected void process(UIComponent kid,
@@ -135,7 +144,7 @@
         }
       };
       runner.run();
-      Exception exp = runner.exception;
+      Exception exp = runner.getException();
       if (exp != null)
       {
         if (exp instanceof RuntimeException)
@@ -167,7 +176,7 @@
       public Object get(Object key)
       {
         // some of these keys are from <c:forEach>, ie:
-        // javax.servlet.jsp.jstl.core.LoopTagStatus 
+        // javax.servlet.jsp.jstl.core.LoopTagStatus
         if ("begin".equals(key)) // from jstl
         {
           return Integer.valueOf(getFirst());
@@ -202,7 +211,7 @@
     CollectionModel current,
     Object value)
   {
-    CollectionModel model = ModelUtils.toCollectionModel(value); 
+    CollectionModel model = ModelUtils.toCollectionModel(value);
     // initialize to -1. we need to do this incase some application logic
     // changed this index. Also, some JSF1.0 RI classes were initially starting
     // with a rowIndex of 0.
@@ -217,7 +226,7 @@
     final FacesContext context,
     final PhaseId phaseId)
   {
-    Runner runner = new Runner()
+    Runner runner = new IndexedRunner()
     {
       @Override
       protected void process(UIComponent kid, ComponentProcessingContext cpContext)
@@ -228,6 +237,109 @@
     runner.run();
   }
   
+  // Extract the current row token from the clientId
+  private String _getClientToken(String clientIdPrefix, String cellClientId)
+  {
+    int tokenStartIndex = clientIdPrefix.length() + 1;
+    int tokenEndIndex = cellClientId.indexOf(':', tokenStartIndex);
+    
+    if (tokenEndIndex != -1)
+    {
+      return cellClientId.substring(tokenStartIndex, tokenEndIndex);
+    }
+    else
+    {
+      return null;
+    }
+  }
+  
+  @Override
+  protected boolean visitData(
+    final VisitContext  visitContext,
+    final VisitCallback visitCallback)
+  {
+    Collection<String> subtreeIds = visitContext.getSubtreeIdsToVisit(this);
+ 
+    String ourClientIdPrefix = getClientId(visitContext.getFacesContext());
+   
+    int subtreeIdCount = subtreeIds.size();
+    
+    // build up a set of the row keys to visit rather than iterating
+    // and visiting every row
+    Set<String> rowsToVisit;
+    
+    if (subtreeIdCount > 1)
+    {
+      rowsToVisit = new HashSet<String>(subtreeIdCount);
+
+      for (String currClientId : subtreeIds)
+      {
+        String clientToken = _getClientToken(ourClientIdPrefix, currClientId);
+        
+        if (clientToken != null)
+        {
+          rowsToVisit.add(clientToken);          
+        }
+      }
+    }
+    else
+    {
+      String clientToken = _getClientToken(ourClientIdPrefix,
+                                           subtreeIds.iterator().next());
+      
+      if (clientToken != null)
+      {
+        rowsToVisit = Collections.singleton(clientToken);
+      }
+      else
+      {
+        rowsToVisit = Collections.emptySet();
+      }
+    }
+    
+    // we didn't visit any data
+    if (rowsToVisit.isEmpty())
+      return false;
+    
+    // create a special VisitContext that doesn't visit the Facets
+    // of column components since they aren't visited on each row
+    final VisitContext noColumnFacetContext = new NoColumnFacetsVisitContext(visitContext);
+    
+    // visit only the rows
+    Runner runner = new KeyedRunner(rowsToVisit)
+    {
+      @Override
+      protected void process(
+        UIComponent                kid,
+        ComponentProcessingContext cpContext
+        ) throws IOException
+      {
+        if (kid.getChildCount() > 0)
+        {
+          for (UIComponent grandKid : kid.getChildren())
+          {
+            if (UIXComponent.visitTree(noColumnFacetContext, grandKid, visitCallback))
+            {
+              throw new AbortProcessingException();
+            }
+          }
+        }
+      }
+    };
+
+    try
+    {
+      runner.run();
+    }
+    finally
+    {
+      return (runner.getException() instanceof AbortProcessingException);
+    }
+  }
+
+  /**
+   * Abstract class for processing rows
+   */
   private abstract class Runner implements ComponentProcessor<Object>
   {
     public Runner()
@@ -240,9 +352,79 @@
       _cpContext = cpContext;
     }
     
+    public abstract boolean run();
+
+    /**
+     * Sets up the context for the child and processes it
+     */
+    public void processComponent(
+      FacesContext context,
+      ComponentProcessingContext cpContext,
+      UIComponent component,
+      Object callbackContext) throws IOException
+    {
+      try
+      {
+        process(component, cpContext);
+      }
+      catch (IOException ioe)
+      {
+        throw ioe;
+      }
+      catch (AbortProcessingException ape)
+      {
+        // we're done, so abort
+        _exception = ape;        
+        throw ape;
+      }
+      catch (Exception e)
+      {
+        _exception = e;
+      }
+    }
+    
+    public Exception getException()
+    {
+      return _exception;
+    }
+
+    protected abstract void process(UIComponent comp, ComponentProcessingContext cpContext)
+      throws Exception;
+
+    protected final ComponentProcessingContext getComponentProcessingContext()
+    {
+      return _cpContext;
+    }
+
+    public final void setException(Exception e)
+    {
+      _exception = e;
+    }
+    
+    private Exception _exception = null;
+
+    private final ComponentProcessingContext _cpContext;
+  }
+
+  /**
+   * Class for visiting getRows() by index rows starting getFirst()
+   */
+  private abstract class IndexedRunner extends Runner
+  {
+    public IndexedRunner()
+    {
+      this(null);
+    }
+
+    public IndexedRunner(ComponentProcessingContext cpContext)
+    {
+      super(cpContext);
+    }
+    
     public final boolean run()
     {
       FacesContext context = FacesContext.getCurrentInstance();
+      ComponentProcessingContext cpContext = getComponentProcessingContext();
       
       List<UIComponent> stamps = getStamps();
       int oldIndex = getRowIndex();
@@ -262,8 +444,8 @@
           if (isRowAvailable())
           {
             // latch processedChild the first time we process a child
-            processedChild |= (_cpContext != null)
-              ? UIXComponent.processFlattenedChildren(context, _cpContext, this, stamps, null)
+            processedChild |= (cpContext != null)
+              ? UIXComponent.processFlattenedChildren(context, cpContext, this, stamps, null)
               : UIXComponent.processFlattenedChildren(context, this, stamps, null);
           }
           else
@@ -272,7 +454,7 @@
       }
       catch (IOException e)
       {
-        exception = e;
+        setException(e);
       }
       finally
       {
@@ -281,38 +463,63 @@
       
       return processedChild;
     }
+  }
 
-    /**
-     * Sets up the context for the child and processes it
-     */
-    public void processComponent(
-      FacesContext context,
-      ComponentProcessingContext cpContext,
-      UIComponent component,
-      Object callbackContext) throws IOException
+  /**
+   * Runner that visits the rows specified by the client row key tokens
+   */
+  private abstract class KeyedRunner extends Runner
+  {
+    public KeyedRunner(Iterable<String> clientKeys)
     {
+      super();
+      _clientKeys = clientKeys;
+    }
+    
+    public final boolean run()
+    {
+      FacesContext context = FacesContext.getCurrentInstance();
+     
+      List<UIComponent> stamps = getStamps();
+      int oldIndex = getRowIndex();
+            
+      boolean processedChild = false;
+            
       try
       {
-        process(component, cpContext);
+        // need to convert row key tokens to row keys
+        ClientRowKeyManager rowKeyManager = getClientRowKeyManager();
+
+        for(String clientKey : _clientKeys)
+        {
+          Object rowKey = rowKeyManager.getRowKey(context, UIXIterator.this, clientKey);
+          
+          if (rowKey != null)
+          {
+            setRowKey(rowKey);
+            if (isRowAvailable())
+            {
+              // latch processedChild the first time we process a child
+              processedChild |= UIXComponent.processFlattenedChildren(context, this, stamps, null);
+            }
+          }
+        }
       }
-      catch (IOException ioe)
+      catch (IOException e)
       {
-        throw ioe;
+        setException(e);
       }
-      catch (Exception e)
+      finally
       {
-        exception = e;
+        setRowIndex(oldIndex);
       }
+      
+      return processedChild;
     }
-
-    protected abstract void process(UIComponent comp, ComponentProcessingContext cpContext)
-      throws Exception;
-
-    public Exception exception = null;
-
-    private final ComponentProcessingContext _cpContext;
+    
+    private final Iterable<String> _clientKeys;
   }
-
+  
   @Override
   void __encodeBegin(FacesContext context) throws IOException
   {
@@ -355,7 +562,7 @@
           first = 0;
         else
         {
-          // scroll to the last page: 
+          // scroll to the last page:
           first = size - rows;
           model.setRowIndex(first);
           // make sure the row is indeed available:
@@ -375,5 +582,4 @@
       model.setRowIndex(oldIndex);
     }
   }
-
 }

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java Wed Feb 10 13:12:57 2010
@@ -18,9 +18,13 @@
  */
 package org.apache.myfaces.trinidad.component;
 
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+
 
 /**
  * Base class for the NavigationLevel component.
@@ -39,17 +43,61 @@
   {
     Object oldPath = getRowKey();
     HierarchyUtils.__setStartDepthPath(this, getLevel());
+    
     // process stamp for one level
     HierarchyUtils.__processLevel(context, phaseId, this);
     setRowKey(oldPath);
 
-
     // process the children
     TableUtils.__processChildren(context, this, phaseId);
   }
 
+  @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    boolean done = visitData(visitContext, callback);
 
+    if (!done)
+    {
+      // process the children
+      int childCount = getChildCount();
+      if (childCount > 0)
+      {
+        for (UIComponent child : getChildren())
+        {
+          done = UIXComponent.visitTree(visitContext, child, callback);
+          
+          if (done)
+            break;
+        }
+      }          
+    }
+    
+    return done;
+  }
+  
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    Object oldKey = getRowKey();
+       
+    boolean done;
 
+    HierarchyUtils.__setStartDepthPath(this, getLevel());
 
-
+    try
+    {
+      done = visitLevel(visitContext, callback, getStamps());
+    }
+    finally
+    {
+      setRowKey(oldKey);
+    }
+    
+    return done;
+  }
 }

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java Wed Feb 10 13:12:57 2010
@@ -25,6 +25,9 @@
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+
 
 /**
  * Base class for the NavigationPath component.
@@ -68,5 +71,76 @@
     TableUtils.__processChildren(context, this, phaseId);
   }  
 
+  @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    boolean done = visitData(visitContext, callback);
+    
+    if (!done)
+    {
+      // process the children
+      int childCount = getChildCount();
+      if (childCount > 0)
+      {
+        for (UIComponent child : getChildren())
+        {
+          done = UIXComponent.visitTree(visitContext, child, callback);
+          
+          if (done)
+            break;
+        }
+      }          
+    }
+    
+    return done;
+  }
+  
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    Object focusPath = getFocusRowKey();
+    Object oldRowKey = null;
+    
+    boolean done = false;
+    
+    // start from the focused area
+    if (focusPath != null)
+    {
+      List<UIComponent> stamps = getStamps();
+      
+      if (!stamps.isEmpty())
+      {
+        List<Object> paths =  new ArrayList<Object>(getAllAncestorContainerRowKeys(focusPath));
+        paths.add(focusPath);
+        
+        int focusPathSize = paths.size();
+        
+        try
+        {
+          for (int i = 0; i < focusPathSize && !done; i++)
+          {
+            setRowKey(paths.get(i));
+            
+            for (UIComponent stamp : stamps)
+            {
+              done = UIXComponent.visitTree(visitContext, stamp, callback);
+              
+              if (done)
+                break;
+            }
+          }
+        }
+        finally
+        {
+          setRowKey(oldRowKey);
+        }
+      }
+    }
     
+    return done;
+  } 
 }

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java Wed Feb 10 13:12:57 2010
@@ -29,6 +29,9 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+import org.apache.myfaces.trinidad.component.visit.VisitHint;
 import org.apache.myfaces.trinidad.model.CollectionModel;
 import org.apache.myfaces.trinidad.model.RowKeySet;
 import org.apache.myfaces.trinidad.model.RowKeySetTreeImpl;
@@ -93,7 +96,7 @@
     // this component has no facets that need to be processed once.
     // instead process the "nodeStamp" facet as many times as necessary:
     Object oldPath = getRowKey();
-    HierarchyUtils.__setStartLevelPath(this, getStartLevel());
+    HierarchyUtils.__setStartDepthPath(this, getStartLevel());
     HierarchyUtils.__iterateOverTree(context,
                                       phaseId,
                                       this,
@@ -103,6 +106,43 @@
   }
 
   @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    return visitData(visitContext, callback);
+  }
+  
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    Object oldRowKey = getRowKey();
+
+    // if we are only visiting rendered stamps, then pass in the disclosed row keys, otherwise
+    // pass in null, indicating that all row keys should be visited
+    RowKeySet disclosedRowKeys = (visitContext.getHints().contains(VisitHint.SKIP_UNRENDERED))
+                                   ? getDisclosedRowKeys()
+                                   : null;
+    
+    boolean done;
+
+    HierarchyUtils.__setStartDepthPath(this, getStartLevel());
+
+    try
+    {
+      done = visitHierarchy(visitContext, callback, getStamps(), disclosedRowKeys);
+    }
+    finally
+    {
+      setRowKey(oldRowKey);
+    }
+    
+    return done;
+  }
+  
+  @Override
   void __encodeBegin(FacesContext context) throws IOException
   {
     HierarchyUtils.__handleEncodeBegin(this, getDisclosedRowKeys());

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java Wed Feb 10 13:12:57 2010
@@ -25,13 +25,15 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+import org.apache.myfaces.trinidad.component.visit.VisitHint;
 import org.apache.myfaces.trinidad.model.CollectionModel;
 import org.apache.myfaces.trinidad.model.RowKeySet;
 import org.apache.myfaces.trinidad.model.RowKeySetTreeImpl;
@@ -115,7 +117,90 @@
         processComponent(context, facets.get(facetKey), phaseId);
       }
     }
+  }
+  
+  @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    boolean done = visitData(visitContext, callback);
+    
+    if (!done)
+    {
+      // process the children
+      int childCount = getChildCount();
+      if (childCount > 0)
+      {
+        for (UIComponent child : getChildren())
+        {
+          done = UIXComponent.visitTree(visitContext, child, callback);
+          
+          if (done)
+            break;
+        }
+      }
+      
+      // process the non-stamp facet children
+      if (!done)
+      {
+        // Visit the facets except for the node stamp
+        int facetCount = getFacetCount();
+        
+        if (facetCount > 0)
+        {
+          UIComponent nodeStamp = getNodeStamp();
+          
+          // if our only facet is the node stamp, we don't need to do this
+          if ((facetCount > 1) || (nodeStamp == null))
+          {
+            for (UIComponent facet : getFacets().values())
+            {
+              // ignore the nodeStamp facet, since it is stamped
+              if (facet != nodeStamp)
+              {
+                if (UIXComponent.visitTree(visitContext, facet, callback))
+                {
+                  done = true;
+                  break;
+                }
+              }
+            }
+          }
+        }        
+      }
+    }
+    
+    return done;
+  }
+  
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    Object oldPath = getRowKey();
+
+    // if we are only visiting rendered stamps, then pass in the disclosed row keys, otherwise
+    // pass in null, indicating that all row keys should be visited
+    RowKeySet disclosedRowKeys = (visitContext.getHints().contains(VisitHint.SKIP_UNRENDERED))
+                                   ? getDisclosedRowKeys()
+                                   : null;
 
+    setRowKey(null);
+
+    boolean done;
+    
+    try
+    {
+      done = visitHierarchy(visitContext, callback, getStamps(), disclosedRowKeys);
+    }
+    finally
+    {
+      setRowKey(oldPath);
+    }
+    
+    return done;
   }
 
   @Override

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java Wed Feb 10 13:12:57 2010
@@ -18,9 +18,13 @@
  */
 package org.apache.myfaces.trinidad.component;
 
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+
 
 /**
  * Base class for the Process component, which shows the steps of a process.
@@ -44,9 +48,55 @@
     
     // process the children
     TableUtils.__processChildren(context, this, phaseId);
-    
   }  
 
+  @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    boolean done = visitData(visitContext, callback);
+    
+    if (!done)
+    {
+      // process the children
+      int childCount = getChildCount();
+      if (childCount > 0)
+      {
+        for (UIComponent child : getChildren())
+        {
+          done = UIXComponent.visitTree(visitContext, child, callback);
+          
+          if (done)
+            break;
+        }
+      }          
+    }
+    
+    return done;
+  }
   
-  
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    Object oldKey = getRowKey();
+       
+    Object focusPath = getFocusRowKey();    
+    setRowKey(focusPath);  
+    
+    boolean done;
+
+    try
+    {
+      done = visitLevel(visitContext, callback, getStamps());
+    }
+    finally
+    {
+      setRowKey(oldKey);
+    }
+        
+    return done;
+  }
 }

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Wed Feb 10 13:12:57 2010
@@ -24,7 +24,6 @@
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import javax.el.MethodExpression;
 

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java Wed Feb 10 13:12:57 2010
@@ -36,11 +36,12 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
 import org.apache.myfaces.trinidad.event.FocusEvent;
 import org.apache.myfaces.trinidad.event.RangeChangeEvent;
 import org.apache.myfaces.trinidad.event.RangeChangeListener;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-import org.apache.myfaces.trinidad.model.TreeModel;
 
 /**
  * Base class for TreeTable component. The behaviours implemented by the
@@ -274,19 +275,36 @@
    */
   // TODO cache the result.
   @Override
-  @SuppressWarnings("unchecked")
-  protected final List getStamps()
+  protected final List<UIComponent> getStamps()
   {
+    
     List<UIComponent> children = getChildren();
-    UIComponent nodeStamp = getNodeStamp();
-    if (nodeStamp != null)
+    List<UIComponent> stamps;
+    
+    if (children.isEmpty())
+    {
+      // no children, so use Node stamps as the stamp
+      stamps = super.getStamps();
+    }
+    else
     {
-      List<UIComponent> stamps = new ArrayList<UIComponent>(children.size() + 1);
-      stamps.addAll(children);
-      stamps.add(nodeStamp);
-      return stamps;
+      UIComponent nodeStamp = getNodeStamp();
+      
+      if (nodeStamp == null)
+      {
+        // no node stamp, so stamp, is only the children
+        stamps = children;
+      }
+      else
+      {
+        // stamps are the children plus the node stamp
+        stamps = new ArrayList<UIComponent>(children.size() + 1);
+        stamps.addAll(children);
+        stamps.add(nodeStamp);
+      }
     }
-    return children;
+    
+    return stamps;
   }
 
   /**
@@ -383,6 +401,80 @@
     }
   }
 
+  @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    // need to override to do the default since our superclass
+    // UIXTree does stuff here we don't want
+    return defaultVisitChildren(visitContext, callback);
+  }
+
+  @Override
+  protected boolean visitUnstampedFacets(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    // Visit the facets except for the node stamp
+    int facetCount = getFacetCount();
+    
+    if (facetCount > 0)
+    {
+      UIComponent nodeStamp = getNodeStamp();
+      
+      // if our only facet is the node stamp, we don't need to do this
+      if ((facetCount > 1) || (nodeStamp == null))
+      {
+        for (UIComponent facet : getFacets().values())
+        {
+          // ignore the nodeStamp facet, since it is stamped
+          if (facet != nodeStamp)
+          {
+            if (UIXComponent.visitTree(visitContext, facet, callback))
+            {
+              return true;
+            }
+          }
+        }
+      }
+    }
+
+    return false;
+  }
+
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    Object focusedPath = getFocusRowKey();
+    Object oldRowKey = null;
+    
+    // start from the focused area
+    if (focusedPath != null)
+    {
+      oldRowKey = getRowKey();
+      setRowKey(focusedPath);
+    }
+    
+    boolean done;
+    
+    try
+    {
+      done = super.visitData(new NoColumnFacetsVisitContext(visitContext), callback);
+    }
+    finally
+    {
+      if (focusedPath != null)
+      {
+        setRowKey(oldRowKey);
+      }
+    }
+    
+    return done;
+  }
+
   /**
    * Gets the path of the parent
    */

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Wed Feb 10 13:12:57 2010
@@ -31,6 +31,9 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+import org.apache.myfaces.trinidad.component.visit.VisitHint;
 import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
 import org.apache.myfaces.trinidad.event.SelectionEvent;
 import org.apache.myfaces.trinidad.model.CollectionModel;
@@ -138,17 +141,36 @@
   {
     // this component has no facets that need to be processed once.
     // instead process the "nodeStamp" facet as many times as necessary:
-    Object oldPath = getRowKey();
-    setRowKey(null);
     HierarchyUtils.__iterateOverTree(context,
                                      phaseId,
                                      this,
                                      getDisclosedRowKeys(),
                                      true);
-    setRowKey(oldPath);
   }
 
   @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    return visitData(visitContext, callback);
+  }
+  
+  @Override
+  protected boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    // if we are only visiting rendered stamps, then pass in the disclosed row keys, otherwise
+    // pass in null, indicating that all row keys should be visited
+    RowKeySet disclosedRowKeys = (visitContext.getHints().contains(VisitHint.SKIP_UNRENDERED))
+                                   ? getDisclosedRowKeys()
+                                   : null;
+    
+    return visitHierarchy(visitContext, callback, getStamps(), disclosedRowKeys);
+  }
+  
+  @Override
   void __init()
   {
     super.__init();

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java Wed Feb 10 13:12:57 2010
@@ -347,12 +347,12 @@
     }
   }
 
-  final public Set<PropertyKey> keySet()
+  public Set<PropertyKey> keySet()
   {
     if (_properties == null)
       return Collections.emptySet();
-
-    return _properties.keySet();
+    else
+      return _properties.keySet();
   }
 
   @SuppressWarnings("unchecked")

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java Wed Feb 10 13:12:57 2010
@@ -175,6 +175,8 @@
     {
       super(binding);
     }
+
+    private static final long serialVersionUID = 1L;
   }
   
   private static class StateHolderValueBindingValueExpression extends ValueBindingValueExpression
@@ -207,6 +209,7 @@
     }
     
     private final StateHolder _stateHolder;
+    private static final long serialVersionUID = 1276692461787676411L;
   }
   
   private static class SerializableStateHolderValueBindingValueExpression extends 

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java Wed Feb 10 13:12:57 2010
@@ -114,44 +114,47 @@
   {
     UIComponent nodeStamp = comp.getFacet("nodeStamp");
     int oldRow = comp.getRowIndex();
-    int first = comp.getFirst();
-    int last = TableUtils.getLast(comp, first);
-    for(int i=first; i<=last; i++)
+    
+    try
     {
-      comp.setRowIndex(i);
-      if (processChildrenAsStamps)
-        TableUtils.__processStampedChildren(context, comp, phaseId);
-      comp.processComponent(context, nodeStamp, phaseId);
-      if (comp.isContainer() && (state.isContained()))
+      int first = comp.getFirst();
+      int last = TableUtils.getLast(comp, first);
+      for(int i=first; i<=last; i++)
       {
-        comp.enterContainer();
-        __iterateOverTree( context, 
-                           phaseId, 
-                           comp, 
-                           state, 
-                           processChildrenAsStamps);
-        comp.exitContainer();
+        comp.setRowIndex(i);
+        if (processChildrenAsStamps)
+          TableUtils.__processStampedChildren(context, comp, phaseId);
+        comp.processComponent(context, nodeStamp, phaseId);
+        if (comp.isContainer() && (state.isContained()))
+        {
+          comp.enterContainer();
+          
+          try
+          {
+            __iterateOverTree( context, 
+                               phaseId, 
+                               comp, 
+                               state, 
+                               processChildrenAsStamps);
+          }
+          finally
+          {
+            comp.exitContainer();
+          }
+        }
       }
     }
-    comp.setRowIndex(oldRow);
-  }
-
-  // sets the currency to the row or container that we want to start rendering
-  // from:
-  static boolean __setStartLevelPath(
-    UIXHierarchy component,
-    int          startDepth
-  )
-  {
-    return HierarchyUtils.__setStartDepthPath(component, startDepth);
+    finally
+    {
+      comp.setRowIndex(oldRow);
+    }
   }
 
   // sets the currency to the row or container that we want to start rendering
   // from:
   static boolean __setStartDepthPath(
     UIXHierarchy component,
-    int          startDepth
-  )
+    int          startDepth)
   {
     boolean isNewPath = false;
     Object focusKey = component.getFocusRowKey();

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/MethodBindingMethodExpression.java Wed Feb 10 13:12:57 2010
@@ -34,7 +34,6 @@
 class MethodBindingMethodExpression
   extends MethodExpression implements Serializable
 {
-
   // TODO implement serialization correctly?
   public MethodBindingMethodExpression(MethodBinding binding)
   {
@@ -48,7 +47,7 @@
 
   public MethodInfo getMethodInfo(ELContext context)
   {
-    Class type = _binding.getType(FacesContext.getCurrentInstance());
+    Class<?> type = _binding.getType(FacesContext.getCurrentInstance());
     return new MethodInfo(null, type, null);
   }
 
@@ -92,4 +91,5 @@
   }
 
   private final MethodBinding _binding;
+  private static final long serialVersionUID = 1L;
 }

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/StampState.java Wed Feb 10 13:12:57 2010
@@ -116,12 +116,6 @@
   public static void restoreStampState(FacesContext context, UIComponent stamp,
                                        Object stampState)
   {
-    String stampId = stamp.getId();
-    // Force the ID to be reset to reset the client identifier (needed
-    // for UIComponentBase implementation which caches clientId too
-    // aggressively)
-    stamp.setId(stampId);
-
     if (stampState != null)
     {
       RowState state = (RowState) stampState;

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java Wed Feb 10 13:12:57 2010
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.trinidad.component;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -280,6 +279,9 @@
       @Override
       protected void process(FacesContext context, UIComponent child)
       {
+        // make sure that any cached clientIds are cleared so that
+        // the clientIds are recalculated with the new row index
+        UIXComponent.clearCachedClientIds(child);
         table.processComponent(context, child, phaseId);
       }
     }.runAlways(context, table);
@@ -299,11 +301,11 @@
     int childCount = comp.getChildCount();
     if (childCount != 0)
     {
-      List children = comp.getChildren();
+      List<UIComponent> children = comp.getChildren();
 
       for (int i = 0; i < childCount; i++)
       {
-        UIComponent child = (UIComponent)children.get(i);
+        UIComponent child = children.get(i);
         comp.processComponent(context, child, phaseId);
       }
     }          

Modified: myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=908486&r1=908485&r2=908486&view=diff
==============================================================================
--- myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ myfaces/trinidad/branches/matzewTrinidad2002/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Wed Feb 10 13:12:57 2010
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 
 import java.util.AbstractMap;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,10 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.visit.VisitCallback;
+import org.apache.myfaces.trinidad.component.visit.VisitContext;
+import org.apache.myfaces.trinidad.component.visit.VisitHint;
+import org.apache.myfaces.trinidad.component.visit.VisitResult;
 import org.apache.myfaces.trinidad.event.SelectionEvent;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.model.CollectionModel;
@@ -294,7 +299,9 @@
     }
     else
     {
-      superState = stampState = clientKeyMgr = null;
+      superState = null;
+      stampState = null;
+      clientKeyMgr = null;
     }
     super.restoreState(context, superState);
 
@@ -320,7 +327,7 @@
   /**
    * Checks to see if the current row is available. This is useful when the
    * total number of rows is not known.
-   * @see CollectionModel#isRowAvailable
+   * @see CollectionModel#isRowAvailable()
    * @return true iff the current row is available.
    */
   public final boolean isRowAvailable()
@@ -427,7 +434,7 @@
 
   /**
    * Gets the data for the current row.
-   * @see CollectionModel#getRowData
+   * @see CollectionModel#getRowData(int)
    * @return null if the current row is unavailable
    */
   public final Object getRowData()
@@ -536,7 +543,7 @@
   /**
    * Clear the rowKey-to-currencyString cache.
    * The cache is not cleared immediately; instead it will be cleared
-   * when {@link #encodeBegin} is called.
+   * when {@link #encodeBegin(FacesContext)} is called.
    * @deprecated Have your Renderer implement {@link ClientRowKeyManagerFactory}
    * and create your own {@link ClientRowKeyManager} instances. Then you can
    * manage the lifecycle of each key inside your ClientRowKeyManager.
@@ -800,6 +807,11 @@
     }
 
     _restoreStampState();
+
+    // ensure the client IDs are reset on the component, otherwise they will not get the
+    // proper stamped IDs. This mirrors the behavior in UIData and follows the JSF specification
+    // on when client IDs are allowed to be cached and when they must be reset
+    clearCachedClientIds();
   }
 
   /**
@@ -856,7 +868,7 @@
     // just having stamp state, and having stamp state + child/facet state
     assert(!(stampState instanceof Object[]));
 
-    int facetCount = _getFacetCount(stamp);
+    int facetCount = stamp.getFacetCount();
 
     Object[] state = null;
 
@@ -943,11 +955,6 @@
     // Just a transient component - return
     if ((stampState == Transient.TRUE) || (stampState == null))
     {
-      // ensure the client IDs are reset on the component, otherwise they will not get the
-      // proper stamped IDs. This mirrors the behavior in UIData and follows the JSF specification
-      // on when client IDs are allowed to be cached and when they must be reset
-      String id = stamp.getId();
-      stamp.setId(id);
       return;
     }
 
@@ -997,7 +1004,7 @@
 
   /**
    * Process a component.
-   * This method calls {@link #processDecodes},
+   * This method calls {@link #processDecodes(FacesContext)},
    * {@link #processValidators} or
    * {@link #processUpdates}
    * depending on the {#link PhaseId}.
@@ -1147,6 +1154,268 @@
   }
 
   /**
+   * <p>
+   * Override default children visiting code to visit the facets and facets of the columns
+   * before delegating to the <code>visitData</code> to visit the individual rows of data.
+   * </p><p>
+   * Subclasses should override this method if they wish to change the way in which the non-stamped
+   * children are visited.  If they wish to change the wash the the stamped children are visited,
+   * they should override <code>visitData</code> instead.
+   * </p>
+   * @param visitContext
+   * @param callback
+   * @return <code>true</code> if all of the children to visit have been visited
+   * @see #visitData
+   */
+  @Override
+  protected boolean visitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    return defaultVisitChildren(visitContext, callback);
+  }
+  
+  protected final boolean defaultVisitChildren(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    boolean doneVisiting;
+    
+    // Clear out the row index if one is set so that
+    // we start from a clean slate.
+    int oldRowIndex = getRowIndex();
+    setRowIndex(-1);
+
+    try
+    {
+      // visit the unstamped children
+      doneVisiting = visitUnstampedFacets(visitContext, callback);
+      
+      if (!doneVisiting)
+      {
+        doneVisiting = _visitStampedColumnFacets(visitContext, callback);
+        
+        // visit the stamped children
+        if (!doneVisiting)
+        {
+          doneVisiting = visitData(visitContext, callback);
+        }
+      }
+    }
+    finally
+    {
+      // restore the original rowIndex
+      setRowIndex(oldRowIndex);      
+    }
+    
+    return doneVisiting;    
+  }
+  
+  /**
+   * Hook method for subclasses to override to change the behavior
+   * of how unstamped facets of the UIXCollection are visited.  The
+   * Default implementation visits all of the facets of the
+   * UIXCollection.
+   */
+  protected boolean visitUnstampedFacets(
+    VisitContext  visitContext,
+    VisitCallback callback)
+  {
+    // Visit the facets with no row
+    if (getFacetCount() > 0)
+    {
+      for (UIComponent facet : getFacets().values())
+      {
+        if (UIXComponent.visitTree(visitContext, facet, callback))
+        {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+  
+  /**
+   * Wrapper implementation of VisitContext
+   */
+  private static abstract class VisitContextWrapper extends VisitContext
+  {
+    protected abstract VisitContext getWrapped();
+
+    @Override
+    public FacesContext getFacesContext()
+    {
+      return getWrapped().getFacesContext();
+    }
+    
+    @Override
+    public PhaseId getPhaseId()
+    {
+      return getWrapped().getPhaseId();
+    }
+
+    @Override
+    public Collection<String> getIdsToVisit()
+    {
+      return getWrapped().getIdsToVisit();
+    }
+
+    @Override
+    public Collection<String> getSubtreeIdsToVisit(UIComponent component)
+    {
+      return getWrapped().getSubtreeIdsToVisit(component);
+    }
+
+    @Override
+    public VisitResult invokeVisitCallback(UIComponent component, VisitCallback callback)
+    {
+      return getWrapped().invokeVisitCallback(component, callback);
+    }
+
+    @Override
+    public Set<VisitHint> getHints()
+    {
+      return getWrapped().getHints();
+    }
+  }
+  
+  /**
+   * VistiContext that visits the facets of the UIXColumn children, including
+   * nested UIXColumn childrem
+   */
+  private static class ColumnFacetsOnlyVisitContext extends VisitContextWrapper
+  {
+    public ColumnFacetsOnlyVisitContext(VisitContext wrappedContext)
+    {
+      _wrapped = wrappedContext;
+    }
+    
+    @Override
+    protected VisitContext getWrapped()
+    {
+      return _wrapped;
+    }
+    
+    @Override
+    public VisitResult invokeVisitCallback(UIComponent component, VisitCallback callback)
+    {
+      if (component instanceof UIXColumn)
+      {
+        if (component.getFacetCount() > 0)
+        {
+          // visit the facet children without filtering for just UIXColumn children
+          for (UIComponent facetChild : component.getFacets().values())
+          {
+            if (UIXComponent.visitTree(getWrapped(), facetChild, callback))
+              return VisitResult.COMPLETE;
+          }
+          
+          // visit the indexed children, recursively looking for more columns
+          for (UIComponent child : component.getChildren())
+          {
+            if (UIXComponent.visitTree(this, child, callback))
+              return VisitResult.COMPLETE;
+          }
+        }
+      }
+      
+      // at this point, we either have already manually processed the UIXColumn's children, or
+      // the component wasn't a UIXColumn and shouldn't be processed
+      return VisitResult.REJECT;
+    }
+    
+    private final VisitContext _wrapped;
+  }
+
+  /**
+   * VisitContext implementation that doesn't visit any of the Facets of
+   * UIXColumn children.  This is used when stamping children
+   */
+  protected static final class NoColumnFacetsVisitContext extends VisitContextWrapper
+  {
+    NoColumnFacetsVisitContext(VisitContext wrapped)
+    {
+      _wrapped = wrapped;
+    }
+
+    @Override
+    protected VisitContext getWrapped()
+    {
+      return _wrapped;
+    }
+
+    @Override
+    public VisitResult invokeVisitCallback(UIComponent component, VisitCallback callback)
+    {
+      if (component instanceof UIXColumn)
+      {
+        if (component.getChildCount() > 0)
+        {
+          // visit only the indexed children of the columns
+          for (UIComponent child : component.getChildren())
+          {
+            if (UIXComponent.visitTree(this, child, callback))
+              return VisitResult.COMPLETE;
+          }
+        }
+        
+        return VisitResult.REJECT;
+      }
+      else
+      {
+        if (UIXComponent.visitTree(getWrapped(), component, callback))
+          return VisitResult.COMPLETE;
+        else
+          return VisitResult.REJECT;
+      }
+    }
+    
+    private final VisitContext _wrapped;
+  }
+  
+  /**
+   * Implementation used to visit each stamped row
+   */
+  private boolean _visitStampedColumnFacets(
+    VisitContext      visitContext,
+    VisitCallback     callback)
+  {    
+    // visit the facets of the stamped columns
+    List<UIComponent> stamps = getStamps();
+    
+    if (!stamps.isEmpty())
+    {
+      VisitContext columnVisitingContext = new ColumnFacetsOnlyVisitContext(visitContext);
+      
+      for (UIComponent stamp : stamps)
+      {
+        if (UIXComponent.visitTree(columnVisitingContext, stamp, callback))
+        {
+          return true;
+        }
+      }
+    }
+    
+    return false;
+  }
+
+
+  /**
+   * Visit the rows and children of the columns of the collection per row-index. This should
+   * not visit row index -1 (it will be perfomed in the visitTree method). The columns
+   * themselves should not be visited, only their children in this function.
+   *
+   * @param visitContext The visiting context
+   * @param callback The visit callback
+   * @return true if the visiting should stop
+   * @see #visitChildren(VisitContext, VisitCallback)
+   */
+  protected abstract boolean visitData(
+    VisitContext  visitContext,
+    VisitCallback callback);
+
+  /**
    * Gets the CollectionModel to use with this component.
    *
    * @param createIfNull  creates the collection model if necessary
@@ -1359,7 +1628,7 @@
   
   /**
    * Indicates the caching strategy supported by the model
-   * @see LocalCachingStrategy
+   * @see LocalRowKeyIndex.LocalCachingStrategy
    * @return caching strategy supported by the model
    */
   public LocalRowKeyIndex.LocalCachingStrategy getCachingStrategy()
@@ -1585,21 +1854,8 @@
     return b.equals(a);
   }
 
-  //
-  // Optimized path that avoids creating the Facet map
-  // unless necessary
-  //
-  private int _getFacetCount(UIComponent component)
-  {
-    if (component instanceof UIXComponent)
-      return ((UIXComponent) component).getFacetCount();
-
-    return component.getFacets().size();
-  }
-
   private static final class DefaultClientKeyManager extends ClientRowKeyManager
   {
-
     public void clear()
     {
       _currencyCache.clear();