svn@forrest.apache.org Archives

svn commit: r887796 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl

2009-12-06T23:13:26Z

Author: bdube
Date: Sun Dec  6 23:13:26 2009
New Revision: 887796

URL: http://svn.apache.org/viewvc?rev=887796&view=rev
Log:
The extra whitespace causes problems in link generation, especially for the generated PDF

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl?rev=887796&r1=887795&r2=887796&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl
Sun Dec  6 23:13:26 2009
@@ -37,8 +37,7 @@
   
     
     
-      # 
-      
+      #

svn commit: r887646 - /forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml

2009-12-06T08:24:01Z

Author: crossley
Date: Sun Dec  6 08:23:52 2009
New Revision: 887646

URL: http://svn.apache.org/viewvc?rev=887646&view=rev
Log:
Only use version-specific links if necessary.

Modified:
    forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml?rev=887646&r1=887645&r2=887646&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml Sun Dec  6 08:23:52
2009
@@ -1135,7 +1135,7 @@
         
           Notice the use of the lm protocol in the import statement.
           The lm protocol directs Forrest to use the
-          locationmap to resolve the
+          locationmap to resolve the
           location of the indicated stylesheet. If you trace this
           call through the sitemap, you will find the following section of
           main/webapp/locationmap-transforms.xml:

svn commit: r887615 - in /forrest/trunk: main/fresh-site/ main/template-sites/basic/ main/template-sites/business/ whiteboard/plugins/ whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/

2009-12-06T00:21:12Z

Author: bdube
Date: Sun Dec  6 00:21:12 2009
New Revision: 887615

URL: http://svn.apache.org/viewvc?rev=887615&view=rev
Log:
Some cleanup after the dispatcher merge
A grep for themes.core shows that the dispatcher plugin documentation
might need to be updated, as well as the forrest.properties files of
several plugins

Modified:
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/main/template-sites/basic/forrest.properties
    forrest/trunk/main/template-sites/business/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
    forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/forrest.properties?rev=887615&r1=887614&r2=887615&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Sun Dec  6 00:21:12 2009
@@ -142,7 +142,7 @@
 
 # codename: Dispatcher
 # Add the following plugins to project.required.plugins:
-#org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
+#org.apache.forrest.plugin.internal.dispatcher
 
 # Proxy configuration
 # - proxy.user and proxy.password are only needed if the proxy is an authenticated one...

Modified: forrest/trunk/main/template-sites/basic/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/forrest.properties?rev=887615&r1=887614&r2=887615&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/basic/forrest.properties (original)
+++ forrest/trunk/main/template-sites/basic/forrest.properties Sun Dec  6 00:21:12 2009
@@ -22,4 +22,4 @@
 project.required.plugins=org.apache.forrest.plugin.output.pdf
 # codename: Dispatcher
 # Add the following plugins to project.required.plugins:
-#org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
+#org.apache.forrest.plugin.internal.dispatcher

Modified: forrest/trunk/main/template-sites/business/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/business/forrest.properties?rev=887615&r1=887614&r2=887615&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/business/forrest.properties (original)
+++ forrest/trunk/main/template-sites/business/forrest.properties Sun Dec  6 00:21:12 2009
@@ -149,7 +149,7 @@
 
 # codename: Dispatcher
 # Add the following plugins to project.required.plugins:
-#org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
+#org.apache.forrest.plugin.internal.dispatcher
 
 # Proxy configuration
 # - proxy.user and proxy.password are only needed if the proxy is an authenticated one...

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties?rev=887615&r1=887614&r2=887615&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/forrest.properties
Sun Dec  6 00:21:12 2009
@@ -22,4 +22,4 @@
 
 # FIXME: FOR-785
 forrest.validate.skinconf=false
-project.required.plugins=org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.glossary,org.apache.forrest.plugin.output.POD
+project.required.plugins=org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.input.glossary,org.apache.forrest.plugin.output.POD

Modified: forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml?rev=887615&r1=887614&r2=887615&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml (original)
+++ forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml Sun Dec  6 00:21:12 2009
@@ -340,18 +340,6 @@
 
 
 
-  
-    
-      The core theme package for the dispatcher.
-    
-    0.8
-  
-

svn commit: r887433 - in /forrest/trunk/site-author: content/xdocs/docs_0_90/your-project.xml status.xml

2009-12-04T23:05:40Z

Author: bdube
Date: Fri Dec  4 23:05:40 2009
New Revision: 887433

URL: http://svn.apache.org/viewvc?rev=887433&view=rev
Log:
Issue FOR-1000
Update custom skin documentation to show use of locationmap

Modified:
    forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml?rev=887433&r1=887432&r2=887433&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml Fri Dec  4 23:05:40
2009
@@ -1126,30 +1126,41 @@
 
 
-  
+  
 
   ]]>... overrides of default templates ...
 ]]>
         
         
-          In order to use this feature in your custom skins you must copy the
-          common skin from the forrest distribution into your custom skins
-          directory (from main/webapp/skins/common). This will
-          protect your skin from changes in the Forrest common skin, but you
-          must remember to update this skin in order to take advantage of new
-          features added over time by the Forrest team.
+          Notice the use of the lm protocol in the import statement.
+          The lm protocol directs Forrest to use the
+          locationmap to resolve the
+          location of the indicated stylesheet. If you trace this
+          call through the sitemap, you will find the following section of
+          main/webapp/locationmap-transforms.xml:
         
-        
-          The above paragraph means that if you do copy an existing skin as this
-          section recomends you will also need to copy the common skin since all
-          existing skins import the common skin.
-        
+        
+
+      
+    
+]]>
+        
         
-          This is particularly relevant for menu rendering (book-to-menu.xsl),
-          where the common stylesheet does the 'logic' of which item is
-          selected, and over-riding stylesheets define the presentation.
+          This means that the locationmap first checks your project space
+          (according to the ${project.skins-dir} property of
+          your forrest.properties file) and, if the file is
+          not found there, it then checks in your installation of Forrest.
         
+        
+          It has been necessary in the past to copy the common skin to
+          your project when creating a custom skin. This is no longer the
+          case.
+        
       
     
     

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=887433&r1=887432&r2=887433&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Fri Dec  4 23:05:40 2009
@@ -153,6 +153,10 @@
         Added document to facilitate
         upgrading to v0.9
       
+
+      
+        Changed XSLT import statements in skins to use the LocationMap.
+      
 
       
         Replaced the custom caching implementation with EHCache in the

svn commit: r887050 - in /forrest/trunk/main/webapp: ./ skins/coat/css/ skins/coat/xslt/fo/ skins/coat/xslt/html/ skins/forrest-site/xslt/fo/ skins/forrest-site/xslt/html/ skins/krysalis-site/css/ skins/krysalis-site/xslt/fo/ skins/krysalis-site/xslt/h...

2009-12-04T04:01:25Z

Author: bdube
Date: Fri Dec  4 04:00:59 2009
New Revision: 887050

URL: http://svn.apache.org/viewvc?rev=887050&view=rev
Log:
Issue FOR-1000
Rewrite XSL imports to use locationmap

Modified:
    forrest/trunk/main/webapp/locationmap-transforms.xml
    forrest/trunk/main/webapp/skins/coat/css/profile.css.xslt
    forrest/trunk/main/webapp/skins/coat/xslt/fo/document-to-fo.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/forrest-site/xslt/fo/document2fo.xsl
    forrest/trunk/main/webapp/skins/forrest-site/xslt/html/book2menu.xsl
    forrest/trunk/main/webapp/skins/forrest-site/xslt/html/document2html.xsl
    forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl
    forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl
    forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt
    forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl
    forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl
    forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl
    forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl
    forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl
    forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt
    forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt
    forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/plain-dev/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/plain-dev/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/scales/css/profile.css.xslt
    forrest/trunk/main/webapp/skins/scales/xslt/fo/document-to-fo.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/tigris/css/forrest.css.xslt
    forrest/trunk/main/webapp/skins/tigris/xslt/fo/document-to-fo.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl

Modified: forrest/trunk/main/webapp/locationmap-transforms.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-transforms.xml?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-transforms.xml (original)
+++ forrest/trunk/main/webapp/locationmap-transforms.xml Fri Dec  4 04:00:59 2009
@@ -47,6 +47,22 @@
       
     
 
+
+
+
+    
+      
+    
+    
+      
+    
+
 
 
     

Modified: forrest/trunk/main/webapp/skins/coat/css/profile.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/css/profile.css.xslt?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/css/profile.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/coat/css/profile.css.xslt Fri Dec  4 04:00:59 2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   

Modified: forrest/trunk/main/webapp/skins/coat/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/fo/document-to-fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/fo/document-to-fo.xsl Fri Dec  4 04:00:59 2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl Fri Dec  4 04:00:59 2009
@@ -20,7 +20,7 @@
 details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 imported document-to-html.xsl for details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl Fri Dec  4 04:00:59 2009
@@ -35,7 +35,7 @@
 -->
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl Fri Dec  4 04:00:59 2009
@@ -38,7 +38,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/fo/document2fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/fo/document2fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/fo/document2fo.xsl Fri Dec  4 04:00:59
2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/html/book2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/html/book2menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/html/book2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/html/book2menu.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/html/document2html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/html/document2html.xsl Fri Dec  4 04:00:59
2009
@@ -20,5 +20,5 @@
 imported document2html.xsl for details.
 -->
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl Fri Dec  4 04:00:59
2009
@@ -34,7 +34,7 @@
 
 -->
 
-  
+  
   
   
   

Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 See the imported tab2menu.xsl for details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt Fri Dec  4 04:00:59
2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl Fri Dec  4 04:00:59
2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl Fri Dec  4 04:00:59
2009
@@ -21,7 +21,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl Fri Dec  4 04:00:59
2009
@@ -28,7 +28,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl Fri Dec  4 04:00:59
2009
@@ -34,7 +34,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl Fri Dec  4 04:00:59
2009
@@ -41,7 +41,7 @@
 
 -->
 
-  
+  
   
     

Modified: forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt Fri Dec  4 04:00:59
2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl Fri Dec  4 04:00:59
2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl Fri Dec  4 04:00:59
2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl Fri Dec  4
04:00:59 2009
@@ -20,7 +20,7 @@
 imported document-to-html.xsl for details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl Fri Dec  4 04:00:59
2009
@@ -36,7 +36,7 @@
 
-  
+  
   
   
   

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl Fri Dec  4 04:00:59
2009
@@ -38,7 +38,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt Fri Dec  4 04:00:59 2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl Fri Dec  4 04:00:59 2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl Fri Dec  4 04:00:59 2009
@@ -20,7 +20,7 @@
 details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 imported document-to-html.xsl for details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Fri Dec  4 04:00:59 2009
@@ -35,7 +35,7 @@
 -->
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl Fri Dec  4 04:00:59 2009
@@ -38,7 +38,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl Fri Dec  4 04:00:59
2009
@@ -19,5 +19,5 @@
 See the imported book-to-menu.xsl for details.
 -->
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl Fri Dec  4 04:00:59
2009
@@ -28,7 +28,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/plain-dev/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/plain-dev/xslt/html/site-to-xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/plain-dev/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/plain-dev/xslt/html/site-to-xhtml.xsl Fri Dec  4 04:00:59
2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
   
     
   

Modified: forrest/trunk/main/webapp/skins/plain-dev/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/plain-dev/xslt/html/tab-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/plain-dev/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/plain-dev/xslt/html/tab-to-menu.xsl Fri Dec  4 04:00:59
2009
@@ -16,5 +16,5 @@
   limitations under the License.
 -->
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/scales/css/profile.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/css/profile.css.xslt?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/css/profile.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/scales/css/profile.css.xslt Fri Dec  4 04:00:59 2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   

Modified: forrest/trunk/main/webapp/skins/scales/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/fo/document-to-fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/fo/document-to-fo.xsl Fri Dec  4 04:00:59
2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl Fri Dec  4 04:00:59
2009
@@ -20,7 +20,7 @@
 imported document-to-html.xsl for details.
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl Fri Dec  4 04:00:59
2009
@@ -35,7 +35,7 @@
 -->
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl Fri Dec  4 04:00:59 2009
@@ -38,7 +38,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/tigris/css/forrest.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/css/forrest.css.xslt?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/css/forrest.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/tigris/css/forrest.css.xslt Fri Dec  4 04:00:59 2009
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/fo/document-to-fo.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/fo/document-to-fo.xsl Fri Dec  4 04:00:59
2009
@@ -18,5 +18,5 @@
 
-  
+  
 

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl Fri Dec  4 04:00:59
2009
@@ -21,7 +21,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl Fri Dec  4 04:00:59
2009
@@ -28,7 +28,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl Fri Dec  4 04:00:59
2009
@@ -34,7 +34,7 @@
 
 -->
 
-  
+  
   
     
       

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl?rev=887050&r1=887049&r2=887050&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl Fri Dec  4 04:00:59 2009
@@ -38,7 +38,7 @@
 
 -->
 
-  
+  
   
     
       
       

svn commit: r886758 - /forrest/branches/dispatcher_rewrite/STATUS.txt
2009-12-03T12:21:48Z

Author: thorsten
Date: Thu Dec  3 12:21:48 2009
New Revision: 886758

URL: http://svn.apache.org/viewvc?rev=886758&view=rev
Log:
This branch is closed.

Added:
    forrest/branches/dispatcher_rewrite/STATUS.txt
      - copied unchanged from r886757, forrest/branches/FORREST_05_BRANCH/STATUS.txt






svn commit: r886753 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/
2009-12-03T12:15:54Z

Author: thorsten
Date: Thu Dec  3 12:15:53 2009
New Revision: 886753

URL: http://svn.apache.org/viewvc?rev=886753&view=rev
Log:
redoing r816466

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io.LICENSE.txt
  (props changed)
      - copied unchanged from r886714, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit.jar.license.html
  (props changed)
      - copied unchanged from r886714, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar.license.html
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl.jar.license.txt
  (props changed)
      - copied unchanged from r886714, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar.license.txt
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar.license.html
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar.license.txt

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io.LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io.LICENSE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  3 12:15:53 2009
@@ -0,0 +1 @@
+/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.LICENSE.txt:700364-883333

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit.jar.license.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit.jar.license.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  3 12:15:53 2009
@@ -0,0 +1 @@
+/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar.license.html:700364-883333

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl.jar.license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl.jar.license.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  3 12:15:53 2009
@@ -0,0 +1 @@
+/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar.license.txt:700364-883333







svn commit: r886750 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib: axiom-LICENSE.txt axiom-api-LICENSE.txt axiom-impl-LICENSE.txt geronimo-stax-api.license.txt geronimo-stax-api_1.0_spec.license.txt
2009-12-03T12:12:03Z

Author: thorsten
Date: Thu Dec  3 12:12:03 2009
New Revision: 886750

URL: http://svn.apache.org/viewvc?rev=886750&view=rev
Log:
redoing r816460

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-api-LICENSE.txt
  (props changed)
      - copied unchanged from r886714, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-impl-LICENSE.txt
  (props changed)
      - copied unchanged from r886714, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api.license.txt
  (props changed)
      - copied unchanged from r886714, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec.license.txt
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec.license.txt

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-api-LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-api-LICENSE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  3 12:12:03 2009
@@ -0,0 +1 @@
+/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt:700364-883333

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-impl-LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-impl-LICENSE.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  3 12:12:03 2009
@@ -0,0 +1 @@
+/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt:700364-883333

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api.license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api.license.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  3 12:12:03 2009
@@ -0,0 +1 @@
+/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec.license.txt:700364-883333







svn commit: r886749 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src: cocoon-2.2-block/ cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/ cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/ ...
2009-12-03T12:07:26Z

Author: thorsten
Date: Thu Dec  3 12:07:25 2009
New Revision: 886749

URL: http://svn.apache.org/viewvc?rev=886749&view=rev
Log:
redoing r795708

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/factories/ContractFactory.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestStructurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestStructurerAXIOM.java

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties?rev=886749&r1=886748&r2=886749&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties
Thu Dec  3 12:07:25 2009
@@ -1 +1,17 @@
+#
+# 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.
+#
 java.version=1.5

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties?rev=886749&r1=886748&r2=886749&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
Thu Dec  3 12:07:25 2009
@@ -1,3 +1,19 @@
+#
+# 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.
+#
 dispatcher.theme=common
 dispatcher.theme-ext=.structurer.xml
 dispatcher.fallback.theme=common

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml?rev=886749&r1=886748&r2=886749&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
Thu Dec  3 12:07:25 2009
@@ -1,4 +1,22 @@
 
+
 
 
       
-        
       
     

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=886736&r1=886735&r2=886736&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
Thu Dec  3 10:54:20 2009
@@ -325,16 +325,19 @@
     
     
       
-      
     
     
     
-      
     
     
-      
     
   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=886736&r1=886735&r2=886736&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
Thu Dec  3 10:54:20 2009
@@ -68,7 +68,7 @@
       
       
 
-        
+        
         
           
           
@@ -85,7 +85,6 @@
         
       
       
-
         
       







svn commit: r886734 - /forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties
2009-12-03T10:42:37Z

Author: thorsten
Date: Thu Dec  3 10:42:37 2009
New Revision: 886734

URL: http://svn.apache.org/viewvc?rev=886734&view=rev
Log:
The dispatcher is a single plugin now

Modified:
    forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties

Modified: forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties?rev=886734&r1=886733&r2=886734&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties Thu Dec  3 10:42:37
2009
@@ -22,7 +22,7 @@
 # project.required.plugins property in the forrest.properties file by the one 
 # defined in this file.
 #
-project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
+project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher
 
 # Work around for FOR-1066
 # Dispatcher started failing on seed sample site 







svn commit: r886147 [6/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
2009-12-02T13:58:28Z

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Wed Dec  2 13:58:18 2009
@@ -16,982 +16,995 @@
  */
 package org.apache.forrest.dispatcher.transformation;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
+import java.io.StringReader;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.URIResolver;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.axiom.attachments.utils.IOUtils;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.transformation.AbstractSAXTransformer;
-import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.cocoon.util.TraxErrorHandler;
+import org.apache.cocoon.xml.RedundantNamespacesFilter;
 import org.apache.cocoon.xml.XMLUtils;
-import org.apache.cocoon.xml.dom.DOMBuilder;
-import org.apache.cocoon.xml.dom.DOMUtil;
+import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceNotFoundException;
 import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.AggregatedValidity;
-import org.apache.excalibur.xml.xpath.XPathProcessor;
-import org.apache.forrest.dispatcher.ContractBean;
-import org.apache.forrest.dispatcher.ContractBeanDOMImpl;
-import org.apache.forrest.dispatcher.DispatcherException;
-import org.apache.forrest.dispatcher.DispatcherHelper;
-import org.apache.forrest.dispatcher.lenya.xml.DocumentHelper;
-import org.apache.forrest.dispatcher.lenya.xml.NamespaceHelper;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.apache.excalibur.xml.sax.SAXParser;
+import org.apache.forrest.dispatcher.api.Contract;
+import org.apache.forrest.dispatcher.api.Resolver;
+import org.apache.forrest.dispatcher.config.WritableDispatcherBean;
+import org.apache.forrest.dispatcher.exception.ContractException;
+import org.apache.forrest.dispatcher.exception.DispatcherException;
+import org.apache.forrest.dispatcher.factories.ContractFactory;
+import org.apache.forrest.dispatcher.impl.CocoonResolver;
+import org.apache.forrest.dispatcher.impl.helper.AXIOMXPathCreate;
+import org.apache.forrest.dispatcher.impl.helper.Captions;
+import org.apache.forrest.dispatcher.impl.helper.StAX;
+import org.apache.forrest.dispatcher.impl.helper.StreamHelper;
+import org.apache.forrest.dispatcher.impl.helper.XMLProperties;
+import org.jaxen.JaxenException;
 import org.xml.sax.Attributes;
+import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
 
+/**
+ * A cocoon transformer class for the dispatcher.
+ * 
+ * Unlike the wrapper this class will do the actual work and only reuse the
+ * contract handling from the core. This class is nearly the same as we had
+ * before just switching DOM for StAX/AXIOM.
+ * 
+ * @version 1.0
+ * 
+ */
 public class DispatcherTransformer extends AbstractSAXTransformer implements
     Disposable, CacheableProcessingComponent, URIResolver {
 
-  /* Node and attribute names */
-  /**
-   * forrest:view element is used to structure contracts and
-   * hooks into format specific container. It allows to configure x different
-   * format for the request.
-   * 
-   * -   *          <<strong>forrest:view</strong> format="html"/>
-   * 
-   */
-  public static final String STRUCTURER_ELEMENT = "view";
+  private static final String PATH_PREFIX = "result";
 
   /**
-   * forrest:view element is used to structure contracts and
-   * hooks into format specific container. It allows to configure x different
-   * format for the request. The attribute which identify a view format is
-   * format.
-   * 
-   * -   *          <forrest:view <strong>format</strong>="html"/>
-   * 
+   * The requested format.
+   * 
+   * Used to identify the structure to process
    */
-  public static final String STRUCTURER_FORMAT_ATTRIBUTE = "type";
-
-  public static final String STRUCTURER_HOOK_XPATH_ATTRIBUTE = "hooksXpath";
-
-  protected String requestedFormat;
-
-  private boolean includeNodes = true;
+  private String requestedFormat;
 
   /**
-   * forrest:hook element is used to structure the elements. It
-   * allows to create skeletons that a designer needs to apply a specific layout
-   * via e.g. css. In html for example
-   * 
-   * 
-   *          <forrest:hook name="test"/>
-   * 
-   * 
+   * The requested id.
    * 
-   * will be transformed to
-   * 
-   * 
-   * -   *          <div id="test"/>
-   * 
+   * Used to request the corresponding properties file for the request
    */
-  public static final String DISPATCHER_HOOK_ELEMENT = "hook";
+  private String requestId;
 
   /**
-   * forrest:css element is used to apply a specific layout via
-   * css. In html for example
-   * 
-   * -   *          <forrest:css url="pelt.basic.css" media="screen" theme="Pelt"/>
-   * 
-   * 
-   * 
-   * will be transformed to
-   * 
-   * 
-   * -   *          <link media="screen" href="../themes/pelt.basic.css" title="Pelt" rel="stylesheet" type="text/css" />
-   * 
+   * Caching and validity properties
    */
-  public static final String DISPATCHER_CSS_ELEMENT = "css";
+  private String cacheKey, validityFile;
 
-  private String propertyID;
+  private SourceValidity validity;
 
-  private boolean insideProperties = false;
+  private String validityChecking;
 
   /**
-   * Convenience object, so we don't need to create an AttributesImpl for every
-   * element.
+   * Resolver which will be used for uri resolving
    */
-  protected AttributesImpl attributes;
-
-  protected String currentFormat;
 
-  protected ContractBean contract;
+  private org.apache.excalibur.source.SourceResolver m_resolver;
 
   /**
-   * The namespace used by the transformer for the SAX events filtering. This
-   * either equals to the {@link #defaultNamespaceURI} or to the value set by
-   * the namespaceURI sitemap parameter for the pipeline. Must
-   * never be null.
+   * The caption for the cache parameter
    */
-  protected String namespaceURI;
+  public static final String CACHE_PARAMETER = "cacheKey";
 
   /**
-   * This is the default namespace used by the transformer. Implementations
-   * should set its value in the constructor. Must never be null.
+   * The caption for the validity parameter
    */
-  protected String defaultNamespaceURI;
-
-  private DOMBuilder builder, dispatcherBuilder;
-
-  private Transformer structurerTransformer;
-
-  private Element rootNode;
-
-  private XPathProcessor processor;
-
-  private Document document;
-
-  private NamespaceHelper dispatcher;
-
-  private Map storedPrefixMap;
-
-  private String path = null;
-
-  private boolean recording, allowMarkup;
-
-  public static final String DISPATCHER_ALLOW_MARKUP = "allowMarkup";
-
-  private DispatcherHelper dispatcherHelper;
-
-  private boolean insideStructurer = false;
-
-  private String hooksXSL, cacheKey, validityFile;
-
-  private HashMap hooksPosition;
-
-  private HashMap parameterHelper;
-
-  private org.apache.excalibur.source.SourceResolver m_resolver;
-
-  private String requestId;
-
-  private Document defaultProperties;
-
-  private AggregatedValidity validity;
-
-  private String validityOverride;
+  public static final String VALIDITY_PARAMETER = "validityFile";
 
-  public static final String HOOKS_TRANSFORMER_PARAMETER = "hooksTransformer";
+  /**
+   * The caption for the validity override parameter
+   */
+  public static final String VALIDITY_OVERRIDE_PARAMETER = "dispatcher.caching";
 
-  public static final String PATH_PARAMETER = "path";
+  /**
+   * The caption for the condition that caching is turned off
+   */
+  public static final String CACHING_OFF = "off";
 
-  static public final String DISPATCHER_REQUEST_ATTRIBUTE = "request";
+  /**
+   * The caption for the condition that caching is turned on
+   */
+  public static final String CACHING_ON = "on";
 
-  public static final String CACHE_PARAMETER = "cacheKey";
+  /**
+   * Main configuration bean of the dispatcher.
+   * 
+   * This config will control things like
+   * 
contract prefixes/suffixes
+   * 

+   * resolver to use
+   */
+  private WritableDispatcherBean config;
 
-  public static final String VALIDITY_PARAMETER = "validityFile";
+  /**
+   * Cocoon 2.2 compatible method. Allow that the ServiceManager is be set via
+   * e.g. spring
+   * 
+   * @param manager
+   *          manger to use in the context
+   */
+  public void setManager(ServiceManager manager) {
+    this.manager = manager;
+  }
 
-  private static final String VALIDITY_OVERRIDE_PARAMETER = "dispatcher.caching";
+  /**
+   * The level of xpath support we need.
+   * 
+   * If you choose enhanced you can inject/create node with enhanced xpath
+   * expression like e.g. /root/child[id='test']
+   * 

+   * Supported values are: basic | enhanced
+   */
+  private String xpathSupport;
 
-  private static final String CACHING_OFF = "off";
+  /**
+   * @param xpathSupport
+   *          the xpathSupport to set
+   */
+  public synchronized void setXpathSupport(String xpathSupport) {
+    this.xpathSupport = xpathSupport;
+  }
 
-  private static final String CACHING_ON = "on";
+  /**
+   * The prefix that we need to use to resolve a concrete contract.
+   */
+  private String contractUriPrefix;
 
   /**
-   * Constructor Set the namespace
+   * The parameter caption use to pass the requestId from the sitemap to the
+   * contract
    */
-  public DispatcherTransformer() {
-    this.defaultNamespaceURI = DispatcherHelper.DISPATCHER_NAMESPACE_URI;
-  }
+  public static final String DISPATCHER_REQUEST_ATTRIBUTE = "request";
 
   /**
-   * Generate the unique key. This key must be unique inside the space of this
-   * component.
-   * 
-   * @return The generated key hashes the src
+   * The caption of the key for the default variables
    */
-  public Serializable getKey() {
-    return this.cacheKey;
-  }
+  private static final String DEFAULT_VARIABLES = "defaultVariables";
 
   /**
-   * Generate the validity object.
-   * 
-   * @return The generated validity object or null if the
-   *         component is currently not cacheable.
+   * preparing the parser that will pick up the result and pass it to the
+   * consumer again.
    */
-  public SourceValidity getValidity() {
-    // You can either request URL?dispatcher.caching=off
-    // or add this property to forrest.properties.xml
-    // to force a SourceValidity.INVALID
-    if (null != validityFile && !(validityOverride.equals(CACHING_OFF))) {
-      this.validity = new AggregatedValidity();
-      Source resolveSource=null;
-      try {
-        resolveSource= m_resolver.resolveURI(validityFile);
-        this.validity.add(resolveSource.getValidity());
-      } catch (Exception e) {
-        getLogger().error(e.getMessage());
-      }finally{
-        release(resolveSource);
-      }
-    } else
-      this.validity = null;
-    return this.validity;
-  }
+  private SAXParser parser = null;
+  private OMFactory factory;
+  private ContractFactory contractRep;
 
+  /*
+   * Housekeeping variables to indicate the state of processing. Remember SAX is
+   * a stream.
+   */
   /**
-   * @see org.apache.excalibur.source.SourceFactory#release(org.apache.excalibur.source.Source) 
+   * whether or not we need to process the properties
    */
- public void release(Source source) {
-   if(source!=null){
-     m_resolver.release(source);
-   }
-  }
-  
+  private boolean insideProperties = false;
   /**
-   * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+   * whether or not we need are in the requested structurer
    */
-  public void service(ServiceManager manager) throws ServiceException {
-    super.service(manager);
+  private boolean includeNodes = true;
+  private OMElement root;
+
+  private OMElement pathNode;
+
+  private Resolver resolverDispatcher;
+
+  private Contract contract;
+
+  private HashMap map;
+
+  private HashMap localParams;
+
+  private String currentProperty;
+
+  private InputStream dataStream;
+
+  private String prefixString;
+
+  private TransformerFactory tfactory = TransformerFactory.newInstance();
+
+  private EntityResolver entityResolver;
+
+  private boolean multipleRoot;
+
+  /*
+   * @see
+   * org.apache.cocoon.transformation.AbstractSAXTransformer#configure(org.apache
+   * .avalon.framework.configuration.Configuration)
+   */
+  public void configure(Configuration configuration)
+      throws ConfigurationException {
+    // creating a new config and store the general not request specific
+    // parameters here
+    config = new WritableDispatcherBean();
+    config.setStaxHelper(new StAX());
+    // are we allowing xml properties?
+    boolean allowXml = configuration.getChild("allowXml").getValueAsBoolean(
+        false);
+    config.setAllowXmlProperties(allowXml);
+    // set the prefix for the contract resolving
+    contractUriPrefix = configuration.getChild("contractUriPrefix").getValue(
+        "cocoon://resolve.contract.");
+    // set the suffix for the contract
+    config.setContractUriSufix(configuration.getChild("contractUriSufix")
+        .getValue(""));
+    // what level of xpath support do we want to allow?
+    xpathSupport = configuration.getChild("xpathSupport").getValue("basic");
+    // Do we want to shrink xml properties that have only a @value?
+    boolean shrink = configuration.getChild("shrink").getValueAsBoolean(true);
+    config.setShrink(shrink);
+    config.setEntityResolver(this.entityResolver);
+    // request all factories to be created at this point since it is better to
+    // create them only once
+    try {
+      setNewTransformerFactory();
+    } catch (ProcessingException e) {
+      throw new ConfigurationException(e.getLocalizedMessage(), e);
+    } catch (TransformerFactoryConfigurationError e) {
+      throw new ConfigurationException(e.getLocalizedMessage(), e);
+    }
   }
 
   /**
-   * @see org.apache.avalon.framework.activity.Disposable#dispose()
+   * Cocoon 2.2 compatible method. Allow that the WritableDispatcherBean is be
+   * set via e.g. spring
+   * 
+   * @param config
+   *          the configuration to use.
+   * @throws TransformerFactoryConfigurationError
+   * @throws ProcessingException
    */
-  public void dispose() {
-    if (null != this.manager) {
-      if (null!=m_resolver)
-        this.manager.release(m_resolver);
-      this.manager = null;
+  public void setConfig(WritableDispatcherBean config)
+      throws ProcessingException, TransformerFactoryConfigurationError {
+    this.config = config;
+    if (config.getTransFact() == null) {
+      setNewTransformerFactory();
     }
-    m_resolver = null;
-    insideProperties = false;
-    super.dispose();
+    contractUriPrefix = config.getContractUriPrefix();
   }
 
   /**
-   * Recycle the component
+   * Will prepare the factories that we need in further processing
+   * 
+   * @throws TransformerFactoryConfigurationError
+   * @throws ProcessingException
    */
-  public void recycle() {
-    localRecycle();
-    this.validity = null;
-    super.recycle();
-
+  private void setNewTransformerFactory()
+      throws TransformerFactoryConfigurationError, ProcessingException {
+    // set the uri resolver the same as this class
+    tfactory.setURIResolver(this);
+    // we want to set the error handler here to make sure it is intitialized
+    tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
+    // add the factory to the config
+    config.setTransFact(tfactory);
+    // get the OM factory
+    this.factory = OMAbstractFactory.getOMFactory();
+    // get the contract factory
+    this.contractRep = new ContractFactory(config);
+    try {
+      parser = (SAXParser) manager.lookup(SAXParser.ROLE);
+    } catch (ServiceException e) {
+      String error = "dispatcherError:\n"
+          + "SAXParser could not be setup! Abort";
+      getLogger().error(error);
+      throw new ProcessingException(error);
+    }
   }
 
-  // we do all the heavy stuff later and only prepare the basics here,
-  // this enhance the response time while caching.
+  /*
+   * @see
+   * org.apache.cocoon.transformation.AbstractSAXTransformer#setup(org.apache
+   * .cocoon.environment.SourceResolver, java.util.Map, java.lang.String,
+   * org.apache.avalon.framework.parameters.Parameters)
+   */
   public void setup(SourceResolver resolver, Map objectModel, String src,
       Parameters par) throws ProcessingException, SAXException, IOException {
+    /*
+     * we do all the heavy stuff later and only prepare the basics here, this
+     * enhance the response time while caching.
+     */
+    // setup our super class
     super.setup(resolver, objectModel, src, par);
-    
-    storedPrefixMap = new HashMap();
-    this.parameterHelper = new HashMap();
-
-    this.hooksPosition = new HashMap();
-
-    this.allowMarkup = Boolean.getBoolean(parameters.getParameter(
-        DISPATCHER_ALLOW_MARKUP, null));
-    this.requestId = parameters.getParameter(DISPATCHER_REQUEST_ATTRIBUTE, null);
+
+    // get the id of this request
+    this.requestId = parameters
+        .getParameter(DISPATCHER_REQUEST_ATTRIBUTE, null);
+    // get the external cache key
     this.cacheKey = parameters.getParameter(CACHE_PARAMETER, null);
     if (null == this.cacheKey)
       getLogger().warn(
           "Caching not activated! Declare the CACHE_KEY_PARAMETER="
               + CACHE_PARAMETER + " in your sitemap.");
+    /*
+     * which is the file use to watch for changes (normally the structurer of
+     * the request). As long the file does not change we are using the cache
+     * object.
+     */
     this.validityFile = parameters.getParameter(VALIDITY_PARAMETER, null);
-    this.validityOverride = parameters
-        .getParameter(VALIDITY_OVERRIDE_PARAMETER, "");
-    this.cacheKey += validityOverride;
-
+    // do we want to force that is caching is turned off?
+    this.validityChecking = parameters.getParameter(
+        VALIDITY_OVERRIDE_PARAMETER, "");
     if (requestId == null) {
       String error = "dispatcherError:\n"
           + "You have to set the \"request\" parameter in the sitemap!";
       getLogger().error(error);
       throw new ProcessingException(error);
     }
-
-    parameterHelper.put(DISPATCHER_REQUEST_ATTRIBUTE, requestId);
-    this.requestedFormat = parameters.getParameter(STRUCTURER_FORMAT_ATTRIBUTE,
-        null);
+    // which format we want to process?
+    this.requestedFormat = parameters.getParameter(Captions.TYPE_ATT, null);
+    /*
+     * We need to change now the contract uri prefixes since in cocoon we need
+     * to add the current format.
+     */
+    String loacalPrefix = contractUriPrefix + requestedFormat + ".";
+    config.setContractUriPrefix(loacalPrefix);
     if (requestedFormat == null) {
       String error = "dispatcherError:\n"
           + "You have to set the \"type\" parameter in the sitemap!";
       getLogger().error(error);
       throw new ProcessingException(error);
     }
-    parameterHelper.put(STRUCTURER_FORMAT_ATTRIBUTE, requestedFormat);
-
-    this.hooksXSL = parameters.getParameter(HOOKS_TRANSFORMER_PARAMETER, null);
-    parameterHelper.put(HOOKS_TRANSFORMER_PARAMETER, hooksXSL);
-    if (null == m_resolver)
+    multipleRoot = parameters.getParameterAsBoolean("multipleRoot", false);
+    // add the format to the cache key
+    this.cacheKey += requestedFormat;
+    if (null == m_resolver) {
       try {
-        m_resolver = (org.apache.excalibur.source.SourceResolver) manager.lookup(SourceResolver.ROLE);
+        m_resolver = (org.apache.excalibur.source.SourceResolver) manager
+            .lookup(SourceResolver.ROLE);
+        // add the resolver we use to the dispatcher
+        resolverDispatcher = new CocoonResolver(m_resolver);
+        config.setResolver(resolverDispatcher);
       } catch (ServiceException e) {
         throw new ProcessingException(e);
       }
-
+    }
   }
 
-  /**
-   * Cleanup the transformer
+  /*
+   * old transformer link @see
+   * http://svn.apache.org/viewvc?view=rev&revision=694101
+   * 
+   * @see
+   * org.apache.cocoon.transformation.AbstractSAXTransformer#startElement(String
+   * uri, String name, String raw, Attributes attr)
    */
-  private void localRecycle() {
-    this.contract = null;
-    this.structurerTransformer = null;
-    this.insideProperties = false;
-  }
-
   public void startElement(String uri, String name, String raw, Attributes attr)
       throws SAXException {
     // Process start element event
     // Are we inside of properties? If so we need to record the elements.
     if (this.insideProperties && this.includeNodes) {
+      // just start the recording
+      super.startElement(uri, name, raw, attr);
+      // startSerializedXMLRecording(null);
+    } else if (Captions.NS.equals(uri)) {
+      // we are in the dispatcher ns
       try {
-        this.builder.startElement(uri, name, raw, attr);
-      } catch (SAXException e) {
-        this.insideProperties = false;
-        String error = "dispatcherError: " + DispatcherException.ERROR_500 + "\n"
-            + "The contract \"" + contract.getContractName()
-            + "\" has thrown in the property with ID \"" + this.propertyID
-            + "\" an error.\n\n DispatcherStack:\n " + e;
-        getLogger().error(error);
-        throw new SAXException(error);
-      }
-    } else if (DispatcherHelper.DISPATCHER_NAMESPACE_URI.equals(uri)) {
-      /*
-       * We are in the dispatcher ns.
-       */
-      if (getLogger().isDebugEnabled()) {
+        // We are in the dispatcher ns.
         getLogger().debug("Starting dispatcher element: " + raw);
-      }
-      if (STRUCTURER_ELEMENT.equals(name))
-        structurerProcessingStart(attr);
-      else if (DISPATCHER_HOOK_ELEMENT.equals(name) && this.includeNodes)
-        hookProcessingStart(name, raw, attr);
-      else if (ContractBean.CONTRACT_ELEMENT.equals(name) && this.includeNodes)
-        contractProcessingStart(attr);
-      else if (ContractBean.PROPERTY_ELEMENT.equals(name) && this.includeNodes) {
-        this.insideProperties = true;
-        propertyProcessingStart(uri, name, raw, attr);
+        if (Captions.STRUCTURE_ELEMENT.equals(name)) {
+          // we are in a structurer definition
+          structurerProcessingStart(attr);
+        }
+        if (this.includeNodes) {
+          if (Captions.HOOK_ELEMENT.equals(name)) {
+            // we are inside a hook element
+            hookProcessingStart(name, raw, attr);
+          } else if (Captions.CONTRACT_ELEMENT.equals(name)) {
+            // we are inside a contract element
+            contractProcessingStart(attr);
+          } else if (Captions.PROPERTY_ELEMENT.equals(name)) {
+            // we are inside a property element
+            // this.insideProperties = true;
+            propertyProcessingStart(uri, name, raw, attr);
+          }
+        }
+      } catch (Exception e) {
+        throw new SAXException(e);
       }
     } else {
-      if (!this.insideProperties && this.includeNodes && this.insideStructurer
-          && this.allowMarkup)
-        super.startElement(uri, name, raw, attr);
-      if (!this.insideProperties && this.includeNodes && !this.insideStructurer)
-        super.startElement(uri, name, raw, attr);
+      // Do we want to allow to have structurer definitions as nested elements?
+      if (!this.insideProperties && this.includeNodes) {
+        // super.startElement(uri, name, raw, attr);
+      }
     }
+
   }
 
-  /**
-   * @param name
-   * @param raw
-   * @param attr
-   * @throws DOMException
-   * @throws SAXException
+  /*
+   * @see
+   * org.apache.cocoon.transformation.AbstractSAXTransformer#endElement(java
+   * .lang.String, java.lang.String, java.lang.String)
    */
-  private void hookProcessingStart(String name, String raw, Attributes attr)
-      throws DOMException, SAXException {
-    /* create a DOM node from the current sax event */
-    Element currentElement = dispatcher.getDocument().createElement(name);
-    dispatcherHelper.setAttributesDOM(attr, currentElement);
-    String tempPathWithoutAttr = path + "/" + name;
-    String tempPath = dispatcherHelper
-        .setAttributesXPath(attr, tempPathWithoutAttr);
-    // If the hook has already been met, we use the position in the XPath to
-    // avoid confusion ...
-    if (hooksPosition.containsKey(tempPath)) {
-      int pos = ((Integer) hooksPosition.get(tempPath)).intValue() + 1;
-      hooksPosition.put(tempPath, new Integer(pos));
-      tempPath = dispatcherHelper.setAttributesXPathWithPosition(attr,
-          tempPathWithoutAttr, pos);
-    } else {
-      hooksPosition.put(tempPath, new Integer(1));
-    }
-    if (path == null || path.equals("")) {
-      path = name;
-      this.rootNode.appendChild(currentElement);
-    } else {
-      /* calculate, prepare and add node to the dispatcher */
+  public void endElement(String uri, String name, String raw)
+      throws SAXException {
+    getLogger().debug("Ending element: " + raw);
+    if (Captions.NS.equals(uri)) {
+      // we are in the dispatcher ns
       try {
-        Node xpathNode;
-        xpathNode = DOMUtil.getSingleNode(rootNode, path, this.processor);
-        if (xpathNode == null)
-          createXpathNode(attr, tempPath);
-        else
-          xpathNode.appendChild(currentElement);
+        if (Captions.STRUCTURE_ELEMENT.equals(name)) {
+          // we are in a structurer end element
+          if (includeNodes) {
+            includeNodes = false;
+          }
+        } else if (Captions.HOOK_ELEMENT.equals(name) && this.includeNodes) {
+          // we are inside a hook end element
+          pathNode = (OMElement) pathNode.getParent();
+        } else if (Captions.CONTRACT_ELEMENT.equals(name) && this.includeNodes) {
+          // we are inside a contract end element
+          contractProcessingEnd();
+        } else if (Captions.PROPERTY_ELEMENT.equals(name) && this.includeNodes) {
+          // we are inside a property end element
+          if (config.isAllowXmlProperties()) {
+            String property = null;
+            try {
+              // XMLizable endSAXRecording = super.endSAXRecording();
+              property = prefixString + endSerializedXMLRecording()
+                  + "";
+              insideProperties = false;
+              getLogger().debug(
+                  "super.endSerializedXMLRecording(): " + property);
+            } catch (Exception e) {
+              throw new SAXException(e);
+            }
+            if (null != property) {
+              localParams.put(currentProperty, property.getBytes());
+            }
+          }
+        }
       } catch (Exception e) {
-        String error = "dispatcherError: " + DispatcherException.ERROR_500 + "\n"
-            + "Could not set up xpath!\n\n DispatcherStack:\n " + e;
-        getLogger().error(error);
-        throw new SAXException(error);
+        throw new SAXException(e);
       }
-      path = tempPath;
+    } else if (this.insideProperties && this.includeNodes) {
+      super.endElement(uri, name, raw);
     }
   }
 
-  /**
-   * @param attr
-   * @param tempPath
-   * @throws ProcessingException
-   * @throws DOMException
+  public void characters(char c[], int start, int len) throws SAXException {
+    /*
+     * only if we in properties mode we want to record the characters.
+     */
+    if (includeNodes && insideProperties) {
+      super.characters(c, start, len);
+    }
+  }
+
+  public void startDocument() throws SAXException {
+    // Add the namespace filter to our own output.
+    RedundantNamespacesFilter nsPipe = new RedundantNamespacesFilter();
+    if (this.xmlConsumer != null) {
+      nsPipe.setConsumer(this.xmlConsumer);
+    } else {
+      nsPipe.setContentHandler(this.contentHandler);
+    }
+    setConsumer(nsPipe);
+  }
+
+  public void endDocument() throws SAXException {
+    structurerProcessingEnd();
+  }
+
+  /*
+   * do nothing on the following methods, since we do not use them
    */
-  private void createXpathNode(Attributes attr, String tempPath)
-      throws ProcessingException, DOMException {
-    Node xpathNode;
-    xpathNode = DOMUtil.selectSingleNode(rootNode, tempPath, this.processor);
-    if (attr != null)
-      dispatcherHelper.setAttributesDOM(attr, xpathNode);
+  public void ignorableWhitespace(char c[], int start, int len)
+      throws SAXException {
+  }
+
+  public void startCDATA() throws SAXException {
+  }
+
+  public void endCDATA() throws SAXException {
+  }
+
+  public void comment(char[] ary, int start, int length) throws SAXException {
   }
 
   /**
-   * @param attr
-   * @param tempPath
-   * @throws ProcessingException
-   * @throws DOMException
+   * Will execute the contract and process the result.
+   * 
+   * @throws ContractException
+   * @throws IOException
+   * @throws JaxenException
+   * @throws XMLStreamException
    */
-  private Node createXpathNode(String tempPath) throws ProcessingException,
-      DOMException {
-    Node xpathNode;
-    xpathNode = DOMUtil.selectSingleNode(rootNode, tempPath, this.processor);
-    return xpathNode;
+  private void contractProcessingEnd() throws ContractException, IOException,
+      JaxenException, XMLStreamException {
+    // get the result stream from contract by executing it
+    InputStream resultStream = contract.execute(dataStream, localParams);
+    // close data stream
+    StreamHelper.closeStream(dataStream);
+    // add the result of the contract to the overall result set
+    try {
+      processContractResult(resultStream, pathNode);
+    } catch (OMException e) {
+      String error = DispatcherException.ERROR_500 + "\n"
+      + "component: ContractBean" + "\n"
+      + "message: Could not setup contractBean \"" + contract.getName() + "\". It seems that the result of the contract " +
+      		"is returning an empty document. This normally happens when no forrest:content container is returned or" +
+      		" the container does not contains any forrest:part.\n\n"
+      + "dispatcherErrorStack:\n" + e;
+  getLogger().error(error);
+  throw new ContractException(error);
+    }
+    // close the result Stream
+    StreamHelper.closeStream(resultStream);
   }
 
-  public void endElement(String uri, String name, String raw) throws SAXException {
-    if (getLogger().isDebugEnabled()) {
-      getLogger().debug("Ending element: " + raw);
-    }
-    // Are we inside of properties? If so we need to record the elements.
-    if (this.insideProperties) {
-      propertyProcessingEnd(uri, name, raw);
-    } else if (DispatcherHelper.DISPATCHER_NAMESPACE_URI.equals(uri)) {
-      if (STRUCTURER_ELEMENT.equals(name))
-        structurerProcessingEnd(raw);
-      else if (ContractBean.CONTRACT_ELEMENT.equals(name) && this.includeNodes)
-        contractProcessingEnd();
-      else if (DISPATCHER_HOOK_ELEMENT.equals(name) && this.includeNodes)
-        if (path.lastIndexOf("/") > -1)
-          path = path.substring(0, path.lastIndexOf("/"));
-        else
-          path = null;
-    } else {
-      if (!this.insideProperties && this.includeNodes && this.insideStructurer
-          && this.allowMarkup)
-        super.endElement(uri, name, raw);
-      if (!this.insideProperties && this.includeNodes && !this.insideStructurer)
-        super.endElement(uri, name, raw);
+  /**
+   * Process the contract result to add it to the overall result set.
+   * 
+   * @param resultStream
+   * @param pathNode
+   * @throws XMLStreamException
+   * @throws JaxenException
+   */
+  @SuppressWarnings("unchecked")
+  private void processContractResult(InputStream resultStream,
+      OMElement pathNode) throws XMLStreamException, JaxenException {
+    // get xml stream reader
+    XMLStreamReader contractResultReader = config.getStaxHelper().getReader(
+        resultStream);
+    // get Axiom builder
+    StAXOMBuilder builder = new StAXOMBuilder(contractResultReader);
+    // get the document element
+    OMElement content = builder.getDocumentElement();
+    /*
+     * For full blown ns support we need to get all ns from the result. This
+     * will be passed later to the XPath processor.
+     */
+    Iterator ns = content.getAllDeclaredNamespaces();
+    HashSet spaces = new HashSet();
+    while (ns.hasNext()) {
+      OMNamespace space = ns.next();
+      spaces.add(space);
+    }
+    // get the different parts of the contract
+    Iterator parts = content.getChildrenWithName(qIt(
+        Captions.NS_CONTRACTS, Captions.PART_ELEMENT));
+    while (parts.hasNext()) {
+      // while we have more parts, get the next part
+      OMElement part = parts.next();
+      // where do we need to inject it
+      String xpath = part.getAttributeValue(qIt(Captions.RESULT_XPATH));
+      // get the children of a part. This children needs to be injected in
+      // the result
+      Iterator children = part.getChildren();
+
+      if (xpath == null) {
+        // when we do not have a xpath to inject we will inject it in the
+        // current loaction
+        while (children.hasNext()) {
+          OMNode child = (OMNode) children.next();
+          pathNode.addChild(child);
+        }
+      } else {
+        // make sure the xpath is starting with "/"
+        if (!xpath.startsWith("/")) {
+          String message = contract.getName()
+              + " is using relative injection points which is not permited. "
+              + "Please fix this ASAP, for now we will do it for you.";
+          getLogger().warn(message);
+          xpath = "/" + xpath;
+        }
+        // lookup the node where we want to inject the result part
+        xpath = "/" + PATH_PREFIX + xpath;
+        // we need to feed the xpathSelector with the ns we may have
+        AXIOMXPathCreate xpathSelector = new AXIOMXPathCreate(xpath);
+        // add all namespaces that are known to the selector
+        for (OMNamespace space : spaces) {
+          xpathSelector
+              .addNamespace(space.getPrefix(), space.getNamespaceURI());
+        }
+        // request the final inject point (node which will be used to inject the
+        // result)
+        OMElement injectionPoint = (OMElement) xpathSelector.selectSingleNode(
+            root, true);
+        // now iterate through the children of the result part and append the
+        // content to the injection point
+        while (children.hasNext()) {
+          OMNode child = (OMNode) children.next();
+          injectionPoint.addChild(child);
+        }
+
+      }
     }
   }
 
   /**
-   * view type="?" Here we check which format we have in the view. That should
-   * be extended to matching the requested format
+   * Helper method to create a qname
    * 
-   * @param attr
+   * @param name
+   *          the element name
+   * @return a qualified qname
+   */
+  private QName qIt(String name) {
+    return new QName(name);
+  }
+
+  /**
+   * Helper method to create a qname
+   * 
+   * @param name
+   *          the element name
+   * @param uri
+   *          the ns
+   * @return a qualified qname
+   */
+  private QName qIt(String uri, String name) {
+    return new QName(uri, name);
+  }
+
+  /**
+   * Finish the processing of the structurer
+   * 
+   * @param raw
    * @throws SAXException
    */
-  private void structurerProcessingStart(Attributes attr) throws SAXException {
-    this.insideStructurer = true;
-    for (int i = 0; i < attr.getLength(); i++) {
-      String localName = attr.getLocalName(i);
-      String value = attr.getValue(i);
-      if (localName.equals(STRUCTURER_FORMAT_ATTRIBUTE)) {
-        currentFormat = value;
-      }
-      if (localName.equals(STRUCTURER_HOOK_XPATH_ATTRIBUTE)) {
-        if ("/".equals(String.valueOf(value.charAt(0))) && value.length() != 1) {
-          path = "result" + value;
-        } else if ("/".equals(String.valueOf(value.charAt(0)))
-            && value.length() == 1) {
-          path = "result";
-        } else {
-          path = "result/" + value;
-        }
-      }
-    }
-    if (requestedFormat.equals(currentFormat)) {
-      localRecycle();
-      try {
-        if (null == this.dispatcherHelper)
-          this.dispatcherHelper = new DispatcherHelper(m_resolver);
-        if (null == this.processor)
-          this.processor = (XPathProcessor) this.manager
-              .lookup(XPathProcessor.ROLE);
-      } catch (Exception e) {
-        String error = "dispatcherError:\n Could not set up the dispatcherHelper!\n DispatcherStack: "
-            + e;
-        getLogger().error(error);
-        throw new SAXException(error);
-      }
-      String propertyURI = "cocoon://" + requestId + ".props";
-      try {
-        this.defaultProperties = org.apache.forrest.dispatcher.util.SourceUtil
-            .readDOM(propertyURI, m_resolver);
-      } catch (Exception e1) {
-        String error = "dispatcherError:\n" + "Could not get the properties for "
-            + propertyURI + "\n DispatcherStack: " + e1;
-        getLogger().error(error);
-        throw new SAXException(error);
-      }
-      try {
-        if (this.hooksXSL == null || this.hooksXSL.equals("")) {
-          String warning = "dispatcherError:\n"
-              + "You did not set up the \"hooksTransformer\" parameter in the sitemap, we are not going to transform forrest:hooks elements."
-              + " For text output where you would not have to use hooks as structurer, the way you want it.";
-          getLogger().warn(warning);
-        } else {
-          // * just store the $hooksXSL and do the DOM-reading/storing
-          // later
-          DOMSource stylesheet = new DOMSource(dispatcherHelper
-              .getDocument(this.hooksXSL));
-          this.structurerTransformer = dispatcherHelper
-              .createTransformer(stylesheet);
-        }
-        
-      } catch (Exception e) {
-        String error = "dispatcherError:\n"
-            + "Could not set up the \"hooks transformer\".\n\n DispatcherStack:\n "
-            + e;
-        getLogger().error(error);
-        throw new SAXException(error);
-      }
-      if (path == null)
-        path = "result";
-      this.includeNodes = true;
-      this.recording = true;
-      try {
-        dispatcherHelper.setNamespaceHelper(
-            DispatcherHelper.DISPATCHER_NAMESPACE_URI,
-            DispatcherHelper.DISPATCHER_PREFIX, STRUCTURER_ELEMENT);
-        this.dispatcher = dispatcherHelper.getNamespaceHelper();
-        this.document = dispatcher.getDocument();
-        this.rootNode = document.getDocumentElement();
-        this.rootNode.setAttribute(STRUCTURER_FORMAT_ATTRIBUTE, currentFormat);
-        this.rootNode.setAttribute(STRUCTURER_HOOK_XPATH_ATTRIBUTE, path);
-        // we create the path node for the result node
-        DOMUtil.selectSingleNode(rootNode, path, this.processor);
-      } catch (Exception e) {
-        String error = "dispatcherError: " + DispatcherException.ERROR_500 + "\n"
-            + "Could not setup dispatcherHelper!\n\n DispatcherStack:\n " + e;
-        getLogger().error(error);
-        this.recording = false;
-        throw new SAXException(error);
+  private void structurerProcessingEnd() throws SAXException {
+    try {
+      // get the result of the structurer as stream
+      ByteArrayOutputStream out = new ByteArrayOutputStream();
+      OMElement firstElement = root.getFirstElement();
+
+      if (null != firstElement & !multipleRoot) {
+        firstElement.serialize(out);
+      } else {
+        root.serialize(out);
       }
 
-    } else {
-      path = null; // unset path because we do not process the node
-      this.includeNodes = false;
-      this.recording = false;
+      InputSource is = new InputSource(new StringReader(out.toString()));
+      // adding the result to the consumer
+      parser.parse(is, super.xmlConsumer);
+    } catch (Exception e) {
+      throw new SAXException(e);
     }
+
   }
 
   /**
+   * Start the processing of the properties including setting the correct state
+   * for the next event round
+   * 
+   * @param uri
+   * @param name
    * @param raw
+   * @param attr
    * @throws SAXException
    */
-  private void structurerProcessingEnd(String raw) throws SAXException {
-    if (this.recording) {
-      try {
-        NodeList resultList = this.rootNode.getFirstChild().getChildNodes();
-        for (int i = 0; i < resultList.getLength(); i++) {
-          Node array_element = resultList.item(i);
-          if (this.structurerTransformer == null) {
-            XMLUtils.valueOf(new IncludeXMLConsumer(super.xmlConsumer),
-                array_element);
-          } else {
-            DOMSource source = new DOMSource(array_element);
-            DOMResult result = new DOMResult();
-            this.structurerTransformer.transform(source, result);
-            XMLUtils.valueOf(new IncludeXMLConsumer(super.xmlConsumer), result
-                .getNode());
-          }
-        }
-
-      } catch (Exception e) {
-        String error = "dispatcherError: " + DispatcherException.ERROR_500 + "\n"
-            + "Could not setup final transformer!\n\n DispatcherStack:\n " + e;
-        getLogger().error(error);
-        this.recording = false;
-        throw new SAXException(error);
-      } finally {
-        this.recording = false;
-        this.insideStructurer = false;
+  private void propertyProcessingStart(String uri, String name, String raw,
+      Attributes attr) throws SAXException {
+    // determine the name and a possible value
+    String id = null, value = null;
+    String attributesString = "";
+    for (int i = 0; i < attr.getLength(); i++) {
+      String localName = attr.getLocalName(i);
+      String localValue = attr.getValue(i);
+      attributesString += " " + localName + "=\"" + localValue + "\"";
+      if (Captions.NAME_ATT.equals(localName)) {
+        id = localValue;
+      } else if (Captions.VALUE_ATT.equals(localName)) {
+        value = localValue;
       }
     }
-    if (getLogger().isDebugEnabled()) {
-      getLogger().debug("Ending \"" + STRUCTURER_ELEMENT + "\" element: " + raw);
+    currentProperty = id;
+    // if we allow xml properties we will just record them
+    if (config.isAllowXmlProperties()) {
+      // just start the recording
+      prefixString = "<" + raw + attributesString + ">";
+      startSerializedXMLRecording((XMLUtils.createPropertiesForXML(true)));
+      insideProperties = true;
+    } else {
+      // if we do not allow xml we will use a simple key/value approach
+      if (id != null && value != null) {
+        localParams.put(id, new String(value));
+      }
     }
+
   }
 
   /**
-   * We have found a contract. Now we have to prepare a bean to later add it to
-   * the output stream in the endElement.
+   * Start the processing of the contract this includes to resolve the data
+   * stream and the actual contract.
    * 
    * @param attr
    * @throws SAXException
    */
   private void contractProcessingStart(Attributes attr) throws SAXException {
-    try {
-      if (contract == null)
-        contract = new ContractBeanDOMImpl(m_resolver, parameterHelper,
-            defaultProperties, (URIResolver) this);
-    } catch (Exception e) {
-      String error = DispatcherException.ERROR_500 + "\n"
-          + "component: ContractBean" + "\n"
-          + "message: Could not setup contractBean." + "\n" + "\n\n"
-          + "dispatcherErrorStack:\n" + e;
-      getLogger().error(error);
-      throw new SAXException(error);
-    }
+    String name = "", data = null;
     for (int i = 0; i < attr.getLength(); i++) {
       String localName = attr.getLocalName(i);
       String value = attr.getValue(i);
-      if (ContractBean.CONTRACT_ID_ATTRIBUTE.equals(localName)) {
-        // getting the contract name
-        contract.setContractName(value);
-        String contractUri = ContractBean.CONTRACT_RESOLVE_PREFIX + "."
-            + currentFormat + "." + value;
-        Source contractSource = null;
-        try {
-          // Adding the contract to the validity object.
-          // As soon the contract changes we want a rebuild of
-          // the page and not the cached object.
-          if (!validityOverride.equals(CACHING_OFF) && null != this.validity) {
-            contractSource = m_resolver.resolveURI(contractUri);
-            SourceValidity contractValidityId = contractSource
-                .getValidity();
-            // we cannot allow null in an AggregatedValidity
-            if (null != contractValidityId)
-              this.validity.add(contractValidityId);
-          }
-          Document doc = org.apache.forrest.dispatcher.util.SourceUtil.readDOM(
-              contractUri, m_resolver);
-          contract.setContractImpl(doc, contractUri);
-          // contract.setContractImpl(contractUri);
-        } catch (Exception e) {
-          String error = "dispatcherError: "
-              + DispatcherException.ERROR_500
-              + "\n"
-              + "The contract \""
-              + contract.getContractName()
-              + "\" has thrown an exception by resolving the implementation from \""
-              + contractUri + "\".\n\n" + "dispatcherErrorStack:\n" + e;
-          getLogger().error(error);
-          throw new SAXException(error);
-        }finally{
-          release(contractSource);
-        }
-        if (getLogger().isDebugEnabled()) {
-          getLogger().debug(
-              "DISPATCHER_CONTRACT_ID_ATTRIBUTE" + "-->" + localName + "\n"
-                  + "value" + "-->" + value);
-        }
-      } else if (ContractBean.CONTRACT_NUGGET_ATTRIBUTE.equals(localName)) {
-        // contract is a nugget-contract
-        contract.setNugget(true);
-        Source contractRawSource =null;
-        try {
-          // Adding the raw data to the validity object.
-          // As soon the raw data changes we want a rebuild of
-          // the page and not the cached object.
-          if (!validityOverride.equals(CACHING_OFF) && null != this.validity) {
-            contractRawSource = m_resolver.resolveURI(value);
-            SourceValidity contractValidityRaw = contractRawSource
-                .getValidity();
-            // we cannot allow null in an AggregatedValidity
-            if (null != contractValidityRaw)
-              this.validity.add(contractValidityRaw);
-          }
-          Document doc = org.apache.forrest.dispatcher.util.SourceUtil.readDOM(
-              value, m_resolver);
-          contract.setContractRawData(doc);
-          // contract.setNuggetUri(value);
-        } catch (Exception e) {
-          String error = "dispatcherError: " + DispatcherException.ERROR_500 + "\n"
-              + "The contract \"" + contract.getContractName()
-              + "\" has thrown thrown an exception by resolving raw data from \""
-              + value + "\".\n\n" + "dispatcherErrorStack:\n " + e;
-          getLogger().error(error);
-          throw new SAXException(error);
-        } finally{
-          release(contractRawSource);
-        }
-        if (getLogger().isDebugEnabled()) {
-          getLogger().debug(
-              "ContractBean.CONTRACT_NUGGET_ATTRIBUTE" + "-->" + localName + "\n"
-                  + "value" + "-->" + value);
-        }
-      } else {
-        if (getLogger().isDebugEnabled()) {
-          getLogger().debug("localName" + "-->" + localName + " not implemented");
-        }
+      if (Captions.NAME_ATT.equals(localName)) {
+        // get the name of the contract
+        name = value;
+      } else if (Captions.DATA_ATT.equals(localName)) {
+        // see whether we have a defined dataUri
+        data = value;
       }
     }
-    /*
-     * if we do not have a nugget add a foo element to the raw data to invoke
-     * the transformation.
-     */
-    if (!contract.isNugget()) {
-      Document foo;
+    dataStream = null;
+    if (null != data && !data.equals("")) {
+      // try resolving the dataUri
       try {
-        foo = dispatcherHelper.createDocument("foo");
-        contract.setContractRawData(foo);
+        dataStream = resolverDispatcher.resolve(data);
       } catch (Exception e) {
-        String error = "dispatcherError: "
-            + DispatcherException.ERROR_500
-            + "\n"
-            + "The contract \""
-            + contract.getContractName()
-            + "\" has thrown thrown an exception by creating the dummy foo document."
-            + ".\n\n" + "dispatcherErrorStack:\n " + e;
+        String error = DispatcherException.ERROR_500 + "\n"
+            + "component: ContractBean" + "\n" + "message: ContractBean \""
+            + name + "\" has thrown an exception " + "resolving the dataUri \""
+            + data + "\".\n\n" + "dispatcherErrorStack:\n" + e;
         getLogger().error(error);
         throw new SAXException(error);
       }
     }
-  }
-
-  /**
-   * @throws SAXException
-   */
-  private void contractProcessingEnd() throws SAXException {
     try {
-      contract.setContractResultData();
-      Document node = (Document) contract.getContractResultData().getNode();
-      Document root = this.rootNode.getOwnerDocument();
-      /*
-       * debug code - uncomment it if you need it! will output the contract
-       * resulting data to sysout
-       */
-      // DOMSource source = new DOMSource(node);
-      // StreamResult result = new StreamResult(System.out);
-      // contract.getContractTransformer().transform(source, result);
-      /*
-       * append this node to the current path after testing where there is a
-       * fixed location for the contract content. If so then add it there.
-       */
-      NodeList contentChildren = node.getElementsByTagNameNS(
-          DispatcherHelper.DISPATCHER_NAMESPACE_URI, "part");
-      for (int i = 0; i < contentChildren.getLength(); i++) {
-        Element contentChild = (Element) contentChildren.item(i);
-        NodeList finalContent = contentChild.getChildNodes();
-        if (contentChild != null) {
-          String location = contentChild.getAttribute("xpath");
-          if (location.equals("") | location == null) {
-            Node xpathNode = DOMUtil.getSingleNode(rootNode, path, this.processor);
-            if (xpathNode != null) {
-              // add everything *within* the forrest:part element
-              appendChildToResultIterator(root, finalContent, xpathNode);
-            }
-          } else {
-            if (location.charAt(0) == '/')
-              location = "result" + location;
-            else
-              location = "result/" + location;
-            Node xpathNode = DOMUtil.getSingleNode(rootNode, location,
-                this.processor);
-            if (xpathNode != null) {
-              // add everything *within* the forrest:part element
-              appendChildToResultIterator(root, finalContent, xpathNode);
-            } else {
-              xpathNode = createXpathNode(location);
-              // add everything *within* the forrest:part element
-              appendChildToResultIterator(root, finalContent, xpathNode);
-            }
-          }
-        }
-      }
+
+      // get the contract
+      contract = contractRep.resolve(name);
+      // prepare empty properties map
+      localParams = new HashMap(map);
+      localParams.put("contract.name", name);
     } catch (Exception e) {
-      String error = "dispatcherError: "
-          + DispatcherException.ERROR_500
-          + "\n"
-          + "The contract \""
-          + contract.getContractName()
-          + "\" has thrown thrown an exception while trying to transform the final markup. \n\n"
-          + "dispatcherErrorStack:\n " + e;
+      String error = DispatcherException.ERROR_500 + "\n"
+          + "component: ContractBean" + "\n"
+          + "message: Could not setup contractBean \"" + name + "\".\n\n"
+          + "dispatcherErrorStack:\n" + e;
       getLogger().error(error);
       throw new SAXException(error);
-    } finally {
-      this.contract.recycle();
-    }
-  }
-
-  /**
-   * @param root
-   * @param finalContent
-   * @param xpathNode
-   * @throws DOMException
-   */
-  private void appendChildToResultIterator(Document root, NodeList finalContent,
-      Node xpathNode) throws DOMException {
-    for (int j = 0; j < finalContent.getLength(); j++) {
-      appendChildToResult(root, finalContent, xpathNode, j);
     }
-  }
 
-  /**
-   * @param root
-   * @param finalContent
-   * @param xpathNode
-   * @param j
-   * @throws DOMException
-   */
-  private void appendChildToResult(Document root, NodeList finalContent,
-      Node xpathNode, int j) throws DOMException {
-    Node contractData = finalContent.item(j);
-    Node toMove = root.importNode(contractData, true);
-    xpathNode.appendChild(toMove);
   }
 
   /**
-   * @param uri
+   * Start the processing of the hooks. Actually we just create a element in the
+   * result model with the same name and attributes as the incoming event.
+   * 
    * @param name
    * @param raw
    * @param attr
-   * @throws SAXException
    */
-  private void propertyProcessingStart(String uri, String name, String raw,
-      Attributes attr) throws SAXException {
+  private void hookProcessingStart(String name, String raw, Attributes attr) {
+    OMElement element = factory.createOMElement(name, Captions.NS, "forrest");
     for (int i = 0; i < attr.getLength(); i++) {
       String localName = attr.getLocalName(i);
       String value = attr.getValue(i);
-      if (ContractBean.PROPERTY_ID_ATTRIBUTE.equals(localName))
-        this.propertyID = value;
+      OMAttribute attribute = factory.createOMAttribute(localName, null, value);
+      element.addAttribute(attribute);
     }
-    if (this.propertyID.equals("") | this.propertyID == null) {
-      String error = "dispatcherError: " + DispatcherException.ERROR_500 + "\n"
-          + "The contract \"" + contract.getContractName()
-          + "\" has no identifier attribute \""
-          + ContractBean.PROPERTY_ID_ATTRIBUTE + "\" in the " + raw;
-      getLogger().error(error);
-      throw new SAXException(error);
-    }
-    this.builder = new DOMBuilder();
-    this.builder.startDocument();
-    launchStoredMappings();
-    this.builder.startElement(uri, name, raw, attr);
+    pathNode.addChild(element);
+    pathNode = element;
   }
 
   /**
-   * @param uri
-   * @param name
-   * @param raw
+   * view type="?" Here we check which format we have in the view. That should
+   * be extended to matching the requested format
+   * 
+   * @param attr
+   * @throws JaxenException
    * @throws SAXException
    */
-  private void propertyProcessingEnd(String uri, String name, String raw)
-      throws SAXException {
-    if (ContractBean.PROPERTY_ELEMENT.equals(name)) {
-      this.insideProperties = false;
-      if (this.includeNodes) {
-        this.builder.endElement(uri, name, raw);
-        this.builder.endDocument();
-        if (getLogger().isDebugEnabled()) {
-          getLogger()
-              .debug(
-                  "DispatcherTransformer: putting DOM tree into the contract transformer");
+  private void structurerProcessingStart(Attributes attr)
+      throws DispatcherException {
+    String m_type = "", path = "";
+    for (int i = 0; i < attr.getLength(); i++) {
+      String localName = attr.getLocalName(i);
+      String value = attr.getValue(i);
+      // determine what type (format) we have on the structurer
+      if (localName.equals(Captions.TYPE_ATT)) {
+        m_type = value;
+      }
+      /*
+       * Determine whether we have a hooks path attribute. If so it determines
+       * the smallest common path (e.g. /html/body)
+       */
+      if (localName.equals(Captions.HOOKS_ATT)) {
+        // adding the default path
+        boolean startsWithRoot = "/".equals(String.valueOf(value.charAt(0)));
+        if (!startsWithRoot) {
+          value = "/" + value;
+        } else if (value.length() == 1 && startsWithRoot) {
+          value = "";
         }
-        Transformer transformer = contract.getContractTransformer();
-        transformer.setParameter(this.propertyID, this.builder.getDocument()
-            .getFirstChild());
-        contract.setContractTransformer(transformer);
-        this.propertyID = "";
-        contract.setHasProperties(true);
-        if (getLogger().isDebugEnabled()) {
-          getLogger().debug(
-              "DispatcherTransformer: DOM tree is in the contract transformer");
+        path += value;
+      }
+    }
+    // are we in the format that have been requested?
+    if (requestedFormat.equals(m_type)) {
+      try {
+        // need to get the properties for this uri
+        map = new HashMap();
+        /*
+         * the properties are provided by a match in cocoon and are generated
+         * individually for each request
+         */
+        String propertyURI = "cocoon://" + requestId + ".props";
+        // get the source representation of the propertyURI
+        Source propsSource = m_resolver.resolveURI(propertyURI);
+        if (propsSource != null) {
+          // get an input stream from the properties
+          InputStream stream = new BufferedInputStream(propsSource
+              .getInputStream());
+          /*
+           * we need either just the bytes of the stream (if we allow xml
+           * properties) or we need to process it: extracting the properties.
+           */
+          if (config.isAllowXmlProperties()) {
+            // get the bytes from the stream
+            byte[] properties = IOUtils.getStreamAsByteArray(stream);
+            /*
+             * add the bytes to the properties map later on they will be picked
+             * up and parsed to a dom node.
+             */
+            map.put(DEFAULT_VARIABLES, properties);
+          } else {
+            // extract the properties of the incoming stream
+            XMLProperties.parseProperties(stream, map);
+          }
+          // release source - you need to ALWAYS do this!
+          release(propsSource);
         }
-        this.builder = null;
+        /*
+         * Preparing the model by creating a root document/element. Afterward we
+         * need to strip the root element again.
+         */
+        OMDocument doc = factory.createOMDocument();
+        // creating the root node for the xml document
+        root = factory.createOMElement(PATH_PREFIX, null);
+        // adding root element to the document (much like in DOM)
+        doc.addChild(root);
+        /*
+         * request a axiom xpath resolver that will return a axiom element for a
+         * given xpath expression. If the node does not exist, it is created and
+         * then returned.
+         */
+        AXIOMXPathCreate xpath = new AXIOMXPathCreate("/" + PATH_PREFIX + path);
+        // get the node (if it does not exist, create it)
+        pathNode = (OMElement) xpath.selectSingleNode(root, true);
+        // we need to set the status variable, indicating we need process the
+        // children.
+        this.includeNodes = true;
+      } catch (Exception e) {
+        throw new DispatcherException(e);
       }
     } else {
-      if (this.includeNodes)
-        this.builder.endElement(uri, name, raw);
+      pathNode = null; // unset path because we do not process the node
+      this.includeNodes = false;
     }
-  }
 
-  public void characters(char c[], int start, int len) throws SAXException {
-    if (this.insideProperties && this.includeNodes)
-      this.builder.characters(c, start, len);
-    else if (!this.insideProperties && this.includeNodes && !this.insideStructurer)
-      super.contentHandler.characters(c, start, len);
   }
 
-  public void startCDATA() throws SAXException {
-    if (this.insideProperties && this.includeNodes)
-      this.builder.startCDATA();
-    else if (!this.insideProperties && this.includeNodes && !this.insideStructurer)
-      super.lexicalHandler.startCDATA();
+  /**
+   * Generate the unique key. This key must be unique inside the space of this
+   * component.
+   * 
+   * @return The generated key hashes the src
+   */
+  public Serializable getKey() {
+    return this.cacheKey;
   }
 
-  public void endCDATA() throws SAXException {
-    if (this.insideProperties && this.includeNodes)
-      this.builder.endCDATA();
-    else if (!this.insideProperties && this.includeNodes && !this.insideStructurer)
-      super.lexicalHandler.endCDATA();
+  /**
+   * Generate the validity object.
+   * 
+   * @return The generated validity object or null if the component
+   *         is currently not cacheable.
+   */
+  public SourceValidity getValidity() {
+    // You can either request URL?dispatcher.caching=off
+    // or add this property to forrest.properties.xml
+    // to force a SourceValidity.INVALID
+    if (null != validityFile && !(validityChecking.equals(CACHING_OFF))) {
+      Source resolveSource = null;
+      try {
+        resolveSource = m_resolver.resolveURI(validityFile);
+        this.validity = resolveSource.getValidity();
+      } catch (Exception e) {
+        getLogger().error(e.getMessage());
+      } finally {
+        release(resolveSource);
+      }
+    } else
+      this.validity = null;
+    return this.validity;
   }
 
-  /** BEGIN SAX ContentHandler handlers * */
-
-  public void startPrefixMapping(String prefix, String uri) throws SAXException {
-    super.startPrefixMapping(prefix, uri);
-    if (this.insideProperties && this.includeNodes) {
-      this.builder.startPrefixMapping(prefix, uri);
-    } else {
-      storePrefixMapping(prefix, uri);
+  /**
+   * @see org.apache.excalibur.source.SourceFactory#release(org.apache.excalibur.source.Source)
+   */
+  public void release(Source source) {
+    if (source != null) {
+      m_resolver.release(source);
     }
   }
 
-  /** END SAX ContentHandler handlers * */
-
-  protected void storePrefixMapping(String prefix, String uri) {
-    storedPrefixMap.put(prefix, uri);
+  /**
+   * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+   */
+  public void service(ServiceManager manager) throws ServiceException {
+    super.service(manager);
+    this.entityResolver = (EntityResolver) this.manager
+        .lookup(org.apache.excalibur.xml.EntityResolver.ROLE);
   }
 
-  protected void launchStoredMappings() throws SAXException {
-    Iterator it = storedPrefixMap.keySet().iterator();
-    while (it.hasNext()) {
-      String pre = (String) it.next();
-      String uri = (String) storedPrefixMap.get(pre);
-      getLogger().debug(
-          "WriteSessionTransformer: launching prefix mapping[ pre: " + pre
-              + " uri: " + uri + " ]");
-      this.builder.startPrefixMapping(pre, uri);
+  /**
+   * @see org.apache.avalon.framework.activity.Disposable#dispose()
+   */
+  public void dispose() {
+    if (null != this.manager) {
+      if (null != m_resolver)
+        this.manager.release(m_resolver);
+      this.manager = null;
     }
+    m_resolver = null;
+    super.dispose();
   }
 
-  protected void launchStoredMappingsDispatcher() throws SAXException {
-    Iterator it = storedPrefixMap.keySet().iterator();
-    while (it.hasNext()) {
-      String pre = (String) it.next();
-      String uri = (String) storedPrefixMap.get(pre);
-      getLogger().debug(
-          "WriteSessionTransformer: launching prefix mapping[ pre: " + pre
-              + " uri: " + uri + " ]");
-      this.dispatcherBuilder.startPrefixMapping(pre, uri);
-    }
+  /**
+   * Recycle the component
+   */
+  public void recycle() {
+    this.includeNodes = false;
+    this.insideProperties = false;
+    this.requestId = "";
+    this.validity = null;
+    this.root = null;
+    this.pathNode = null;
+    this.contract = null;
+    this.map = null;
+    this.localParams = null;
+    this.currentProperty = null;
+    super.recycle();
+
   }
 
+  /*
+   * From URIResolver, copied from TraxProcessor
+   * 
+   * @see javax.xml.transform.URIResolver#resolve(java.lang.String,
+   * java.lang.String)
+   */
   public javax.xml.transform.Source resolve(String href, String base)
       throws TransformerException {
     if (getLogger().isDebugEnabled()) {
@@ -1017,7 +1030,8 @@
             // always be protocol:/....
             return null; // we can't resolve this
           } else {
-            xslSource = m_resolver.resolveURI(base.substring(0, lastPathElementPos)
+            xslSource = m_resolver.resolveURI(base.substring(0,
+                lastPathElementPos)
                 + "/" + href);
           }
         } else {
@@ -1038,39 +1052,36 @@
     } catch (SourceException e) {
       if (getLogger().isDebugEnabled()) {
         getLogger().debug(
-            "Failed to resolve " + href + "(base = " + base + "), return null", e);
+            "Failed to resolve " + href + "(base = " + base + "), return null",
+            e);
       }
 
       // CZ: To obtain the same behaviour as when the resource is
       // transformed by the XSLT Transformer we should return null here.
       return null;
     } catch (java.net.MalformedURLException mue) {
-      if (getLogger().isDebugEnabled()) {
-        getLogger()
-            .debug(
-                "Failed to resolve " + href + "(base = " + base + "), return null",
-                mue);
-      }
+      getLogger().debug(
+          "Failed to resolve " + href + "(base = " + base + "), return null",
+          mue);
 
       return null;
     } catch (IOException ioe) {
       if (getLogger().isDebugEnabled()) {
-        getLogger()
-            .debug(
-                "Failed to resolve " + href + "(base = " + base + "), return null",
-                ioe);
+        getLogger().debug(
+            "Failed to resolve " + href + "(base = " + base + "), return null",
+            ioe);
       }
 
       return null;
     } finally {
-        release(xslSource);
+      release(xslSource);
     }
   }
 
   /**
-   * Return a new InputSource object that uses the
-   * InputStream and the system ID of the Source
-   * object.
+   * Return a new InputSource object that uses the 
+   * InputStream
+   * and the system ID of the Source object.
    * 
    * @throws IOException
    *           if I/O error occured.
@@ -1081,5 +1092,4 @@
     newObject.setSystemId(source.getURI());
     return newObject;
   }
-  
 }

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml Wed Dec  2 13:58:18 2009
@@ -21,113 +21,95 @@
     
     
     
-    
+    
   
-
   
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
   
   
-
-     
-      
-        Enabled the output html serializer to be configurable to either xhtml or html.
-        See docs: Configure output serializer.
-      
-      
-       Added an examples tab and section to show working examples
-       of how to add independant and plugin dependent contracts.
-       A first example showing the POD plugin & contract has
-       been started.
-      
-       Cleaning up
-        usage of structurer using the new chunks of FOR-1059. Reducing code duplications.
-        
-       Cleaning up
-        locationmap from the former xdocs location. See
-        news #cleanup.15.06.07 how to update. 
-      
-        FOR-975 Renaming tiles to panel.
-      
-      
-        More i18n work by Sjur on Dispatcher. This patch correctly localizes menus & tabs.
-      
-      
-        Rename to ContractsMessages_en.xml, part of i18n changes by Sjur.
-      
-      
-        Add ability to get a list of contracts provided by a plugin. For
-        this to work the plugin name must have "plugin" within it, e.g.
-        "org.apache.forrest.plugin.input.doap". Requesting
-        ls.contracts.org.apache.forrest.plugin.input.doap.source.xml
-        will return a source listing of plugins provided by the named plugin.
-        Requesting ls.contracts.org.apache.forrest.plugin.input.doap.[FORMAT] 
-        will return a formatted output document listing all templates supplied
-        by the identified plugin.        
-      
+    
+    
+      Added an
+      examples tab and section to show working examples of how to add
+      independant and plugin dependent contracts. A first example showing the
+      POD plugin & contract has been started.
+      Cleaning up usage of
+      structurer using the new chunks of FOR-1059. Reducing code
+      duplications.
+      Cleaning
+      up locationmap from the former xdocs location. See 
+      news #cleanup.15.06.07how to
+      update.
+      FOR-975 Renaming tiles to panel.
+      More i18n work by Sjur on Dispatcher. This patch
+      correctly localizes menus & tabs.
+      Rename to ContractsMessages_en.xml, part of i18n
+      changes by Sjur.
+      Add ability to get a list of
+      contracts provided by a plugin. For this to work the plugin name must
+      have "plugin" within it, e.g. "org.apache.forrest.plugin.input.doap".
+      Requesting 
+      
+      ls.contracts.org.apache.forrest.plugin.input.doap.source.xmlwill
+      return a source listing of plugins provided by the named plugin.
+      Requesting 
+      
+      ls.contracts.org.apache.forrest.plugin.input.doap.[FORMAT]will
+      return a formatted output document listing all templates supplied by the
+      identified plugin.
       
-        i18n: Add LocaleAction action wrapper, and use the locale provided by it.
-        Was taking the locale directly from the request instead of using the standard method in Forrest: LocaleAction.
-      
-      
-        Adding the "how tos" from the site-author to this plugin.
-      
-
-       Extending the dispatcher 
-          with an internal format. This internal format is our xdoc or 
-          xhtml2. The internal format will then be contacted by e.g. html 
-          contracts. 
-
-      
-        Initial plugin code extracted from the old views plugin.
-
-       Added first implementation of 
-        the dispatcher. Including contract bean implementation and interface; 
-        dispatcher exception and dispatcher transformers. 
-      
-        Added a dispatcher glossary. Thanks to Thorsten for moving to the plugin.
-      
-      
-        Added infos of the pattern the plugin is using.
-      
-      
-        Updated the "how it works" section and moved it to its own site.
-      
-      
-        Adding the dispatcher concept documentation from the site-author.
-      
-      
-       Added section "linking to external css files" to howto-structurer-dsl doc.
-      
-      
-        Activated multiple output formats to be configured via a View.
-      
-      
-        Added contracts and nuggets to the "view" plugins.
-      
+      due-to="Sjur Moshagen">i18n: Add LocaleAction action wrapper, and use the
+      locale provided by it. Was taking the locale directly from the request
+      instead of using the standard method in Forrest: LocaleAction.
+      Adding the "how tos" from the
+      site-author to this plugin.
+      
+      Extending the dispatcher with
+      an internal format. This internal format is our xdoc or xhtml2. The
+      internal format will then be contacted by e.g. html contracts.
+      
+      Initial plugin code extracted
+      from the old views plugin.
+      Added first implementation of
+      the dispatcher. Including contract bean implementation and interface;
+      dispatcher exception and dispatcher transformers.
+      Added a dispatcher glossary.
+      Thanks to Thorsten for moving to the plugin.
+      Added infos of the pattern the
+      plugin is using.
+      Updated the "how it works"
+      section and moved it to its own site.
+      Adding the dispatcher concept
+      documentation from the site-author.
+      Added section "linking to external css files" to
+      howto-structurer-dsl doc.
+      Activated multiple output
+      formats to be configured via a View.
+      Added contracts and nuggets to
+      the "view" plugins.
     
   
   
     
-      
-              create some more example, that it is easier to adapt the concept. An examples section
-              has been added, but more examples needed to cover the contracts available.
-      
-      
-        Rewrite matches to allow other output implementation then html.
-      
-      
-        Extract businessHelper to their on implementation plugin.
-      
+      create some more example, that it is
+      easier to adapt the concept. An examples section has been added, but more
+      examples needed to cover the contracts available.
+      Rewrite matches to allow other output
+      implementation then html.
+      Extract businessHelper to their on
+      implementation plugin.
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap Wed Dec  2 13:58:18 2009
@@ -17,16 +17,16 @@
 -->
 
   
-    
-    
+    
+    
     
-      
-      
-
-
+      
+      
+        
+        
         
       
     
@@ -34,11 +34,9 @@
   
     
       
-      
-      
+      
+      
       
     
   
@@ -54,7 +52,7 @@
       
     
     
-
@@ -62,16 +60,16 @@
         
           
         
-
+        
       
       
-        
+        
       
-      
-        
-        
+      
+
+        
+        
           
           
           
@@ -81,18 +79,15 @@
         
         
       
-      
-        
+      
+
+        
         
       
-      
-        
+      
+
+        
       
       
         

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.tei/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.tei/NOTICE.txt
            ('svn:mergeinfo' removed)







svn commit: r886147 [3/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
2009-12-02T13:58:28Z

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
   
   
     
@@ -30,8 +29,8 @@
   
   
     
-      
-      
+      
+      
     
   
   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl Wed Dec  2 13:58:18 2009
@@ -38,14 +38,14 @@
 
 -->
 
-  
+  
   
     
-      
+      
     
     
       
-        
+        
       
     
   
@@ -53,15 +53,19 @@
   
   
   
-    
+    
+      
+    
   
   
-    
+    
+      
+    
   
   
-    
+    
   
   
-    
+    
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/xhtml2_to_html.xsl Wed Dec  2 13:58:18 2009
@@ -29,952 +29,960 @@
   - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
-
-  
-
-  
-
+  
+  
   
-
+  omit-xml-declaration="yes" media-type="text/html"
+  doctype-public="-//W3C//DTD HTML 4.01//EN"
+  doctype-system="http://www.w3.org/TR/html4/strict.dtd" />
+  
   
     
-      
+      
     
   
-
-  
-  
-  
-  
-  
-  
-
+  
+  
+  
+  
+  
+  
+  
-
+  
   
-    
+    
     
       
-        
- 
+        
+        
+ 
+
       
-      
+      
     
   
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
-
+  
   
-
+    
     
-      
+      
     
   
-
-  
+  
+  
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
   
     
       
-        
+        
       
     
   
-
+  
   
     
-      
+      
     
   
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
-
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
-
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
           
-            
-            
+            
+            
           
         
       
-
+      
       
         
           
             
-              
+              
             
-            
+            
+              
               
                 
-                  
+                  
                 
                 
-                  
+                  
                 
-               
-        
+               
             
           
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
-      
+      
+      
+
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
-      
-        
-          
-          
-        
-        
-          
-          
-        
+      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+        
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
-        
+        
       
-
+      
       
         
           
-            
-            
+            
+            
           
         
       
     
   
-
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
-
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
-      
-        
-          
-          
-        
-        
-          
-          
-        
+      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+        
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
-        
+        
       
-
+      
       
         
           
-            
-            
+            
+            
           
-          
-          

+          
+          

         
       
-
+      
       
         
           
-            
-            
+            
+            
           
-          
+          
         
       
     
   
-
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
-
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
-
+      
       
         
           
             
-              
+              
             
           
           
             
-              
+              
             
           
           
-            
-            
+            
+            
           
-          
+          
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
-      
-        
-          
-          
-        
-        
-          
-          
-        
+      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+        
       
     
   
-
+  
   
-    
-    
+    
+    
     
       
-        
-        
+        
+        
       
     
   
-
-
+  
   
-    
-    
+    
+    
     
       
         
-          
+          
         
       
       
-        
-        
+        
+        
       
       
-        
-        
+        
+        
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
-
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
+      
       
         
           
-            
-            
+            
+            
           
           
-            
-            
+            
+            
           
         
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
         
-          
-          
+          
+          
         
       
-
-      
-        
-          
-          
-        
-        
-          
-          
-        
+      
+      
+        
+          
+            
+            
+          
+          
+            
+            
+          
+        
       
     
   
-
+  
   
-    
-    
+    
+    
     
-
+      
       
-        
+        
       
-
+      
       
         
           
-            
-            
+            
+            
           
         
       
     
   
-
-
+  
   
-     $Id: xhtml2html.xslt 127 2004-11-14 03:06:21Z etherealwake $ 
+    $Id: xhtml2html.xslt 127 2004-11-14 03:06:21Z etherealwake
+    $
     
-      
-      
+      
+      
     
   
-
+  
   
     
-      
+      
     
   
-
+  
   
     
-      
-      
-      
+      
+      
+      
       
-        
+        
       
     
   
-
+  
   
     
-      
-      
+      
+      
     
   
-
-
-  
+  
+  
+
     
-      
+      
     
   
-
+  
   
     
-
-      
+      
+      
+
         
-          
-          
+          
+          
         
       
-
+      
       
         
-          
+          
         
       
     
   
-
+  
   
     
-      
-      
+      
+      
     
   
-
+  
   
-
+    
     
-      
+      
     
-
+    
     
       
         6
         
-          
+          
         
       
     
-
+    
     
-      
+      
     
   
-
-
-  
+  
+  
+
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
-
   
     
-      
+      
     
   
   
     
-      
+      
     
     
-      
+      
     
   
-
   
     
-      
+      
     
   
   
     
-      
+      
     
   
-
-  
-    
+  
+    
+      
+    
   
   
     
-      
+      
     
   
   
     
-      
+      
     
   
-
   
     
-      
+      
       
-        
+        
       
     
   
   
     
-      
+      
     
   
-
-
-
-
   
     
   
   
     
-      
+      
     
   
-
-
-  
+  
+  
+
     
-      
-      
+      
+      
     
   
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
-  
+  
+
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts-to-document.xsl Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
-
-  
-  
+  
+  
   
     
       
         
-          ls.contract<xsl:if 
-            test="$requestedContract='false'">s</xsl:if>
-            <xsl:if 
-            test="$requestedContract!='false'"> <xsl:value-of 
-            select="$requestedContract" />
-            </xsl:if>
+          ls.contract 
+          <xsl:if test="$requestedContract='false'">s</xsl:if>
+          <xsl:if test="$requestedContract!='false'">  
+          <xsl:value-of select="$requestedContract" /></xsl:if>
         
         
           
             
-              
+              
             
             
-              
+              
             
           
         
       
     
     
-      
+      
     
   
   
-    
+    
     
-       theme name: <xsl:value-of select="@name" />
+      theme name: 
+      <xsl:value-of select="@name" />
       
-        
+        
       
     
   
   
-    
+    
     
       
         
-          
+          
         
       
       
         
-          
+          
         
       
     
   
   
-    <xsl:value-of select="@name" />
+    
+      <xsl:value-of select="@name" />
+    
     
       file-name:
-      

+      

       
     
     
       description:
-      

+      

       
         
       
@@ -106,9 +105,10 @@
     

       forrest-template definition:
     
-    <forrest:template/> 
+    <forrest:template 
+    />
   
-   =""
+    
+  =" 
+  "
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/ls.contracts.xsl Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
   
     
-      
+      
     
   
   
@@ -30,14 +30,14 @@
   
   
     
-      
-      
-      
+      
+      
+      
     
   
   
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-abstract.xsl Wed Dec  2 13:58:18 2009
@@ -20,12 +20,12 @@
 imported document2html.xsl for details.
 -->
 
-
   
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-authors.xsl Wed Dec  2 13:58:18 2009
@@ -20,12 +20,12 @@
 imported document2html.xsl for details.
 -->
 
-
   
     
-      
+      
     
   
   
@@ -33,10 +33,10 @@
       
         
           
-            
+            
           
           
-            
+            
           
         
       

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-notice.xsl Wed Dec  2 13:58:18 2009
@@ -22,7 +22,7 @@
 
   
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-title.xsl Wed Dec  2 13:58:18 2009
@@ -20,19 +20,19 @@
 imported document2html.xsl for details.
 -->
 
-
   
     
       
-        
+        
       
       
         *No* title found
       
     
-
-
+    
+    
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl Wed Dec  2 13:58:18 2009
@@ -20,33 +20,32 @@
 imported document2html.xsl for details.
 -->
 
-  
-
   
-    
+    
   
   
     
       
-        
+        
       
     
   
   
-    
+    
     
-      #
-      
+      # 
+      
       
-        
+        
       
       
-        
+        
       
     
   
-  
+  
 

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec  2 13:58:18 2009
@@ -0,0 +1 @@
+target







svn commit: r886147 [4/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
2009-12-02T13:58:28Z

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml Wed Dec  2 13:58:18 2009
@@ -20,28 +20,25 @@
 
   Dispatcher Glossary
   
-    
-      This is a glossary of terms and their definitions for the Dispatcher (aka
-      views).
-    
+    This is a glossary of terms and their definitions for the Dispatcher
+    (aka views).
   
   
     A
     
       Add content to this Glossary
       
-        This glossary is incomplete, please help where you can by adding definitions to
-        existing items where needed. Also, add new Dispatcher related Items to the glossary as
-        appropriate.
+        This glossary is incomplete, please help where you can by
+        adding definitions to existing items where needed. Also, add new
+        Dispatcher related Items to the glossary as appropriate.
       
       
         See 
         
-        Archive Mail
-        
+        Archive Mail
         See 
-        Issue FOR-639
-        
+        Issue
+        FOR-639
       
     
   
@@ -50,15 +47,20 @@
     
       Contracts
       
-        A contract is a snippet of re-usable code that gets used in a structurer file.
-        Contracts can be used or omitted as neccessary, though a few are really compulsary in
-                      order to define a basic skeleton structure and to include some styling (CSS)
-        Contracts mainly come in three (3) types, static, semi-static & dynamic.

-                      Static Contracts are pre-defined snippets of code that need no further information.

-                      Semi-static Contracts can include extra configuration variables, these would over-ride otherwise
-                      default variables.

-                      Dynamic Contracts can have extra configuration variables, but can also define their own snippets
-                      of code information. (Such as extra CSS elements, or generic markup elements).
+        A contract is a snippet of re-usable code that gets used in
+        a structurer file.
+        Contracts can be used or omitted as neccessary, though a
+        few are really compulsary in order to define a basic skeleton structure
+        and to include some styling (CSS)
+        Contracts mainly come in three (3) types, static,
+        semi-static & dynamic. 
+        
Static Contracts are pre-defined snippets of code that need no
+        further information. 
+        
Semi-static Contracts can include extra configuration variables,
+        these would over-ride otherwise default variables. 
+        
Dynamic Contracts can have extra configuration variables, but can
+        also define their own snippets of code information. (Such as extra CSS
+        elements, or generic markup elements).
       
     
     
@@ -68,10 +70,12 @@
         Name
       
       
-        In the context of the dispatcher, a Class is used as an optional attribute to
-                            the forrest:hook. This converts to 
-
]]>.
-                    
+        In the context of the dispatcher, a 
+        Classis used as an optional attribute to the
+        forrest:hook. This converts to 
+        
+          ]]>
+.
       
     
   
@@ -100,13 +104,14 @@
         Views
       
       
-        The Dispatcher is the codename for the Forrest Implementation of the Core J2EE
-        Dispatcher View. 
+        The Dispatcher is the codename for the Forrest
+        Implementation of the Core J2EE Dispatcher View. 
         
-        java.sun.com has more information on its origins.
-        What we at 'Forrest' relate the Dispatcher to, is the overall technology and
-        implementation of the replacement 'skins' system. Combining 'Views', 'Contracts' , 'Themes'
-        enables separation of concerns to provide a fast and efficient documentation
+        java.sun.comhas more information on its origins.
+        What we at 'Forrest' relate the Dispatcher to, is the
+        overall technology and implementation of the replacement 'skins'
+        system. Combining 'Views', 'Contracts' , 'Themes' enables separation of
+        concerns to provide a fast and efficient documentation
         framework.
       
     
@@ -124,18 +129,19 @@
         Structurer
       
       
-        forrest:hooks is a concept of defining format independent hooks to structure
-        the output.
-        Hooks are used to help define the layout of a page. Hooks are only used to
-        define the structure in our output that is required to enable a theme to apply its look and
-        feel.
-        Hooks convert to layout ]]> container blocks and usually only consist
-        of forrest:contracts
+        forrest:hooks is a concept of defining format independent
+        hooks to structure the output.
+        Hooks are used to help define the layout of a page. Hooks
+        are only used to define the structure in our output that is required to
+        enable a theme to apply its look and feel.
+        Hooks convert to layout 
+]]>
+container blocks and usually only consist of forrest:contracts
         Hooks are applied currently in the themes.core plugin as
-part of a themes structurer configuration file such as %themename
-%-html.panel.xml (e.g pelt-html.panel.xml) or included in such configuration
-files via a panel file such as %themename%-%format%.panel.xml (e.g
-pelt-html.panel.xml)
+        part of a themes structurer configuration file such as %themename
+        %-html.panel.xml (e.g pelt-html.panel.xml) or included in such
+        configuration files via a panel file such as
+        %themename%-%format%.panel.xml (e.g pelt-html.panel.xml)
       
     
   
@@ -148,9 +154,12 @@
         Class
       
       
-        In the context of the dispatcher, a name is used as an optional attribute to 
-                the forrest:hook. This converts to 
-]]>.
+        In the context of the dispatcher, a 
+        nameis used as an optional attribute to the
+        forrest:hook. This converts to 
+        
+          ]]>
+.
       
     
   
@@ -169,7 +178,8 @@
         Tiles
       
       
-        Panels is the new name for a tile - a collection of contracts. 
+        Panels is the new name for a tile - a collection of
+        contracts.
       
     
   
@@ -194,9 +204,12 @@
         Themes
       
       
-        The Structurer allows a user to define the layout and content of a site or parts of a site.
-        Structurer files contain hooks & contracts which you can include to build up a site structure template
-        A completed structurer file defines an overall theme (look and feel) for a site
+        The Structurer allows a user to define the layout and
+        content of a site or parts of a site.
+        Structurer files contain hooks & contracts which you
+        can include to build up a site structure template
+        A completed structurer file defines an overall theme (look
+        and feel) for a site
       
     
     
@@ -210,9 +223,12 @@
         Dispatcher
       
       
-        Skins is the name of the older alternative way for structuring and styling your site pages.
-        Skins is still used in Forrest versions 0.7 and 0.8-dev, though for 0.8-dev and beyond it can be
-                concidered an option with Dispatcher being the other.(It is enabled as the default option currently)
+        Skins is the name of the older alternative way for
+        structuring and styling your site pages.
+        Skins is still used in Forrest versions 0.7 and 0.8-dev,
+        though for 0.8-dev and beyond it can be concidered an option with
+        Dispatcher being the other.(It is enabled as the default option
+        currently)
       
     
   
@@ -225,18 +241,25 @@
         Panels
       
       
-        A tile is a collection of contracts that are grouped together for easy inclusion into a theme.
-        Tiles was the original but deprecated name for a collection of contracts, it is now
-                                  re-named and re-implemented as a 'Panels'
+        A tile is a collection of contracts that are grouped
+        together for easy inclusion into a theme.
+        Tiles was the original but deprecated name for a collection
+        of contracts, it is now re-named and re-implemented as a
+        'Panels'
       
     
     
       Themes
       
-        A more extensible and adaptable solution than its alternative 'Skins'. A 'Theme' is an overall content & style set.
-        A master 'common' theme provides the basis in which you can extend, over-ride or add to in order to make your own theme, you do not
-                      have to create a complete theme from scratch, simply include/exclude/over-ride/add what you need. The current 'Pelt Theme' based on its
-                      'Pelt Skin' counterpart, but uses functionality and extends/inherits what it needs to from the 'common' theme.
+        A more extensible and adaptable solution than its
+        alternative 'Skins'. A 'Theme' is an overall content & style
+        set.
+        A master 'common' theme provides the basis in which you can
+        extend, over-ride or add to in order to make your own theme, you do not
+        have to create a complete theme from scratch, simply
+        include/exclude/over-ride/add what you need. The current 'Pelt Theme'
+        based on its 'Pelt Skin' counterpart, but uses functionality and
+        extends/inherits what it needs to from the 'common' theme.
       
     
   
@@ -249,9 +272,11 @@
         Dispatcher
       
       
-        Views is the older now deprecated name for what is now the 'Dispatcher'
-        Views also, confusingly, was used as a term for the Structurer, and forrest:views is a 
-                                  deprecated code that has been replaced with forrest:template.
+        Views is the older now deprecated name for what is now the
+        'Dispatcher'
+        Views also, confusingly, was used as a term for the
+        Structurer, and forrest:structurer is a deprecated code that has been
+        replaced with forrest:template.
       
     
   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     Dispatcher (Draft - feature under development)
   
   
-    
-      The "dispatcher" is new functionality which is still in development phase.
-      That is why it is in the "whiteboard" section of the Forrest distribution.
-      We are working at the moment on moving this plugin from the whiteboard
-      into the core plugins. Further all dispatcher related documents will be
-      moved into the plugin as well. See
-      Status
-      of Themes: Skins and Dispatcher.
-    
+    The "dispatcher" is new functionality which is still in
+    development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. We are working at the moment on moving this plugin
+    from the whiteboard into the core plugins. Further all dispatcher related
+    documents will be moved into the plugin as well. See 
+    Status of
+    Themes: Skins and Dispatcher.
     
       Introduction
-      
-              This section will grow and show example usage of contracts in action -
-              either standalone contracts or those that work in conjunction with
-              plugins. Contributions Welcome.
-      
+      This section will grow and show example usage of contracts in action -
+      either standalone contracts or those that work in conjunction with
+      plugins. Contributions Welcome.
     
     
-            Some examples to help you on your way
-    
-            Enabling and adding the POD plugin
-            On this page you will see a link to a .pod version of this page. Below are
-               the steps taken :-
-       Add POD plugin to forrest.properties file
-                
-        Add contract to include pod link - this can either be enabled in a 
-                master theme file (such as pelt.fv) or on a per folder basis (by altering a
-                nested pelt.fv to point to modified *.panels.xml). In this case, we want a
-                modified option to only alter files in this examples folder.
-
-Example not yet complete, will expand on it soon.
-
-
+      Some examples to help you on your way
+      
+        Enabling and adding the POD plugin
+        On this page you will see a link to a .pod version of this page.
+        Below are the steps taken :-
+        
+          Add POD plugin to forrest.properties file
+          
+            
+              
+
+          
+          Add contract to include pod link - this can either be enabled in
+          a master theme file (such as pelt.fv) or on a per folder basis (by
+          altering a nested pelt.fv to point to modified *.panels.xml). In this
+          case, we want a modified option to only alter files in this examples
+          folder.
+        
+        Example not yet complete, will expand on it
+        soon.
+      
+    
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     How to write a forrest:contract
-    
-      This How-To will explain how we wrote the contracts for the dispatcher and
-      hope afterwards you will be able to do the same.
-    
-    
+    This How-To will explain how we wrote the contracts for the
+    dispatcher and hope afterwards you will be able to do the same.
+    
   
   
-    
-      The "Dispatcher" (aka "Views") is new functionality which is still in
-      development phase. That is why it is in the "whiteboard" section of the
-      Forrest distribution. This HowTo is a good start but still needs more
-      work. See Status of Themes: Skins and
-      Dispatcher.
-    
-    
-      Devs and skin developer that wants to get started with forrest:contract
-      development. To really understand this how-to you need basic and sometimes
-      advanced understanding of the "old fashion" skin development process.
-    
+    The "Dispatcher" (aka "Views") is new functionality which is still
+    in development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. This HowTo is a good start but still needs more work.
+    See 
+    Status of Themes: Skins and
+    Dispatcher.
+    Devs and skin developer that wants to get started with forrest:contract
+    development. To really understand this how-to you need basic and sometimes
+    advanced understanding of the "old fashion" skin development process.
   
   
-    
-      This setup guide will explain how to create a forrest:contract from
-      scratch and how this forrest:contract work with the core parts of forrest.
-    
+    This setup guide will explain how to create a forrest:contract from
+    scratch and how this forrest:contract work with the core parts of
+    forrest.
   
   
     
-      Installing a mozilla browser and the forrestbar helps a lot in developing.
+      Installing a mozilla browser and the forrestbar helps a lot in
+      developing.
     
   
   
-    
-      The following content is from many mails around the topic, this how-to
-      tries to be the consolidation of this thread. It is mainly based on the
-      thread "[RT] Why using views" - in comparison with "old fashion" skins -
-      usecase i18n
-    
-    
-      By working on the i18n integration for "pelt" we again encountered the
-      reasons for using the dispatcher. ;-) The maintenance problem was to
-      change the captions of the skin features (contracts) to enable support for
-      i18n. The case is that the site2xhtml.xsl has a lot of
-      repeating code.
-    
-    
-      For example the "last-publish"-contract could be found 2 times in the
-      code. This is not the only contract that was (is) doubled in the code. The
-      problem with that is that we needed to search the code for each caption
-      and senselessly repeat the following maintenance step of adding the
+    The following content is from many mails around the topic, this
+    how-to tries to be the consolidation of this thread. It is mainly based on
+    the thread "[RT] Why using views" - in comparison with "old fashion" skins
+    - usecase i18n
+    
By working on the i18n integration for "pelt" we again encountered the
+    reasons for using the dispatcher. ;-) The maintenance problem was to change
+    the captions of the skin features (contracts) to enable support for i18n.
+    The case is that the 
+    site2xhtml.xslhas a lot of repeating code.
+    For example the "last-publish"-contract could be found 2 times in the
+    code. This is not the only contract that was (is) doubled in the code. The
+    problem with that is that we needed to search the code for each caption and
+    senselessly repeat the following maintenance step of adding the 
 ]]>
-      -tags.
-    
+-tags.
     
-document.write("Published: " + document.lastModified);
 
 + 
 ]]>
-      
-      
-        This allows us in a next maintenance to just change the code of
+
+      
This allows us in a next maintenance to just change the code of 
 ]]>
-        and apply it in any position where it is placed.
-      
-      
-        Now this refactoring of the site2xhtml.xsl is exactly what we doing in
-        creating contracts for the dispatcher.
-      
+and apply it in any position where it is placed.
+      Now this refactoring of the site2xhtml.xsl is exactly what we doing
+      in creating contracts for the dispatcher.
     
     
       Explaining the blank forrest:contract
-      
-        To start a new forrest:contract you can copy the 'blank.ft' from
-        org.apache.forrest.plugin.themes.core/themes/common/html/blank.ft.
-      
-      
-        The 'blank.ft' is a simple xml file with the following code which you
-        can use to base new contracts on:
-      
+      To start a new forrest:contract you can copy the 'blank.ft' from 
+      
+      org.apache.forrest.plugin.themes.core/themes/common/html/blank.ft.
+      The 'blank.ft' is a simple xml file with the following code which you
+      can use to base new contracts on:
       
 
     blank will output {contract-function}. This is just a blank contract, it will output *nothing*.
   
-  ]]><![CDATA[]]>>
+  ]]>
+<![CDATA[ 
+]]>
+> 
+
   
     
       
-      
+      
       
         
           
@@ -148,121 +135,113 @@
     
   
 ]]>
-      
-      
-        The most important is the name of the contract 
-]]>
-        . This name is the same as the file name of the contract (without
-        file extension) blank.ft.
-      
-      
-        This is a naming convention that you need to always
-        meet. All @name attributes must be the file name of the contract without
-        file extension.
-      
-      
-        The 
-]]>
-         tag needs to be filled in with some information that is
-        explaining the contract to the webdesigner. The better explained the
-        more efficient for the web designer to pick the right contract.
-      
+
+      The most important is the name of the contract 
+      
+        ]]>
+. This name is the same as the file name of the contract (without file
+extension) 
+      blank.ft.
+      This is a 
+      naming conventionthat you need to always meet. All @name
+      attributes must be the file name of the contract without file
+      extension.
+      The 
+      
+        ]]>
+tag needs to be filled in with some information that is explaining the
+contract to the webdesigner. The better explained the more efficient for the
+web designer to pick the right contract.
       
-
+        
   siteinfo-last-published-howto will output the last published date of the site with the help of jscript.
 ]]>
-      
-      
-        In the 
-]]>
-         tag we have to explain how the designer can use the contract in
-        his structurer.
-      
+
+      In the 
+      
+        ]]>
+tag we have to explain how the designer can use the contract in his
+structurer.
       
-]]><![CDATA[]]>]]>]]>
-      
-      
-        To put contract code into the 
-]]>
-         section, this needs to be declared in the contract as :- 
-...]]>
-         Simply by leaving out the xpath declaration and the code will go
-        into body. You can use 
-......]]>
-         if you need content in both head and body.
-      
-      
-        The last paragraph about
+]]>
+<![CDATA[ 
+]]>
+]]> 
+]]>
+
+      To put contract code into the 
+      
+        ]]>
+section, this needs to be declared in the contract as :- 
+      
+        ...]]>
+Simply by leaving out the xpath declaration and the code will go into
+body. You can use 
+      
+        ......]]>
+if you need content in both head and body.
+      The last paragraph about 
 ]]>
-        has replaced the older way of
+has replaced the older way of 
 ]]>
-        . Please be aware that this part of the dispatcher is still a moving
-        target and may change still.
-      
-      
-        It is possible to use contracts in different input/output formats. We
-        are focusing for now on format="html" as output and the
-        inputFormat="xsl".
-      
+. Please be aware that this part of the dispatcher is still a moving target and
+may change still.
+      It is possible to use contracts in different input/output formats.
+      We are focusing for now on format="html" as output and the
+      inputFormat="xsl".
     
     
       Create a new contract
-      
-        We use basic naming convention for contracts. Like "naming does not say
-        anything about layout position, but functionality of the contract".
-      
-      
-        Now let us pick up the example we started with and create a
-        "siteinfo-last-published-howto" contract. Save the blank.ft to
-        {project.home}/src/documentation/resources/themes/common/html/siteinfo-last-published-howto.ft.
-      
-      
-        Now the maintenance-optimized code (xpath="/html/body/*") was:
-      
+      We use basic naming convention for contracts. Like "naming does not
+      say anything about layout position, but functionality of the
+      contract".
+      Now let us pick up the example we started with and create a
+      "siteinfo-last-published-howto" contract. Save the blank.ft to 
+      
+      {project.home}/src/documentation/resources/themes/common/html/siteinfo-last-published-howto.ft.
+      Now the maintenance-optimized code (xpath="/html/body/*") was:
       
-
+        
  
 ]]>
-      
-      
-        In this code we have to do the following steps to use it in our
-        contract:
-      
+
+      In this code we have to do the following steps to use it in our
+      contract:
       
-        Search and replace "siteinfo-last-published" with "siteinfo-last-publish-howto-body"
+        Search and replace "siteinfo-last-published" with
+        "siteinfo-last-publish-howto-body"
         Add a "debug string - " to the template
       
-      
-        The contract after this steps should look like:
-      
+      The contract after this steps should look like:
       
-
+        
 debug string - 
  
 ]]>
-      
-      
-        Now we have to do some last steps in the siteinfo-last-publish-howto.ft
-      
+
+      Now we have to do some last steps in the
+      siteinfo-last-publish-howto.ft
       
         Search and replace "blank" with "siteinfo-last-publish-howto"
         Add description and usage of the contract
         Copy the maintenance optimized code to the contract.
       
-      
-        As the result your code should look like this:
-      
+      As the result your code should look like this:
       
 
   
     siteinfo-last-published-howto will output the last published date of the site with the help of jscript.
   
-  ]]><![CDATA[]]>]]>
+  ]]>
+<![CDATA[ 
+]]>
+]]> 
+
   
   
 ]]>
-      
+
     
     
       Activating the contract
-      
-        To see whether the new contract works we need to add it to our
-        structurer. The contract usage contains the contract-tag 
-]]>
-         Please see Getting started
-        with the "structurer" for more details.
-      
-      
-        Next to write are parameter-contracts with advanced features of the
-        dispatcher.
-      
+      To see whether the new contract works we need to add it to our
+      structurer. The contract usage contains the contract-tag 
+      
+        ]]>
+Please see 
+      Getting started with the
+      "structurer"for more details.
+      Next to write are parameter-contracts with advanced features of the
+      dispatcher.
     
     
       Plugin Supplied Contracts
-      
-        It is possible for plugins to provide contracts for use in the
-        dispatcher. For details on how this is done see the
-        Plugin
-        HowTo.
-      
+      It is possible for plugins to provide contracts for use in the
+      dispatcher. For details on how this is done see the 
+      
+      Plugin HowTo.
     
   
   
-    
-      Congratulations you are now able to work with structurer contracts. From
-      here we recommend to read the following How-To's (if not already done):
-    
+    Congratulations you are now able to work with structurer contracts. From
+    here we recommend to read the following How-To's (if not already done):
     
-      Getting started with the "structurer"
+      
+        Getting started with the
+        "structurer"
+      
     
   
   
-    
-      Please provide feedback about this document via the
-      mailing lists.
-    
+    Please provide feedback about this document via the 
+    mailing lists.
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     Dispatcher quickstart
@@ -23,234 +24,183 @@
     
   
   
-    
-      People who are helping to develop the Dispatcher.
-    
-    
-      The "Dispatcher" (previously known as "Views") is new functionality which
-      is still in development phase. That is why it is in the "whiteboard"
-      section of Forrest. This document will also need to change to keep pace.
-      We are working at the moment on moving this plugin from the whiteboard
-      into the core plugins. See Status of
-      Themes: Skins and Dispatcher.
-    
+    People who are helping to develop the Dispatcher.
+    The "Dispatcher" (previously known as "Views") is new
+    functionality which is still in development phase. That is why it is in the
+    "whiteboard" section of Forrest. This document will also need to change to
+    keep pace. We are working at the moment on moving this plugin from the
+    whiteboard into the core plugins. See 
+    Status of Themes: Skins and
+    Dispatcher.
   
   
-    
-      This document will get you started. We will Dispatcher-enable an existing
-      site and show how to add/remove ready-made contacts. Then we will discuss
-      how add your own new contracts.
-    
-    
-      This document encourages developers to get involved with fine-tuning and
-      testing the dispatcher. Please help to enhance the current core contracts
-      so that people do not need to re-invent the wheel.
-    
+    This document will get you started. We will Dispatcher-enable an
+    existing site and show how to add/remove ready-made contacts. Then we will
+    discuss how add your own new contracts.
+    This document encourages developers to get involved with fine-tuning and
+    testing the dispatcher. Please help to enhance the current core contracts
+    so that people do not need to re-invent the wheel.
   
   
     
-      Using Forrest trunk of SVN (i.e. head of development).
-      
+      Using Forrest trunk of SVN (i.e. head of development).
       Followed the installation instructions below.
-      You have an existing forrest site and want to try the
-        new Dispatcher. Otherwise create a 'forrest seed-sample' site.
+      You have an existing forrest site and want to try the new Dispatcher.
+      Otherwise create a 'forrest seed-sample' site.
     
   
   
-    
-      When developing with the dispatcher we assume you are using 'forrest run'
-      and the following workflow "change files -> refresh browser".
-      

-      Installing a mozilla browser and the
-      Forrestbar helps a lot with developing, but
-      is not necessary.
-    
+    When developing with the dispatcher we assume you are using 'forrest
+    run' and the following workflow "change files -> refresh browser". 
+    
Installing a mozilla browser and the 
+    Forrestbarhelps a lot with developing, but is
+    not necessary.
     
       Get ready
       
         Do 'svn update' on forrest/trunk
-        Do the 'cd main; build clean; build' (necessary because the Dispatcher is changing rapidly and uses some Java)
+        Do the 'cd main; build clean; build' (necessary because the
+        Dispatcher is changing rapidly and uses some Java)
       
     
     
       Dispatcher-enable the existing site
       
         Add the new plugins to forrest.properties ...
-        ,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
-        
+        ,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core
         localhost:8888/index.html ... fantastic. See the pelt view.
       
     
     
       Use another theme
       
-        Add ]]> 
-          to your forrest.properties.xml
+        Add 
+]]>
+to your forrest.properties.xml
         Re-start 'forrest run'
         localhost:8888/index.html ... See the new view.
       
     
     
       Create our own structurer by copy-and-customise
-      
-        Copy the default structurer for the pelt theme and make local changes.
-      
-      
-        At this stage of rapid development of the Dispatcher, be sure to keep
-        your copy synchronised. Use 'diff' against the known svn version of the
-        core pelt.fv to track your local changes. Also please consider
-        contributing new contracts and changes to the default structurers to the
-        Forrest projects. That eases your local version management and everyone
-        will benefit.
-      
-      
-        We use ${themer.project.dir} for
-        PROJECT_HOME/src/documentation/resources/themes (create the new
-        directory first). You can change this location by adding
+      Copy the default structurer for the pelt theme and make local
+      changes.
+      At this stage of rapid development of the Dispatcher, be sure to
+      keep your copy synchronised. Use 'diff' against the known svn version of
+      the core pelt.fv to track your local changes. Also please consider
+      contributing new contracts and changes to the default structurers to the
+      Forrest projects. That eases your local version management and everyone
+      will benefit.
+      We use 
+      ${themer.project.dir}for
+      PROJECT_HOME/src/documentation/resources/themes (create the new directory
+      first). You can change this location by adding 
 
           
          ]]>
-        to your locationmap and point to another directory.
-      
-      
-      By default THEMER_PLUGIN can be located at FORREST_HOME/whiteboard/plugins/org.apache.forrest.themes.core
-                 
+to your locationmap and point to another directory.
+      By default THEMER_PLUGIN can be located at
+      FORREST_HOME/whiteboard/plugins/org.apache.forrest.themes.core
       
         Copy THEMER_PLUGIN/themes/pelt.fv into your project at
-          ${themer.project.dir}/pelt.fv
-        
-        Copy THEMER_PLUGIN/themes/pelt/panels/pelt-html.header.panel.xml into your
-          project at ${themer.project.dir}/pelt/panels/pelt-html.header.panel.xml
-        
+        ${themer.project.dir}/pelt.fv
+        Copy THEMER_PLUGIN/themes/pelt/panels/pelt-html.header.panel.xml
+        into your project at
+        ${themer.project.dir}/pelt/panels/pelt-html.header.panel.xml
         Re-start 'forrest run'
-        localhost:8888/index.html ... See the same view, now structured
-          by us.
-        
-        In localhost:8888/resolve.structurer.index you can find a copy of your current structurer. Any change  made to your pelt.fv file will be added here.
-        
+        localhost:8888/index.html ... See the same view, now structured by
+        us.
+        In localhost:8888/resolve.structurer.index you can find a copy of
+        your current structurer. Any change made to your pelt.fv file will be
+        added here.
       
-      
-        From here on there is no need to re-start 'forrest run'. Just edit the
-        structurer and see the effect.
-      
-      
-      Right now the dispatcher is heavely cached, so maybe in the current version it should be
-      necessary to reboot the system in order to see the changes. To avoid temporally this problem,
-      turn off the cache system changing:
-      
+      From here on there is no need to re-start 'forrest run'. Just edit the
+      structurer and see the effect.
+      Right now the dispatcher is heavely cached, so maybe in the
+      current version it should be necessary to reboot the system in order to
+      see the changes. To avoid temporally this problem, turn off the cache
+      system changing: 
 
+
 ]]>
-      
-      to
-      
+to 
 
+
 ]]>
-      
-      in your THEMER_PLUGIN/themes/pelt.fv file.
-      
+in your THEMER_PLUGIN/themes/pelt.fv file.
     
     
       Remove a default contract
       
-        Remove the top breadcrumb trail. Edit your pelt-html.header.panel.xml, find the
-          "branding-breadcrumbs" contract and comment it out.
-        
+        Remove the top breadcrumb trail. Edit your
+        pelt-html.header.panel.xml, find the "branding-breadcrumbs" contract
+        and comment it out.
       
     
     
       Add a default contract
-      
-        Forrest provides many default contracts. If you are using the Forrestbar
-        then choose "dispatcher-devs => ls.contracts". Otherwise visit
-        localhost:8888/ls.contracts.html
-      
+      Forrest provides many default contracts. If you are using the
+      Forrestbar then choose "dispatcher-devs => ls.contracts". Otherwise
+      visit localhost:8888/ls.contracts.html
       
-        
-          See the usage detail for your chosen contract via the above mentioned list.
-          e.g. "siteinfo-current-time"
-        
-        
-          Insert it at the appropriate point in your structurer. Note that it
-          will need to go inside the appropriate CSS hook, e.g.
+        
See the usage detail for your chosen contract via the above
+        mentioned list. e.g. "siteinfo-current-time"
+        Insert it at the appropriate point in your structurer. Note that it
+        will need to go inside the appropriate CSS hook, e.g. 
         
-
     
     ...
 ]]>
-          
+
       
-      
-        Notice that you did not need to copy any other code to your project
-        space. Forrest finds the default contract in its core (the themes.core
-        plugin).
-      
-      
-        You will find some commonly used contracts in place but commented out in
-        both the common and the pelt structurer files. Feel free to uncomment
-        them to activate them, move them around into other hooks or create new
-        hooks for them.
-      
-      
-        Work is currently under way for implementing Panels (was tiles).
-        Currently we now have a 'panels' sub-dir for each 'theme'. This panels
-        sub-dir currently contains a main html panel
-        '%themename%-html.panel.xml' and a CSS panel
-        '%themename%-css.panel.xml'. So you can change a collection of HTML and
-        CSS outputs from these two XML files.
-      
+      Notice that you did not need to copy any other code to your project
+      space. Forrest finds the default contract in its core (the themes.core
+      plugin).
+      You will find some commonly used contracts in place but commented out
+      in both the common and the pelt structurer files. Feel free to uncomment
+      them to activate them, move them around into other hooks or create new
+      hooks for them.
+      Work is currently under way for implementing Panels (was tiles).
+      Currently we now have a 'panels' sub-dir for each 'theme'. This panels
+      sub-dir currently contains a main html panel '%themename%-html.panel.xml'
+      and a CSS panel '%themename%-css.panel.xml'. So you can change a
+      collection of HTML and CSS outputs from these two XML files.
     
     
       Add a new project contract
-      
-        Carefully consider the purpose of your contracts. If they are useful in
-        a wider context, then they belong in plugins or the core of Forrest. See
-        below for further discussion on this important topic.
-      
-      
-        Project-based contracts are defined in theme-specific and
-        output-format-specific directory structure, e.g.
-        ${themer.project.dir}/THEME_NAME/OUTPUT_FORMAT/
-      
-      
-        Project-based contracts common to all themes go in
-        ${themer.project.dir}/common/OUTPUT_FORMAT/
-      
-      
-        To get started quickly (it is not a project-based contract but a demo),
-        copy one of the default contracts. e.g. copy siteinfo-current-time.ft to
-        become siteinfo-doodad.ft ...
-      
+      Carefully consider the purpose of your contracts. If they are
+      useful in a wider context, then they belong in plugins or the core of
+      Forrest. See below for further discussion on this important
+      topic.
+      Project-based contracts are defined in theme-specific and
+      output-format-specific directory structure, e.g.
+      ${themer.project.dir}/THEME_NAME/OUTPUT_FORMAT/
+      Project-based contracts common to all themes go in
+      ${themer.project.dir}/common/OUTPUT_FORMAT/
+      To get started quickly (it is not a project-based contract but a
+      demo), copy one of the default contracts. e.g. copy
+      siteinfo-current-time.ft to become siteinfo-doodad.ft ...
       
-        
-          Copy THEMER_PLUGIN/themes/common/html/siteinfo-current-time.ft
-          into your project at
-          ${themer.project.dir}/common/html/siteinfo-doodad.ft
-          (create the new directory first).
-        
-        
-          Edit it to suit. Replace all occurrences of "siteinfo-current-time" with
-          "siteinfo-doodad" and make your other changes (e.g. the text and the
-          javascript function).
-        
-        
-          Declare your new contract in your structurer as done above for adding a
-          default contract.
-        
+        Copy THEMER_PLUGIN/themes/common/html/siteinfo-current-time.ft into
+        your project at ${themer.project.dir}/common/html/siteinfo-doodad.ft
+        (create the new directory first).
+        Edit it to suit. Replace all occurrences of "siteinfo-current-time"
+        with "siteinfo-doodad" and make your other changes (e.g. the text and
+        the javascript function).
+        Declare your new contract in your structurer as done above for
+        adding a default contract.
       
-      
-        See a list of your project-based contracts and their usage notes via
-        Forrestbar "dispatcher-devs => ls.contracts.project". Otherwise visit
-        localhost:8888/ls.contracts.project.html
-      
+      See a list of your project-based contracts and their usage notes via
+      Forrestbar "dispatcher-devs => ls.contracts.project". Otherwise visit
+      localhost:8888/ls.contracts.project.html
     
-
-
     
       Decide how to manage your contracts
-      
-      Depending on the use of a new contract you can place it in different 
-      locations. General use contracts should be placed in the THEME_PLUGIN 
-      directory. Contracts only suitable for one theme should be stored in 
-      the specific theme directory, that is, 
-      THEMER_PLUGIN/resources/themes/THEME_NAME/OUTPUT_FORMAT. 
+      
Depending on the use of a new contract you can place it in different
+      locations. General use contracts should be placed in the THEME_PLUGIN
+      directory. Contracts only suitable for one theme should be stored in the
+      specific theme directory, that is, 
+      THEMER_PLUGIN/resources/themes/THEME_NAME/OUTPUT_FORMAT.
       Otherwise, common contracts should be place in the common folder: 
-      THEMER_PLUGIN/resources/themes/common/OUTPUT_FORMAT.
-      
-      
-      If the contract is specific to a particular purpose, that is a 
-      particular plugin, it should be included with the plugin itself. 
-      For example, the "employment history" contract is specific to the 
-      resume plugin so it should be placed there. The correct location for 
-      contrats with a particular purpose is 
-      PLUGIN_NAME/resources/themes/THEME_NAME/OUTPUT_FORMAT.
-      
-      
-      There is another category for contracts, those that are both specific 
-      to a particular purpose and defined for a specific site. For example, 
-      a "process order" contract that integrates with an in-house order 
-      management system. In this case, another location is more suitable. 
+      THEMER_PLUGIN/resources/themes/common/OUTPUT_FORMAT.
+      If the contract is specific to a particular purpose, that is a
+      particular plugin, it should be included with the plugin itself. For
+      example, the "employment history" contract is specific to the resume
+      plugin so it should be placed there. The correct location for contrats
+      with a particular purpose is 
+      PLUGIN_NAME/resources/themes/THEME_NAME/OUTPUT_FORMAT.
+      There is another category for contracts, those that are both specific
+      to a particular purpose and defined for a specific site. For example, a
+      "process order" contract that integrates with an in-house order
+      management system. In this case, another location is more suitable.
       However, before proceed think again about the uniqueness of the contract.
-      Most contracts can be generalised to be useful in more than one 
-      environment and so one of the above locations can be used. If you are 
+      Most contracts can be generalised to be useful in more than one
+      environment and so one of the above locations can be used. If you are
       still sure that this is a site-specific contract then place it in 
-      PROJECT_HOME/src/documentation/resources/themes/common.
-      
-      
-      If you develop a new contract, please provide a patch via our 
-      issue tracker so that we 
-      can include it in future releases of Forrest.
-      
+      PROJECT_HOME/src/documentation/resources/themes/common.
+      If you develop a new contract, please provide a patch via our 
+      issue trackerso that we can include it in
+      future releases of Forrest.
     
   
   
-    
-      Congratulations you are now able to work with the Dispatcher. From here we
-      recommend to read the following How-Tos:
-    
+    Congratulations you are now able to work with the Dispatcher. From here
+    we recommend to read the following How-Tos:
     
-      How to use the structurer
-      Create your own contract 
-          implementation
+      
+        How to use the structurer
+      
+      
+        Create your own contract
+        implementation
+      
     
   
   
-    
-      Please provide feedback about this document via the
-      mailing lists.
-    
+    Please provide feedback about this document via the 
+    mailing lists.
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     How to use the structurer
-    
-      This How-To describes the usage of the structurer config domain specific
-      language to create beautiful websites in no time.
-    
-    
+    This How-To describes the usage of the structurer config domain
+    specific language to create beautiful websites in no time.
+    
   
   
-    
-      The "Dispatcher" (aka "Views") is new functionality which is still in
-      development phase. That is why it is in the "whiteboard" section of the
-      Forrest distribution. This HowTo is a good start but still needs more
-      work. See Status of Themes: Skins and
-      Dispatcher.
-    
-    
-      This part of the the dispatcher is called the structurer and is dedicated
-      to webdesigner and user with some knowledge of css.
-    
+    The "Dispatcher" (aka "Views") is new functionality which is still
+    in development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. This HowTo is a good start but still needs more work.
+    See 
+    Status of Themes: Skins and
+    Dispatcher.
+    This part of the the dispatcher is called the structurer and is
+    dedicated to webdesigner and user with some knowledge of css.
   
   
-    
-      This how-to will show you how to write a structurer from
-      the ground up. We will focus on html as the output format. As well it will
-      show how to add your own css implementation to the structurer.
-    
+    This how-to will show you how to write a 
+    structurerfrom the ground up. We will focus on html as the
+    output format. As well it will show how to add your own css implementation
+    to the structurer.
   
   
     
-      Installing a mozilla browser and the forrestbar helps a lot in 
-        developing.
+      Installing a mozilla browser and the forrestbar helps a lot in
+      developing.
     
   
   
-    
-      When developing with the dispatcher we assume you are using 'forrest run'
-      and the following workflow "change files -> refresh browser"
-      

-      Installing a mozilla browser and the forrestbar helps a lot in developing.
-      Many instructions assumes that you have the forrestbar installed.
-    
+    When developing with the dispatcher we assume you are using 'forrest
+    run' and the following workflow "change files -> refresh browser" 
+    
Installing a mozilla browser and the forrestbar helps a lot in
+    developing. Many instructions assumes that you have the forrestbar
+    installed.
     
       Empty structurer file
       
-
-  
-  
-]]>
-      
-      
-         The structurer is designed to be open for any format
-        that can use forrest:view as configuration file. The
-        only format we implemented is html for now. This is as well true for the
-        delivered contracts.
-      
+  
+  
+]]>
+
+      
+      The structureris designed to be open for any format that
+      can use 
+      forrest:structureas configuration file. The only format
+      we implemented is html for now. This is as well true for the delivered
+      contracts.
     
     
       Creating your first structurer
-      
-        The structurer is based on jx templates to allow simple presentation
-        logic (all code starting with "jx:"). Please refer to the cocoon
-        documentation about jx.
-      
-      
-        In this section we will create a new structurer. We will override the
-        default structurer of the core themes for the index page of a new seed.
-        For that we will create a file called index.fv and save it
-        in the directory {properties:resources}/structurer/url
-        (create it if needed). This will make only the
-        index.html page look different from the rest of the project.
-      
-      
-        You can set a view for an individual file, a directory, or the whole
-        site. To address multiple files in a directory call your
-        .fv file common.fv. If Forrest doesn't find a
-        .fv file with the same name as the current file it will use
-        the common.fv file in that directory, or the first one it finds going
-        upwards through the directory structure. common.fv files
-        affect all subdirectories unless they are overidden by another
-        common.fv or a file-specific foo.fv file.
-      
-      
-        Remember: pointing your browser to
-        http://localhost:8888/ls.contracts.html will show a page
-        with all contracts and themes that you can use in your project provided
-        by forrest.
-      
-      
-        Let us use the blank structurer from the earlier step and add the
-        content-main contract. In ls.contracts.html we find the information for
-        how to use the contract in our structurer. Our index.fv
-        should look like:
-      
+      The structurer is based on jx templates to allow simple
+      presentation logic (all code starting with "jx:"). Please refer to the
+      cocoon documentation about jx.
+      In this section we will create a new structurer. We will override the
+      default structurer of the core themes for the index page of a new seed.
+      For that we will create a file called 
+      index.fvand save it in the directory 
+      {properties:resources}/structurer/url(create it if needed).
+      This will make 
+      onlythe index.html page look different from the rest of
+      the project.
+      You can set a view for an
+      individual file, a directory, or the whole site. To address multiple
+      files in a directory call your 
+      .fvfile 
+      common.fv. If Forrest doesn't find a 
+      .fvfile with the same name as the current file it will use
+      the common.fv file in that directory, or the first one it finds going
+      upwards through the directory structure. 
+      common.fvfiles affect all subdirectories unless they are
+      overidden by another 
+      common.fvor a file-specific 
+      foo.fvfile.
+      Remember: pointing your browser to 
+      http://localhost:8888/ls.contracts.htmlwill show a page with
+      all contracts and themes that you can use in your project provided by
+      forrest.
+      Let us use the blank structurer from the earlier step and add the
+      content-main contract. In ls.contracts.html we find the information for
+      how to use the contract in our structurer. Our 
+      index.fvshould look like:
       
-
-  
+  
     
     
       
@@ -129,37 +118,33 @@
       
     
   
-  
-]]>
-      
-      
-        A contract has to request the data model it want to transform. This
-        happends by defining forrest:properties which have the same name like
-        the contract. In our case we want the HTML rendered from intermediate
-        format (**.body.xml). This we are going to include via: 
-]]>
-        
-      
-      
-        Contracts can offer some property configuration of the outcome of the
-        transformation. In our case 
+  
+]]>
+
+      
A contract has to request the data model it want to transform. This
+      happends by defining forrest:properties which have the same name like the
+      contract. In our case we want the HTML rendered from intermediate format
+      (**.body.xml). This we are going to include via: 
+      
+        ]]>
+

+      Contracts can offer some property configuration of the outcome of the
+      transformation. In our case 
+      
 
         
       ]]>
-        . 
-      
-      
-        Lets try our new structurer by pointing to
-        http://localhost:8888/index.html. We will see only the main
-        content. Now let us add the section navigation to our structurer. The
-        contract usage in the structurer can be looked up in ls.contracts.html.
-        Our structurer now looks like:
-      
+.
+      Lets try our new structurer by pointing to 
+      http://localhost:8888/index.html. We will see only the main
+      content. Now let us add the section navigation to our structurer. The
+      contract usage in the structurer can be looked up in ls.contracts.html.
+      Our structurer now looks like:
       
-
-  
+  
     
       
         
@@ -179,56 +164,43 @@
         
       
     
-  
-]]>
-      
-      
-        We now find the main content and the section navigation after each other
-        and in the order we placed them in the structurer, but we want it next
-        to each other (left: nav-section; right: content-main).
-      
+  
+]]>
+
+      We now find the main content and the section navigation after each
+      other and in the order we placed them in the structurer, but we want it
+      next to each other (left: nav-section; right: content-main).
     
     
       Hooks in the structurer
-      
-        We will use now the first time a 
-]]>
-        . Hooks are the styling side of the structurer. We can imitate
-        arbitrary html skeleton with their help. Before we explain how to use
-        your own css in the structurer, we will use the default css. You can see
-        in our example that we have css included. That is a default fallback
-        coming from the implementation. In this common.css we can find
-      
-      /* menu */
-#leftbar {
-    width: 25%;
-    float: left;
-    background: #eae8e3;
-    border: thin dashed #565248;
-}
-      
-      
-        With this information we know to use 
-]]>
-         and add contracts into that container.
-      
-      
-        If we want to put the nav-section contract into the left-hand side
-        position of the site we need to place the contract into that hook. Like:
-      
+      We will use now the first time a 
+      
+        ]]>
+. Hooks are the styling side of the structurer. We can imitate arbitrary
+html skeleton with their help. Before we explain how to use your own css in the
+structurer, we will use the default css. You can see in our example that we
+have css included. That is a default fallback coming from the implementation.
+In this common.css we can find
+      /* menu */ #leftbar { width: 25%; float: left; background:
+      #eae8e3; border: thin dashed #565248; }
+      With this information we know to use 
+      
+        ]]>
+and add contracts into that container.
+      If we want to put the nav-section contract into the left-hand side
+      position of the site we need to place the contract into that hook.
+      Like:
       
-
+        
   
 ]]>
-      
-      
-        Our structurer will then look like:
-      
+
+      Our structurer will then look like:
       
-
-  
+  
     
       
         
@@ -250,21 +222,20 @@
         
       
     
-  
-]]>
-      
+  
+]]>
+
     
     
       CSS in the structurer
-      
-        We now know how to place contracts and hooks in our structurer. Until
-        this stage we only used the common.css. CSS-support of the structurer is
-        as easy as placing contracts/hooks. To override the common.css
-        stylesheet we use another tag within our structurer 
-]]>
-        .
-      
-
-      
-        You can add inline and linked css with the structurer. As soon as you
-        use forrest:css you will disable the fallback css support from forrest.
-        With this tag we tell the dispatcher that we want to override the
-        common.css. After adding the following to our index.fv the design will
-        be different.
-      
+      You can add inline and linked css with the structurer. As soon as you
+      use forrest:css you will disable the fallback css support from forrest.
+      With this tag we tell the dispatcher that we want to override the
+      common.css. After adding the following to our index.fv the design will be
+      different.
       
-
+        
 /* Extra css */
 /* menu */
 #leftbar {
@@ -290,25 +259,23 @@
   border: thin solid #000000;
 }
 ]]>
-      
-
-      
-        We just changed the border-style to 'solid', the background to '#CCCCFF'
-        and the color to '#000000'. So you see a white page where the menu is
-        surrounded by a solid border with the defined background.
-      
+
+      
+      We just changed the border-style to 'solid', the background to
+      '#CCCCFF' and the color to '#000000'. So you see a white page where the
+      menu is surrounded by a solid border with the defined background.
       
-        
-]]>
-         needs to be the direct child of 
-]]>
-        
-      
+      
+        ]]>
+needs to be the direct child of 
+      
+        ]]>
+
       
-
-  
+  
     
 /* Extra css */
 /* menu */
@@ -340,31 +307,23 @@
         
       
     
-  
-]]>
-      
-      
-        As a second example, let us change as well the content-main by adding
-        another hook 
-]]>
-         We need to add the new layout container to our inline css:
-      
+  
+]]>
+
+      As a second example, let us change as well the content-main by adding
+      another hook 
+      
+        ]]>
+We need to add the new layout container to our inline css:
+      /* The actual content */ #content { margin-left: 25%; padding: 0
+      20px 0 20px; background: #B9D3EE; }
+      Then we have to add the 'content-main' contract to the 'content' hook.
+      The resulting structurer looks like:
       
-/* The actual content */
-#content {
-  margin-left: 25%;
-  padding: 0 20px 0 20px;
-  background: #B9D3EE;
-}
-      
-        Then we have to add the 'content-main' contract to the 'content' hook.
-        The resulting structurer looks like:
-      
-      
-
-  
+  
     
 /* Extra css */
 /* menu */
@@ -404,98 +363,74 @@
       
     
     
-  
-]]>
-      
-      
-        We are now able to place contracts into the layout container and add
-        custom css to the structurer.
-      
+  
+]]>
+
+      We are now able to place contracts into the layout container and add
+      custom css to the structurer.
     
     
       Linking to an external css file
-      
-        This will change for the next version of views (v3) where we use a
-        generic contract instead of the standalone element (forrest:css).
-      
-      
-        Make sure your project has the following directory structure. If it
-        doesn't you'll have to create it. "common" is the fallback for all
-        themes, if you want to override the css for a specific theme replace
-        "common" with "themeName". This is where Forrest will look for external
-        css stylesheets.
-      
-      
-        $projectHome\src\documentation\resources\themes\common\css
-      
-        Where $projectHome is the directory where your project exists.
-      
-      
-        Put your css stylesheets in this directory. For arguement's sake let's
-        say it's called mystyles.css
-      
-      
-        Edit your common.fv structurer (or whatever structurer (theme) you are
-        using). This will probably be some where in:
-      
+      This will change for the next version of views (v3) where we use a
+      generic contract instead of the standalone element (forrest:css).
+      Make sure your project has the following directory structure. If it
+      doesn't you'll have to create it. "common" is the fallback for all
+      themes, if you want to override the css for a specific theme replace
+      "common" with "themeName". This is where Forrest will look for external
+      css stylesheets.
+      
+      $projectHome\src\documentation\resources\themes\common\css
+      Where $projectHome is the directory where your project exists.
+      Put your css stylesheets in this directory. For arguement's sake let's
+      say it's called mystyles.css
+      Edit your common.fv structurer (or whatever structurer (theme) you are
+      using). This will probably be some where in:
       $projectHome\src\documentation\content\xdocs
-      
-        or if you want to override it for the whole project in:
-      
+      or if you want to override it for the whole project in:
       $projectHome\src\documentation\resources\themes\
-      
-        Add the following element to the *.fv file:
-      
+      Add the following element to the *.fv file:
       
-]]>
-      
+        ]]>
+
       
-        Important! This must appear straight after the "view
-        type" element (as first child):
-      
+      Important!This must appear straight after the "view
+      type" element (as first child):
       
-]]>
-      
+        ]]>
+
       
-]]>
-      
-      
-        The attributes are:
-      
+        ]]>
+
+      The attributes are:
       
-        the url where the css exist (NOTE: it will be rewritten to "../themes/mystyles.css").
-        the media type, you can set different styles for screen and print. 
-          This is really useful if you want to hide elements such as navigation 
-          in the print output (#nav-section{display:none} for example).
-        the theme, "pelt" is the default theme (another is the "common" theme). Change this if you 
-          are using your own theme.
+        the url where the css exist (NOTE: it will be rewritten to
+        "../themes/mystyles.css").
+        the media type, you can set different styles for screen and print.
+        This is really useful if you want to hide elements such as navigation
+        in the print output (#nav-section{display:none} for example).
+        the theme, "pelt" is the default theme (another is the "common"
+        theme). Change this if you are using your own theme.
       
-      
-        You can have as many css links as you like, and they'll appear in the
-        head of your document in same order as they are in the .fv file.
-      
-      
-        Add more information of recent threads around css in the structurer and
-        information how you add an @import? Use e.g.
-        http://marc.theaimsgroup.com/?t=113471292700001&r=1&w=2
-      
+      You can have as many css links as you like, and they'll appear in the
+      head of your document in same order as they are in the .fv file.
+      Add more information of recent threads around
+      css in the structurer and information how you add an @import? Use e.g. 
+      
+      http://marc.theaimsgroup.com/?t=113471292700001&r=1&w=2
     
   
   
-    
-      Congratulations you are now able to work with the structurer. From here we
-      recommend to read the following How-Tos:
-    
+    Congratulations you are now able to work with the structurer. From here
+    we recommend to read the following How-Tos:
     
-      Create your own contract 
-          implementation
+      
+        Create your own contract
+        implementation
+      
     
   
   
-    
-      Please provide feedback about this document via the
-      mailing lists.
-    
+    Please provide feedback about this document via the 
+    mailing lists.
   
 







svn commit: r886147 [1/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
2009-12-02T13:58:28Z

Author: thorsten
Date: Wed Dec  2 13:58:18 2009
New Revision: 886147

URL: http://svn.apache.org/viewvc?rev=886147&view=rev
Log:
Merging back the dispatcher_rewrite branch to trunk. Using svn merge -r 700363:HEAD https://svn.apache.org/repos/asf/forrest/branches/dispatcher_rewrite. Still missing some unsync changes from the trunk that have not been applied to the branch.

Added:
    forrest/trunk/whiteboard/FOR-1157/
      - copied from r883333, forrest/branches/dispatcher_rewrite/FOR-1157/
    forrest/trunk/whiteboard/FOR-1157/my-project-BRANCH.war
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/FOR-1157/my-project-BRANCH.war
    forrest/trunk/whiteboard/FOR-1157/my-project-trunk-r739234.war
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/FOR-1157/my-project-trunk-r739234.war
    forrest/trunk/whiteboard/FOR-1157/stress.jmx
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/FOR-1157/stress.jmx
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-api-1.2.6.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-api-1.2.6.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-impl-1.2.6.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/axiom-impl-1.2.6.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.LICENSE.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/commons-io-1.4.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec.license.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/geronimo-stax-api_1.0_spec.license.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/jaxen-1.1.1.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/jaxen-1.1.1.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/jaxen-LICENSE.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/jaxen-LICENSE.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar.license.html
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit-4.5.jar.license.html
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar.license.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/wstx-asl-3.2.7.jar.license.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/project-to-text.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/project-to-text.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/root-strip.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/root-strip.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/round-corner-hex.svg.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/round-corner-hex.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/   (props changed)
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/HEADSUP.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/HEADSUP.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/application.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/ls.xmap
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/ls.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/grammars/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/grammars/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/grammars/link.xlex
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/grammars/link.xlex
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/stylesheets/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/stylesheets/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/stylesheets/pattern2link.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/chaperon/stylesheets/pattern2link.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/contract-strip-xsl.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/contract-strip-xsl.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/dotdots.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/dotdots.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/ls.contracts-to-html.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/ls.contracts-to-html.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/ls.contracts.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/ls.contracts.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/pathutils.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/pathutils.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/root-strip.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/root-strip.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/strip-dispatcher-remains-html.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/strip-dispatcher-remains-html.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/strip_namespaces.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/strip_namespaces.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/structurer/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/structurer/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common.structurer.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common.structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/css/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/css/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/genericMarkup.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/genericMarkup.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/helper-render-image.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/helper-render-image.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/noFt.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/noFt.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-overview-flow.dia
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-overview-flow.dia
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-overview-flow.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-overview-flow.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-xsl-contract.dia
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-xsl-contract.dia
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-xsl-contract.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/diagrams/dispatcher-xsl-contract.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/log4j.properties
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/log4j.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/Contract.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/Contract.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/Resolver.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/Resolver.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/Structurer.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/api/Structurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/config/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/config/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/config/DispatcherBean.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/config/DispatcherBean.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/config/WritableDispatcherBean.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/config/WritableDispatcherBean.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/exception/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/exception/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/exception/ContractException.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/exception/ContractException.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/exception/DispatcherException.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/exception/DispatcherException.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/factories/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/factories/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/factories/ContractFactory.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/factories/ContractFactory.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/AbstractXmlStructurer.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/AbstractXmlStructurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/ClassPathResolver.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/ClassPathResolver.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/CocoonResolver.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/CocoonResolver.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurer.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XSLContract.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XSLContract.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Captions.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Captions.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/CommonString.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/CommonString.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/EchoHandler.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/EchoHandler.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Loggable.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Loggable.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/LoggingErrorListener.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/LoggingErrorListener.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/NSAllocator.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/NSAllocator.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/StAX.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/StAX.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/StreamHelper.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/StreamHelper.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XMLProperties.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XMLProperties.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XSLContractHelper.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/XSLContractHelper.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/AbstractStructurer.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/AbstractStructurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestContract.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestContract.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestStructurer.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestStructurer.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestStructurerAXIOM.java
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/TestStructurerAXIOM.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/basic.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/basic.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-generic-css.contr
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-generic-css.contr
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-theme-profiler.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-theme-profiler.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/coat.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/coat.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/common.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/common.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/default.scale-dev.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/default.scale-dev.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/new.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/new.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/profiling.css.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/profiling.css.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-abstract.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-abstract.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-authors.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-authors.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main-outline.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main-outline.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-notice.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-notice.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-title.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-title.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-toc.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-toc.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/layout-master-set.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/layout-master-set.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/noFt.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/noFt.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/page-footer-copyright.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/page-footer-copyright.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/page-footer-numbering.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/page-footer-numbering.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/page-header.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/page-header.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/ajax-example.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/ajax-example.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/apache-ssi.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/apache-ssi.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/blank.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/blank.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-breadcrumbs.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-breadcrumbs.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-css-links.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-css-links.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-fontsize.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-fontsize.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-logo.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-tagline.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-tagline.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-theme-switcher.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/branding-theme-switcher.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-abstract.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-abstract.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-author.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-author.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-authors.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-authors.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-css.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-css.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-feeder.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-feeder.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-include-html.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-include-html.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-ls-contracts.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-ls-contracts.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main-lenya.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main-lenya.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-main.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-minitoc.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-minitoc.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-motd-page.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-motd-page.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-odt-link.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-odt-link.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pdf-link.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pdf-link.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pod-link.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-pod-link.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-source-xml-link.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-source-xml-link.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-title.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-title.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-txt-link.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-txt-link.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-xml-link.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/content-xml-link.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericMarkup.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericMarkup.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericXhtml.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/genericXhtml.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/google-analytics.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/google-analytics.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-form-blank.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-form-blank.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-prototype-ajax.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-prototype-ajax.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-render-image.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/helper-render-image.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/master.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/master.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-sub.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-sub.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing-foo.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing-foo.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main-testing.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-main.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-section.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/nav-section.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/noFt.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/noFt.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/reference-links.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/reference-links.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/search-input.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/search-input.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-compliance-links.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-compliance-links.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-copyright.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-copyright.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-credits.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-credits.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-current-time.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-current-time.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback-dyn.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback-dyn.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-feedback.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published-net.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published-net.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-last-published.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-icon.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-icon.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-navigation.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta-navigation.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/siteinfo-meta.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-abstract.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-abstract.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-body.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-body.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-title.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-title.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-toc.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/html/xhtml2-content-toc.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/README.txt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/README.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/add.jpg
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/add.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/built-with-forrest-button.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/built-with-forrest-button.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/external-link.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/external-link.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/fix.jpg
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/fix.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/forrest-credit-logo.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/forrest-credit-logo.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/hack.jpg
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/hack.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/odt.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/odt.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/pdfdoc.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/pdfdoc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.svg.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/poddoc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/printer.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/printer.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/redarrow.gif.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/redarrow.gif.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/remove.jpg
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/remove.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rss.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rss.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/spacer.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/spacer.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.svg.xslt
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/txtdoc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/update.jpg
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/update.jpg
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/valid-html401.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/valid-html401.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/vcss.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/vcss.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/xmldoc.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/xmldoc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/breadcrumbs-optimized.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/breadcrumbs-optimized.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/breadcrumbs.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/breadcrumbs.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/cssStyleSwitcher.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/cssStyleSwitcher.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/fontsize.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/fontsize.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/getBlank.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/getBlank.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/getMenu.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/getMenu.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/menu.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/menu.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/prototype.js
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/js/prototype.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-fo.panel.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-fo.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-html.panel.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/common-html.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/export-link.panel.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/panels/export-link.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/abstract.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/abstract.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/body.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/body.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/title.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/title.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/toc.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/xhtml2/toc.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/leather-dev.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/leather-dev.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/maven.basic.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/maven.basic.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/maven.print.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/maven.print.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/maven.screen.css
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/css/maven.screen.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/branding-logo.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/branding-logo.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/content-main.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/content-main.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-main-sub.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-main-sub.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-section-round-bottom.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/nav-section-round-bottom.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/search-input.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/search-input.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-credits.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-credits.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-last-published.contract.xml
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/html/siteinfo-last-published.contract.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/
      - copied from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/chapter.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/chapter.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/chapter_open.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/chapter_open.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/chapter_white.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/chapter_white.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/current.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/current.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/doc.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/doc.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/header-background-grad.png
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/header-background-grad.png
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/header-background.gif
      - copied unchanged from r883333, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/header-background.gif
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/images/header-background.png
      - copied unchanged
[... 224 lines stripped ...]






svn commit: r886147 [2/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
2009-12-02T13:58:28Z


Propchange: forrest/trunk/whiteboard/
------------------------------------------------------------------------------
    svn:mergeinfo = /forrest/branches/dispatcher_rewrite:700364-883333

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml Wed Dec  2 13:58:18 2009
@@ -16,17 +16,20 @@
   limitations under the License.
 -->
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
     
-
+      
       
         
           
@@ -68,7 +70,7 @@
           
         
         
-
+          
           
         
         

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap Wed Dec  2 13:58:18 2009
@@ -20,9 +20,11 @@
     
     
     
-      
+      
         
-          
+          
         
         true
       
@@ -30,17 +32,17 @@
     
   
   
-
     
-
+      
       
         
         
         
-        
+        
         
         
         
@@ -49,12 +51,12 @@
         
           
         
-        
+        
         
       
     
     
-
+      
       
         
         
@@ -64,7 +66,7 @@
       
     
     
-
+      
       
         
         
@@ -74,16 +76,14 @@
     
       
         
-        
+        
         
       
     
     
       
         
-        
+        
         
       
     
@@ -102,7 +102,7 @@
       
     
     
-
+      
       
         
           
@@ -128,10 +128,11 @@
       
     
     
-
       
-        
+        
       
     
     
@@ -139,34 +140,32 @@
         
           
             
-
+              
               
+              value="{properties:content.xdocs}{1}/book.xml" />
               
             
             
-
+              
               
-
-              
+              
+              
             
           
         
         
           
             
-
+              
               
+              value="{properties:content.xdocs}/book.xml" />
               
             
             
-
+              
               
-
-              
+              
+              
             
           
         
@@ -176,7 +175,7 @@
             
               
               
-
                 
@@ -189,17 +188,15 @@
       
         
         
-        
+        
         
-          
+          
           
-            
-            
-            
+            
+            
+            
+
               
             
           
@@ -209,8 +206,8 @@
             
           
         
-        
+        
+
           
         
         

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
 
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
   
-
-  
-  
+  
+  
+  
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml Wed Dec  2 13:58:18 2009
@@ -15,4 +15,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
@@ -42,69 +43,119 @@
 
   
     
-      
-      
-      
-      
+      
+      
+      
+      
         
       
     
     
-      
-      
-      
-      
+      
+      
+      
+        
+        
+        true
+        
+        
+        
+        
+        
+        
+        false
+      
+      
+      
+        
+        true
+        enhanced
+        
+        false
+      
+      
         
-          
-          
+          
+          
         
         true
       
     
     
-      
+      
         &serializer-xhtml-doctype-public;
         &serializer-xhtml-doctype-system;
         &serializer-xhtml-encoding;
         yes
         yes
       
-      
-        &serializer-html-doctype-public;
-        &serializer-html-doctype-system;
-        &serializer-html-encoding;
-      
-      
-
-
+      
+        
+        
         
       
-      
+      
         UTF-8
       
     
     
       
     
-    
+    
   
   
-
@@ -114,12 +165,12 @@
         
       
     
-
     
-      
+      
         
           
           
@@ -133,17 +184,17 @@
         
       
     
-
     
-      
+      
         
           
-          
+          
           
             
           
@@ -151,7 +202,7 @@
         
       
     
-
     
@@ -163,7 +214,7 @@
       
     
     
-
@@ -176,21 +227,19 @@
         
         
           
-          
+          
           
+          
           
-          
         
-        
-        
-          
-        
-        
+        
+        
+        
+        
       
-
@@ -201,17 +250,16 @@
           
           
         
-        
+        
           
-          
+          
           
           
-          
         
-        
-        
+        
+        
+        
       
       
         
@@ -222,12 +270,14 @@
         
         
           
-          
-          
+          
+          
           
           
         
-        
+        
       
       
         
@@ -238,8 +288,10 @@
         
         
           
-          
-          
+          
+          
           
           
         
@@ -247,11 +299,9 @@
       
       
         
-        
-        
+        
+        
         
       
       
@@ -263,8 +313,10 @@
         
         
           
-          
-          
+          
+          
           
           
         
@@ -272,18 +324,18 @@
       
     
     
-
-      
+      
+      
     
-
+    
     
-      
+      
     
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-     
     
-      
+      
     
     
     
-      
+      
     
     
     
-      
-    
-    
-    
-      
+      
     
     
     
-            
+      
     
     
     
-      
+      
     
     
-
+    
     
       
     
-
     
       
     
-
+    
     
       
     
-
-
-
+    
     
       
     
-
-
-
+    
     
       
     
-
-
+    
     
       
     
-    
     
     
     
-      
+      
     
     
     
       
     
     
-
     
       
     
     
       
     
     
       
     
     
       
     
-
+    
     
       
+    
+    
+      
     
     
       
     
     
       
     
-
+    
     
-      
+      
     
     
-      
+      
     
+    
     
-      
+      
     
-
+    
     
-      
+      
+    
+    
+    
+      
     
     
-      
-    
-
-    
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap Wed Dec  2 13:58:18 2009
@@ -37,11 +37,12 @@
     
   
   
-
     
       
-        
+        
           
           
           
@@ -51,14 +52,15 @@
         
       
       
-        
+        
           
           
           
           
         
         
-        
+        
       
       
         

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl Wed Dec  2 13:58:18 2009
@@ -15,22 +15,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+
   
-    
+    
   
-
+  
   
-    
-      
+    
+      
     
   
   
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
-  
-  
+
+  
+  
   
-    
+    
       
-        
+        
       
       
-        
+        
       
       
         
-          
-          
+
+          
+          
           
-            
+            
           
         
         
-          
-
+          
+          
           
-            
+          
           
           
         
       
     
   
-  
+  
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl Wed Dec  2 13:58:18 2009
@@ -15,10 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+
   
-    
+    
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl Wed Dec  2 13:58:18 2009
@@ -20,19 +20,19 @@
 imported document2html.xsl for details.
 -->
 
-
   
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl Wed Dec  2 13:58:18 2009
@@ -16,44 +16,45 @@
   limitations under the License.
 -->
 
-  
-  
-  
-  
-
+xmlns:forrest="http://apache.org/forrest/properties/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  
+  
+  
+  
+  
   
     
-      
+      
     
   
   
     
-      
+      
     
   
-
+  
   
     
-      
+      
     
   
   
-  
+  select="concat(string($root), 'themes/images')" />
+  
   
     
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
     
   
   
-    
+    
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl Wed Dec  2 13:58:18 2009
@@ -20,34 +20,38 @@
 details.
 -->
 
-  
+  
   
     
       
-        
+        
       
     
   
   
-    
-        
+    
+      
+        
       
       
-        
-      
+        
+      
+    
   
-  
+  
   
-    
+    
+      
+    
   
   
     
-      
+      
     
   
   
     
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl Wed Dec  2 13:58:18 2009
@@ -20,21 +20,24 @@
 imported document2html.xsl for details.
 -->
 
-  
-  
+  
+  
+  
+  
   
     
       
         
-          
+          
         
       
       
         
-          
+          
         
       
-
       
-        
+        
       
     
   
   
-    
+    
   
-  
-    
-      
-    
-    
-      
-    
- 
+  
+    
+      
+        
+      
+      
+        
+      
+      
+ 
+
+    
   
-
-
-
+  
   
-    
-
-    
+    
+    
+    
     
       
         
           
-            
+            
           
         
         
-          
+          
         
       
       
         
           
-            
+            
           
         
         
-          
+          
         
       
-
+      
       
         
-          
+          
         
-        ^
+        
+          ^
         
         
-          
+          
         
       
       
         
-          
+          
         
-        
+        
       
       
         
-          
+          
         
-        
+        
       
     
   
   
-    
+    
     
         
           
@@ -140,34 +147,34 @@
         
         
           
-            
+            
           
         
         
           
-            
+            
           
         
       
     
   
   
-    
+    
     
       
         
-
+          
           
-            
+            
           
           Note
           Warning
-          Fixme ()
+          Fixme ( 
+          )
         
       
       
-        
+        
       
     
   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl Wed Dec  2 13:58:18 2009
@@ -15,30 +15,34 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+
   
-    
+    
   
-
-  
+  
+  
     
       
-        
+        
         
- 
+          
+ 
+
         
-        
+        
       
     
     
       
-        
+        
         
- 
+          
+ 
+
         
-        
+        
       
     
   
@@ -56,8 +60,7 @@
   
   
     
-      
+      
     
   
 







svn commit: r886147 [5/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...
2009-12-02T13:58:28Z

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/index.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/index.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     Per Folder/File Themes
   
   
-    It is possible to customise the theme on a per folder or per file basis.
-    
+    It is possible to customise the theme on a per folder or per file
+    basis.
     To do this simply add a *.fv file in the directory that you wish to
     create an alternative theme for. The name of this file must be the same as
     the theme name you are using for your site. For example, this site uses the
     "pelt" theme and the directory containing this file contains a pelt.fv file
     that customises the theme for this file (and any others that may be in this
-    folder). In order to show this working we have simply stripped the PDF
-    link from the theme.
-    
+    folder). In order to show this working we have simply stripped the PDF link
+    from the theme.
     For demonstration purposes we also provide a 
-    subfolder within this folder
-    that has another modified theme.
+    subfolderwithin this folder that has
+    another modified theme.
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/perFolderThemes/subFolder/index.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     Per Folder/File Themes
   
   
-    This file has another customised theme, in this case we have stripped both
-    the pdf and the fontsize trail.
+    This file has another customised theme, in this case we have stripped
+    both the pdf and the fontsize trail.
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/group.svg
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/group.svg?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/group.svg (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/group.svg Wed Dec  2 13:58:18 2009
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 
-
 
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/project.svg
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/project.svg?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/project.svg (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/images/project.svg Wed Dec  2 13:58:18 2009
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 
-
 
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/index.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/index.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     Dispatcher (Draft - feature under development)
   
   
-    
-      The "dispatcher" is new functionality which is still in development phase.
-      That is why it is in the "whiteboard" section of the Forrest distribution.
-      We are working at the moment on moving this plugin from the whiteboard
-      into the core plugins. Further all dispatcher related documents will be
-      moved into the plugin as well. See
-      Status
-      of Themes: Skins and Dispatcher.
-    
+    The "dispatcher" is new functionality which is still in
+    development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. We are working at the moment on moving this plugin
+    from the whiteboard into the core plugins. Further all dispatcher related
+    documents will be moved into the plugin as well. See 
+    Status of
+    Themes: Skins and Dispatcher.
     
       Introduction
-      
-        As stated in the Skin documentation the aim of the Forrest skins is to
-        provide many capabilities so that extra skins are not needed. Experience
-        showed that many Forrest users still decided to create a new skin
-        because the default skin did not offer the features that they wanted or
-        they "just" needed extra content in some pages. We introduced
-        skinconf.xml where the user could configure some features of skins but
-        it was up to the skin to support it and did not solve the problem to add
-        page specific extra content. That led us to develop a new concept of
-        creating skins (we called the result "themes") which would be more
-        easily extensible by a user.
-      
+      As stated in the Skin documentation the aim of the Forrest skins is to
+      provide many capabilities so that extra skins are not needed. Experience
+      showed that many Forrest users still decided to create a new skin because
+      the default skin did not offer the features that they wanted or they
+      "just" needed extra content in some pages. We introduced skinconf.xml
+      where the user could configure some features of skins but it was up to
+      the skin to support it and did not solve the problem to add page specific
+      extra content. That led us to develop a new concept of creating skins (we
+      called the result "themes") which would be more easily extensible by a
+      user.
     
     
       Dispatcher - advanced separation of concerns
-      
-        The aim of the "dispatcher" concept is to provide a flexible framework
-        for creating site and page specific layout in different formats from
-        different content through an advanced seperation of concerns.
-      
-      
-        The dispatcher is a filter that limits the data-model to a minimum by
-        only requesting what the structurer (e.g. common-html.vt.xml) need. This
-        leads to a different URL handling focus - away from document centric. A
-        document can (but does not have to) be behind a certain URL. Like said a
-        structurer can request any given data as input not only a document and
-        the forrest core contracts (like navigation). It may be the main
-        enhancement in comparison to skins that this concept lets you easily
-        extend the default data models provided by forrest.
-      
-      
-        Since the dispatcher has implemented a fallback concept it makes
-        maintenance of custom themes which are based on forrest core ones very
-        easy and less time consuming. The principal is to override or extend
-        only certain parts (contracts) of the core. This is based on the
-        observation that normally only a small percentage of core skin contracts
-        have been changed. At the same time the new plugin system emerged.
-        Plugins are a way of extending Forrest to satisfy site-specific needs.
-        This includes to provide for plugin specific contracts.
-      
+      The aim of the "dispatcher" concept is to provide a flexible framework
+      for creating site and page specific layout in different formats from
+      different content through an advanced seperation of concerns.
+      The dispatcher is a filter that limits the data-model to a minimum by
+      only requesting what the structurer (e.g. common-html.vt.xml) need. This
+      leads to a different URL handling focus - away from document centric. A
+      document can (but does not have to) be behind a certain URL. Like said a
+      structurer can request any given data as input not only a document and
+      the forrest core contracts (like navigation). It may be the main
+      enhancement in comparison to skins that this concept lets you easily
+      extend the default data models provided by forrest.
+      Since the dispatcher has implemented a fallback concept it makes
+      maintenance of custom themes which are based on forrest core ones very
+      easy and less time consuming. The principal is to override or extend only
+      certain parts (contracts) of the core. This is based on the observation
+      that normally only a small percentage of core skin contracts have been
+      changed. At the same time the new plugin system emerged. Plugins are a
+      way of extending Forrest to satisfy site-specific needs. This includes to
+      provide for plugin specific contracts.
       
         Structurer - configuration for themes
-        
-          We developed the structurer to let the user decide
-          where to place elements in e.g. html pages. We started this work with
-          the skinconf.xml where you could configure certain
-          elements and their positions. These elements were known under certain
-          names. It was up to the skin designer to support this configuration
-          and the elements.
-        
-        
-          The work started with grouping elements (the ones from skinconf). We
-          used css-contracts that we added as @attributes e.g. 
-]]>
-          . That made it possible to use the same elements in different
-          skins. For the full list refer to the
-          
-          initial contract list 
-        
-        
-          Around this contracts we developed a configuration Domain Specific
-          Language - called the structurer. The
-          structurer allows us to define the order in which
-          forrest:contracts appear, and also to group them
-          using forrest:hooks.
-        
-        
-          forrest:hooks are containers that are only used for
-          layout reasons. They do not add any content nor
-          functionality to the output. They add only layout
-          information to the output. Actually e.g. a 
-]]>
-           will be transformed to 
-]]>
-          
-        
-        
-          forrest:contracts are functionality or extra content
-          that a theme can use to display the request. Sometimes a contract
-          delivers format-specific markup, other times it
-          delivers a format-independent string. We decide
-          different kind of contracts, static one (like described in the
-          contract howto), semi static (which offer configuration parameter in
-          the structurer) and dynamic contracts (which offer semi-static
-          configuration and/or requesting the content).
-        
-        
-          The structurer is also a configuration file for the dispatcher. The
-          new thinking on the dispatcher is that one can include any content
-          from any given business service by dispatching a request against it.
-          In "old fashion" skins and in v1 contracts we assumed a given data
-          model. In the dispatcher there is no given data model
-          any more. All data has to be defined in the structurer so that they
-          can be dispatched.
-        
+        We developed 
+        the structurerto let the user decide where to place
+        elements in e.g. html pages. We started this work with the 
+        skinconf.xmlwhere you could configure certain elements and
+        their positions. These elements were known under certain names. It was
+        up to the skin designer to support this configuration and the
+        elements.
+        The work started with grouping elements (the ones from skinconf). We
+        used css-contracts that we added as @attributes e.g. 
+        
+          ]]>
+. That made it possible to use the same elements in different skins. For
+the full list refer to the 
+        
+        initial contract list
+        Around this contracts we developed a configuration Domain Specific
+        Language - called 
+        the structurer. The 
+        structurerallows us to define the order in which 
+        forrest:contracts appear, and also to group them using
+        
+        forrest:hooks.
+        
+        forrest:hooks are containers that are only used for
+        layout reasons. They 
+        do notadd any content nor functionality to the output.
+        They add 
+        onlylayout information to the output. Actually e.g. a 
+        
+          ]]>
+will be transformed to 
+        
+          ]]>
+
+        
+        forrest:contracts are functionality or extra content
+        that a theme can use to display the request. Sometimes a contract
+        delivers 
+        format-specific markup, other times it delivers a 
+        format-independent string. We decide different kind of
+        contracts, static one (like described in the contract howto), semi
+        static (which offer configuration parameter in the structurer) and
+        dynamic contracts (which offer semi-static configuration and/or
+        requesting the content).
+        The structurer is also a configuration file for the dispatcher. The
+        new thinking on the dispatcher is that one can include any content from
+        any given business service by dispatching a request against it. In "old
+        fashion" skins and in v1 contracts we assumed a given data model. In
+        the dispatcher there is 
+        nogiven data model any more. All data has to be
+        defined in the structurer so that they can be dispatched.
       
       
         Contracts - grouped functionality
-        
-          The result of the leather-dev development was grouped functionality in
-          named containers. We gave those code snippets names (based on their
-          functionality) and called them contracts. This naming
-          enabled us to keep the contract separate from the positioning of the
-          code itself. Furthermore, since major parts of the code of skins has
-          never been documented, we started to add for each contract a
-          description and an explanation on how to use this contract. The
-          skinconf.xml gave an excellent source for this documentation effort,
-          since it described most features of the pelt skin.
-        
-        
-          Contracts are standalone, self explaining, configurable pieces of xsl
-          templates created purely for ease of maintenance.
-        
-        
-          Since these contracts are working from the input given in the
-          structurer, it works on
-          different input sources. One can pass variables into the contracts
-          that can be used to apply presentation logic in the xsl (like sorting
-          order, ...).
-        
+        The result of the leather-dev development was grouped functionality
+        in named containers. We gave those code snippets names (based on their
+        functionality) and called them 
+        contracts. This naming enabled us to keep the contract
+        separate from the positioning of the code itself. Furthermore, since
+        major parts of the code of skins has never been documented, we started
+        to add for each contract a description and an explanation on how to use
+        this contract. The skinconf.xml gave an excellent source for this
+        documentation effort, since it described most features of the pelt
+        skin.
+        Contracts are standalone, self explaining, configurable pieces of
+        xsl templates created purely for ease of maintenance.
+        Since these contracts are working from the input given in the 
+        structurer, it works on different input
+        sources. One can pass variables into the contracts that can be used to
+        apply presentation logic in the xsl (like sorting order, ...).
       
     
     
       Background
-      
-        The problem with the forrest skins so far has been that even if "only"
-        the design changed (html-skeleton), we still had to write a completely
-        new skin and implement all functionality. Another problem was that the
-        functionality was not easily extensible by a user. We decided to support
-        a standard regarding naming conventions for css elements. This standard
-        has been developed on the
-        
-        OSCOM website, where you can find some more background information.
-      
+      The problem with the forrest skins so far has been that even if "only"
+      the design changed (html-skeleton), we still had to write a completely
+      new skin and implement all functionality. Another problem was that the
+      functionality was not easily extensible by a user. We decided to support
+      a standard regarding naming conventions for css elements. This standard
+      has been developed on the 
+      OSCOM
+      website, where you can find some more background information.
       
         Definition of naming conventions
-        
-          "A naming convention is an attempt to systematize names in a field so
-          they unambiguously convey similar information in a similar manner."
-          wikipedia
-        
+        "A naming convention is an attempt to systematize names in a field
+        so they unambiguously convey similar information in a similar manner." 
+        
+        wikipedia
       
       
         leather-dev
-        
-          That led to the development of the "leather-dev" skin which
-          established a semantic container approach for div elements.
-          Leather-dev evolved from the "pelt" skin and used almost the same
-          functionality (contracts). We had started to encapsulate functional
-          code into templates, but there have been still in 4 xsl files and
-          without any documentation on what they are doing and how to use them.
-          The problems with leather-dev was pointed out in the mail
-          "status
-          on leather-dev?". The main proplem was to limit users to only one
-          html-skeleton which was way too limiting regarding design. Since we
-          had now grouped functionality in named containers we were ready to
-          start the dispatcher (aka forrest:views).
-        
+        That led to the development of the "leather-dev" skin which
+        established a semantic container approach for div elements. Leather-dev
+        evolved from the "pelt" skin and used almost the same functionality
+        (contracts). We had started to encapsulate functional code into
+        templates, but there have been still in 4 xsl files and without any
+        documentation on what they are doing and how to use them. The problems
+        with leather-dev was pointed out in the mail " 
+        
+        status on leather-dev?". The main proplem was to limit users to
+        only one html-skeleton which was way too limiting regarding design.
+        Since we had now grouped functionality in named containers we were
+        ready to start the dispatcher (aka forrest:structurer).
       
     
     
       Further information
-      
-        See the various How-to documents about the dispatcher, starting with the
-        quickstart. It would also be
-        useful to familiarise yourself with some of the terms used in the
-        dispatcher, the Dispatcher Glossary
-        contains some of the terms used.
-      
-      
-        Apache Forrest 1.0 Specification (Draft, not yet published):
-        site-author/content/xdocs/TR/2005/WD-forrest10.html
-      
+      See the various How-to documents about the dispatcher, starting with
+      the 
+      quickstart. It would also be
+      useful to familiarise yourself with some of the terms used in the
+      dispatcher, the 
+      Dispatcher Glossarycontains some of the
+      terms used.
+      Apache Forrest 1.0 Specification (Draft, not yet published): 
+      site-author/content/xdocs/TR/2005/WD-forrest10.html
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
+
 
   
     Living on the edge.
@@ -24,63 +24,55 @@
   
     
       Introduction
-      
-        Since the dispatcher is in the whiteboard, we can afford to use the
-        latest features available in forrest. This helps to test these new
-        features and to be prepared for the future when this feature is
-        standard.
-      
+      Since the dispatcher is in the whiteboard, we can afford to use the
+      latest features available in forrest. This helps to test these new
+      features and to be prepared for the future when this feature is
+      standard.
     
     
       forrest.properties.xml
-      
-        We needed to prevent having references from the core to a plugin. This
-        can be done with the new properties system. You can override any of the
-        following values via a forrest.properties.xml in your
-        project.
-      
+      We needed to prevent having references from the core to a plugin. This
+      can be done with the new properties system. You can override any of the
+      following values via a 
+      forrest.properties.xmlin your project.
       
-
+        
   
   
   
-  
   ]]>
-      
+
       
         Using properties in contracts
-         In the contract body you can access all forrest properties by
+        In the contract body you can access all forrest properties by
         
           ]]>
-        
+
         then extract the variable like:
         
-          ]]>
-        
+          ]]>
+
         more information which variables are available can be found at
-          http://localhost:8888/**.props which connects to the
-          org.apache.forrest.plugin.output.inputModule plugin. A custom generator
-          contacts the forrest properties input module to get all aviable key/values and
-          outputs them to xml (dtd like forrest.properties.xml). 
+        http://localhost:8888/**.props which connects to the
+        org.apache.forrest.plugin.output.inputModule plugin. A custom generator
+        contacts the forrest properties input module to get all aviable
+        key/values and outputs them to xml (dtd like
+        forrest.properties.xml).
       
     
     
       locationmap.xml
-      
-        One of the main features of the dispatcher is its fallback mechanism. We
-        are not only looking into one or two places but a sophisticated list of
-        locations. These locations are defined in the locationmap.xml. Like with
-        the forrest.properties.xml you can override any match in there by
-        implementing it in your project locationmap.xml.
-      
+      One of the main features of the dispatcher is its fallback mechanism.
+      We are not only looking into one or two places but a sophisticated list
+      of locations. These locations are defined in the locationmap.xml. Like
+      with the forrest.properties.xml you can override any match in there by
+      implementing it in your project locationmap.xml.
       
         Hands on the lm
-        
-          The resolving process of the structurer responsible for the URL has
-          implemented a high amount of fallbacks. Let us have a look.
-        
+        The resolving process of the structurer responsible for the URL has
+        implemented a high amount of fallbacks. Let us have a look.
         
-
+          
   
-
+
 
   
     News about recent changes
   
   
-    
-      The "dispatcher" is new functionality which is still in development phase.
-      That is why it is in the "whiteboard" section of the Forrest distribution.
-      We are working at the moment on moving this plugin from the whiteboard
-      into the core plugins. Further all dispatcher related documents will be
-      moved into the plugin as well. See
-      Status
-      of Themes: Skins and Dispatcher.
-    
+    The "dispatcher" is new functionality which is still in
+    development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. We are working at the moment on moving this plugin
+    from the whiteboard into the core plugins. Further all dispatcher related
+    documents will be moved into the plugin as well. See 
+    Status of
+    Themes: Skins and Dispatcher.
     
     
       Cleanup of the locationmap - 15.06.07
-       The locationmap matching for the structurer needed a cleanup. Structurer needs to
-        be placed now in
-        ${project.resources-dir}/structurer/url instead of the xdocs
-        directory. 
-      The following matches have been removed during this cleanup (you need to implement
-        them in your project locationmap if you still want their behavior.
-      
+      The locationmap matching for the structurer needed a cleanup.
+      Structurer needs to be placed now in 
+      ${project.resources-dir}/structurer/urlinstead of the xdocs
+      directory.
+      The following matches have been removed during this cleanup (you need
+      to implement them in your project locationmap if you still want their
+      behavior.
+      
+        
   
       ]]>
-      
+
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml Wed Dec  2 13:58:18 2009
@@ -28,28 +28,33 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
+
   
-    
-    
-    
-    
+    
+    
+    
+    
     
   
   
-    
-    
-    
-     
-    
+    
+    
+    
+    
   
   
-    
+    
   
   
-          
+    
   
-
   
     
-      
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
     
     
       
@@ -79,12 +84,12 @@
         
       
     
-    
-    
+    
+    
     
       
-        
-        
+        
+        
       
     
   

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
-
-
-  
-  
-  
-  
-  
-

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
-
-  
-  
-  
+
+  
+  
+  
+  
   
-    
+    
   
-
+  
   
-    
+    
   
-
+  
   
-    
+    
     
-      
+      
       
-        
-        
+        
+        
       
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
-
-
-  
-  
-  
+
+  
+  
+  
+  
   
-    
+    
   
-
+  
   
-    
+    
   
-
+  
   
-    
+    
     
-      
+      
       
-        
-        
+        
+        
       
-      
+      
     
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml Wed Dec  2 13:58:18 2009
@@ -1,4 +1,4 @@
-
+
 
 
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   
     
+    dataURI="cocoon://#{$getRequest}.title.xml" />
     
+    dataURI="cocoon://#{$getRequest}.abstract.xml" />
     
-      
+    dataURI="cocoon://#{$getRequest}.toc.xml">
+      
     
     
+    dataURI="cocoon://#{$getRequest}.body.xml">
       
-        
+        
       
     
     
 
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   
     
-      
+      
     
-    
     
     
-      
+      
     
     
+    dataURI="cocoon://#{$getRequest}.title.xml" />
     
+    dataURI="cocoon://#{$getRequest}.abstract.xml" />
     
-      
+    dataURI="cocoon://#{$getRequest}.toc.xml">
+      
     
     
+    dataURI="cocoon://#{$getRequest}.body.xml">
       
-        
+        
       
     
     
 
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   
     
       
-        
+        
       
     
   
   
     
-      new seed
+      new
+      seed
       powered by the
-        dispatcher
+      dispatcher
     
     
       
         Apache Forrest
-          Logo
+        Logo
         Apache
-          Forrest
+        Forrest
         
-          http://forrest.apache.org/
+        http://forrest.apache.org/
         
-          images/project-logo.gif
+        images/project-logo.gif
       
     
     
       
-        plugin logo
+        plugin
+        logo
         
-          org.apache.forrest.plugin.internal.dispatcher plugin for Apache
-          Forrest
+        org.apache.forrest.plugin.internal.dispatcher plugin for Apache
+        Forrest
         
-          http://forrest.apache.org/pluginDocs/
+        http://forrest.apache.org/pluginDocs/
         
-          images/project.png
+        images/project.png
       
     
-    
+    
   
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml Wed Dec  2 13:58:18 2009
@@ -15,13 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 ]>
-
-  &skinconf-common;
-
-  Plugin: dispatcher internal
-  org.apache.forrest.plugin.internal.dispatcher plugin for Apache Forrest
-
+&skinconf-common; 
+Plugin: dispatcher internal
+org.apache.forrest.plugin.internal.dispatcher plugin for
+Apache Forrest

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/RecursiveDirectoryTraversalAction.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/RecursiveDirectoryTraversalAction.java?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/RecursiveDirectoryTraversalAction.java (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/RecursiveDirectoryTraversalAction.java Wed Dec  2 13:58:18 2009
@@ -21,6 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -30,7 +31,7 @@
 import org.apache.cocoon.environment.Redirector;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
-import org.apache.forrest.dispatcher.DispatcherException;
+import org.apache.forrest.dispatcher.exception.DispatcherException;
 
 /**
  * Calculates which location to return for a given directory.
@@ -91,7 +92,7 @@
             org.apache.cocoon.environment.SourceResolver resolver,
             Map objectModel, String source, Parameters parameters)
             throws Exception {
-        this.prepare(parameters, source);
+        this.prepare(parameters);
         String uri = this.getProjectDir() + this.getRequest()
                 + this.getProjectExtension();
         map = new HashMap();
@@ -112,7 +113,7 @@
         }
 
         try {
-            this.computeResponseURI(uri, src);
+            this.computeResponseURI(uri,src);
             //src = resolver.resolveURI(uri);
             if (this.map.containsKey("uri")) {
                 return this.map;
@@ -135,23 +136,23 @@
      *            *viewSelector* project-xdocs will return which view is
      *            responsible for the requested path. If no view
      *            (choice|fallback) could be found the template will return the
-     *            viewFallback (resources/views/default.fv).
+     *            viewFallback (resources/views/default.structurer.xml).
      * 
-     * ex.: 1.request: index First choice: index.fv First/last fallback:
-     * default.fv
+     * ex.: 1.request: index First choice: index.structurer.xml First/last fallback:
+     * default.structurer.xml
      * 
-     * 2.request: sample/index First choice: sample/index.fv First fallback:
-     * sample/default.fv Last fallback: default.fv
+     * 2.request: sample/index First choice: sample/index.structurer.xml First fallback:
+     * sample/default.structurer.xml Last fallback: default.structurer.xml
      * 
-     * 3.request: sample/subdir/index First choice: sample/subdir/index.fv First
-     * fallback: sample/subdir/default.fv Second fallback: sample/default.fv
-     * Last fallback: default.fv
+     * 3.request: sample/subdir/index First choice: sample/subdir/index.structurer.xml First
+     * fallback: sample/subdir/default.structurer.xml Second fallback: sample/default.structurer.xml
+     * Last fallback: default.structurer.xml
      * 
      * ...
      * 
      * des.: The parent view (root-view) inherits to its children until a child
      * is overriding this view. This override can be used for directories
-     * (default.fv) and/or files (*.fv). That means that the root view is the
+     * (default.structurer.xml) and/or files (*.structurer.xml). That means that the root view is the
      * default view as long no other view can be found in the requested child.
      * @throws DispatcherException 
      *  
@@ -195,13 +196,11 @@
        resolver.release(source);
      }
     }
-    public void prepare(Parameters parameters, String src) {
-        this.setRequest(parameters.getParameter("request", src));
-        this.setProjectFallback(parameters.getParameter("projectFallback",
-                src));
-        this.setProjectExtension(parameters.getParameter("projectExtension",
-                src));
-        this.setProjectDir(parameters.getParameter("projectDir", src));
+    private void prepare(Parameters parameters) throws ParameterException {
+        this.setRequest(parameters.getParameter("request"));
+        this.setProjectFallback(parameters.getParameter("projectFallback"));
+        this.setProjectExtension(parameters.getParameter("projectExtension"));
+        this.setProjectDir(parameters.getParameter("projectDir"));
         this.setRest(this.getRequest());
     }
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/ResourceTypeAction.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/ResourceTypeAction.java?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/ResourceTypeAction.java (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/acting/ResourceTypeAction.java Wed Dec  2 13:58:18 2009
@@ -36,11 +36,16 @@
 *     <location src="{uri}" />

  * </act>
  */
+import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -49,10 +54,13 @@
 import org.apache.cocoon.acting.ServiceableAction;
 import org.apache.cocoon.environment.Redirector;
 import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceNotFoundException;
 import org.apache.excalibur.source.SourceResolver;
-import org.apache.forrest.dispatcher.DispatcherException;
+import org.apache.forrest.dispatcher.exception.DispatcherException;
+import org.apache.xml.resolver.tools.CatalogResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 
 public class ResourceTypeAction extends ServiceableAction
@@ -123,7 +131,7 @@
         try {
           src = resolver.resolveURI(uri);
           if (src.exists()) {
-            Document rawData =  org.apache.forrest.dispatcher.util.SourceUtil.readDOM(
+            Document rawData =  readDOM(
                     uri, resolver);
             NodeList type = rawData.getElementsByTagNameNS(getResourceTypeElementNS(),getResourceTypeElement());
             String typeString = type.item(0).getFirstChild().getNodeValue();
@@ -242,5 +250,51 @@
     public void setResourceTypeElementNS(String resourceTypeElementNS) {
         this.resourceTypeElementNS = resourceTypeElementNS;
     }
-
+    /**
+     * Reads a DOM from a source.
+     * @param sourceUri The source URI.
+     * @param manager The service manager.
+     * @return A document or null if the source does not exist.
+     * @throws ServiceException if an error occurs.
+     * @throws SourceNotFoundException if an error occurs.
+     * @throws ParserConfigurationException if an error occurs.
+     * @throws SAXException if an error occurs.
+     * @throws IOException if an error occurs.
+     */
+    public static Document readDOM(String sourceUri, SourceResolver resolver)
+            throws ServiceException, SourceNotFoundException, ParserConfigurationException,
+            SAXException, IOException {
+        Source source = null;
+        Document document = null;
+        try {
+            source = resolver.resolveURI(sourceUri);
+            if (source.exists()) {
+                document = readDocument(source.getInputStream());
+            }
+        } finally {
+                if (source != null) {
+                    resolver.release(source);
+                }
+        }
+        return document;
+    }
+    public static Document readDocument(InputStream stream) throws ParserConfigurationException,
+    SAXException, IOException {
+DocumentBuilder builder = createBuilder();
+return builder.parse(stream);
+}
+    /**
+     * Creates a non-validating and namespace-aware DocumentBuilder.
+     * @return A new DocumentBuilder object.
+     * @throws ParserConfigurationException if an error occurs
+     */
+    public static DocumentBuilder createBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        DocumentBuilder builder = factory.newDocumentBuilder();
+
+        CatalogResolver cr = new CatalogResolver();
+        builder.setEntityResolver(cr);
+        return builder;
+    }
 }







svn commit: r886081 - /forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js
2009-12-02T09:17:49Z

Author: gmcdonald
Date: Wed Dec  2 09:17:49 2009
New Revision: 886081

URL: http://svn.apache.org/viewvc?rev=886081&view=rev
Log:
Change from smart query to standard query, fix for FOR-1183

Modified:
    forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js

Modified: forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js?rev=886081&r1=886080&r2=886081&view=diff
==============================================================================
--- forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js (original)
+++ forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js Wed Dec  2 09:17:49
2009
@@ -99,7 +99,7 @@
 function searchIssue(searchID)
 {
   var searchItem = document.getElementById(searchID);
-  navigate('http://issues.apache.org/jira/secure/QuickSearch.jspa?pid=12310000&searchString='
+ searchItem.value);
+  navigate('http://issues.apache.org/jira/secure/IssueNavigator.jspa?query=' + searchItem.value
+ '&summary=true&description=true&reset=true&body=true&pid=12310000');
 }
 
 function searchSite(searchID)







svn commit: r883944 - /forrest/trunk/site-author/content/xdocs/tasks.xml
2009-11-25T01:02:24Z

Author: crossley
Date: Wed Nov 25 01:02:24 2009
New Revision: 883944

URL: http://svn.apache.org/viewvc?rev=883944&view=rev
Log:
Link to our automated RAT reports at Gump and Buildbot.

Modified:
    forrest/trunk/site-author/content/xdocs/tasks.xml

Modified: forrest/trunk/site-author/content/xdocs/tasks.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/tasks.xml?rev=883944&r1=883943&r2=883944&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/tasks.xml (original)
+++ forrest/trunk/site-author/content/xdocs/tasks.xml Wed Nov 25 01:02:24 2009
@@ -226,6 +226,12 @@
           $FORREST_HOME/etc/relicense-avoid.txt files.
         
         
+          RAT is automatically run on our sources. See the reports via
+          Gump and
+          Buildbot.
+          We are not being notified about errors, so need to look.
+        
+        
           Regularly ensure that there are appropriate matching licenses to
           accompany each supporting product that we redistribute.
           (Use the filename pattern: product-version[.-]license.txt or uppercase.)







svn commit: r882421 - /forrest/trunk/site-author/status.xml
2009-11-20T05:47:48Z

Author: crossley
Date: Fri Nov 20 05:47:47 2009
New Revision: 882421

URL: http://svn.apache.org/viewvc?rev=882421&view=rev
Log:
Mention the locationmap cache improvements.

Modified:
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=882421&r1=882420&r2=882421&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Fri Nov 20 05:47:47 2009
@@ -153,6 +153,13 @@
         Added document to facilitate
         upgrading to v0.9
       
+
+      
+        Replaced the custom caching implementation with EHCache in the
+        LocationMap feature. Given how integral the LM has become, this gives
+        us much better overall performance, concurrent behavior, and cache
+        configuration options.
+      
 
       
         Added initial output plugin "iCal" to the whiteboard.







svn commit: r882420 - /forrest/trunk/site-author/status.xml
2009-11-20T05:46:36Z

Author: crossley
Date: Fri Nov 20 05:46:35 2009
New Revision: 882420

URL: http://svn.apache.org/viewvc?rev=882420&view=rev
Log:
Whitespace only. Zap the tabs, remove trailing spaces.

Modified:
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=882420&r1=882419&r2=882420&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Fri Nov 20 05:46:35 2009
@@ -194,8 +194,8 @@
 
      
-        There was a problem with plugins libs not being copied. Using 
-        the war task from ant fixes this issue.   
+        There was a problem with plugins libs not being copied. Using
+        the war task from ant fixes this issue.
       
 
       
@@ -233,9 +233,9 @@
         See upgrading notes.
       
       
-        Promoting the output.inputModule plugin to core. Main reason for the move is to 
-        prevent plugins dependencies since the code has attracted different use cases 
-        solved in plugins to move it into core. 
+        Promoting the output.inputModule plugin to core. Main reason for the move is to
+        prevent plugins dependencies since the code has attracted different use cases
+        solved in plugins to move it into core.
       
 
       
@@ -292,10 +292,10 @@
 
 
       
-	Added method to make URLs absolute in PDF via skinconf.xml.
+        Added method to make URLs absolute in PDF via skinconf.xml.
       
       
-	Added method to disable table of contents in PDF via skinconf.xml.
+        Added method to disable table of contents in PDF via skinconf.xml.
       
       
         Enhance the "HowTo Generate an ASF mirrors page" doc to better explain.
@@ -399,7 +399,7 @@
               generated.
       
       
-        Rename webapp build target to run-webapp to distinguish the resulting 
+        Rename webapp build target to run-webapp to distinguish the resulting
         webapp from one suitable for deployment (use the war target for that)
         and provide a new xconf that is used in the war to ensure plugins can be found in war files
       
@@ -457,8 +457,8 @@
         Applying patches from Mathieu Champlon. Thanks Mathieu for your contribution.
         
 
-       Updated the 
-        cocoon.xconf and declared the core components that are needed 
+       Updated the
+        cocoon.xconf and declared the core components that are needed
         for flow. This makes it possible to use flow in forrest.
 
       
@@ -479,7 +479,7 @@
         Inspired by comments from Torsten Stolpmann.
       
       
-        Enhance the explanation of integrating 
+        Enhance the explanation of integrating
         DocBook sources to also explain
         how to use Content Aware Pipelines (SourceTypeAction).
       
@@ -489,12 +489,12 @@
         Use 'wget' or Ant to retrieve individual files.
       
       
-        Review and enhance the 
+        Review and enhance the
         Release doc.
       
       
         Added doc to explain
-        Skins and Dispatcher status. 
+        Skins and Dispatcher status.
       
       
         Updated to Apache-Ant-1.6.5 release, jsch-0.1.28, apache-jakarta-commons-net-1.4.1
@@ -606,7 +606,7 @@
       
 
       
-        Update the Forrest plugin for the XMLmind XML Editor at 
+        Update the Forrest plugin for the XMLmind XML Editor at
         tools/xxe
       
       
@@ -618,7 +618,7 @@
         to not show the copyright notice in html page footer.
       
       
-        Add FAQ about 
+        Add FAQ about
         Enabling Cocoon Checksum.
       
       
@@ -655,8 +655,8 @@
       
         Add notes about how to use the Issue Tracker.
       
-       Added lenya.zone 
-        site to the dispatcher section in the live sites. 
+       Added lenya.zone
+        site to the dispatcher section in the live sites.
       
       
         New skinconf parameter "disable-copyright-footer" (default=false)
@@ -723,7 +723,7 @@
             in the extra-css-section of skinconfig.
         
       
-            Fixed problems with disappearing of id-attributes in img-element and several others.    
+            Fixed problems with disappearing of id-attributes in img-element and several others.
         
       
         Add section about using new/experimental features (e.g. Locationmap, Dispatcher) together with plugins.
@@ -741,27 +741,27 @@
         and the Cocoon logs).
         Doing 'forrest clean' will remove both sections.
       
-       Added 
-        LocationmapSourceFactory.java. With this it is possible to request 
-        locationmap source via lm://my-location which makes it easier to use it 
-        without contacting a input module in java and any other files.  Added
+        LocationmapSourceFactory.java. With this it is possible to request
+        locationmap source via lm://my-location which makes it easier to use it
+        without contacting a input module in java and any other files. Diff
       
-       Added variable.helper.xsl 
-        to the core, should be enhanced by matching the 
-        default.forrest.properties.xml. This xsl will produce all variables we 
-        use in skins to the new property system. Moved pathutils.xsl to the 
-        core from the skins.  Added variable.helper.xsl
+        to the core, should be enhanced by matching the
+        default.forrest.properties.xml. This xsl will produce all variables we
+        use in skins to the new property system. Moved pathutils.xsl to the
+        core from the skins. Diff
       
       
         Added initial whiteboard internal plugin "NoteTaking".
         Adds a form to a page that can be used to enter notes relating to the page.
       
-       Added helper 
-        stylesheets to locationmap and core stylesheets. generateId.xsl (will 
-        generate a unique id) and replaceCharsInString.xsl (will find and 
-        replace character in a string)  Added helper
+        stylesheets to locationmap and core stylesheets. generateId.xsl (will
+        generate a unique id) and replaceCharsInString.xsl (will find and
+        replace character in a string) Diff
       
       
@@ -769,7 +769,7 @@
       
 
       
-       Finish renaming of files for a-to-b.xsl naming convention. 
+       Finish renaming of files for a-to-b.xsl naming convention.
       
       
         Add a Devs menu to tools/forrestbar to help with testing intermediate
@@ -785,7 +785,7 @@
         Updated tools/forrestbar to be compatible with recent versions of Firefox.
       
       
-        Describe the 
+        Describe the
         status messages
         that are issued by Cocoon CLI during processing of each doc.
       
@@ -796,12 +796,12 @@
       
       
-        Correctly handle w3c-xml-schema rules in 
+        Correctly handle w3c-xml-schema rules in
         SourceTypeAction.
       
       
         Reviewed all sitemaps to use locationmap references (lm:).
-        At the same time we changed filenames of core stylesheets to follow 
+        At the same time we changed filenames of core stylesheets to follow
         a filename convention (e.g. html2document.xsl => html-to-document.xsl)
         which enables automated locationmap matches.
         Thanks to the many people who were involved with addressing this issue.
@@ -829,22 +829,22 @@
         Upgrade our packaged Cocoon to cocoon-2.2.0-dev-r279987 and enhanced the notes
         about how to upgrade.
       
-      Added basic instructions to 
-        deploy and install the forrestbar from the source as readme.txtAdded basic instructions to
+        deploy and install the forrestbar from the source as readme.txtDiff
       
-      Removed 
-        the project.theme-dir property by adding it to the lm like suggest by 
-        Ross. Removed
+        the project.theme-dir property by adding it to the lm like suggest by
+        Ross. Diff
       
-       Changed the 'local 
-        forrest' caption to host:port format. Added localhost as option. added 
-        structurer xml view to devs.  Changed the 'local
+        forrest' caption to host:port format. Added localhost as option. added
+        structurer xml view to devs. Diff
       
-      Allowed as well 
-        localhost as local address for jetty for the forrestbar. Allowed as well
+        localhost as local address for jetty for the forrestbar. Diff
       
       
@@ -902,7 +902,7 @@
       
       
         Documenting some of the locationmap syntax and naming conventions
-        as comments/examples 
+        as comments/examples
         until it can be done more formally.
         See 'forrest seed-sample' and
         locationmap docs.
@@ -967,24 +967,24 @@
         This work was enabled via a "Google Summer of Code" project.
         See docs.
       
-       Added information about 
-        how to debug forrest java classes to the faq  Added information about
+        how to debug forrest java classes to the faq Diff
       
-       Added a shell script to 
-        do some steps of the cocoon update process. Still there are some steps 
-        that should rather be done by a script, rather than committer interaction. 
-        Updated the readme to state that some steps could be done by the 
-        script.  Added a shell script to
+        do some steps of the cocoon update process. Still there are some steps
+        that should rather be done by a script, rather than committer interaction.
+        Updated the readme to state that some steps could be done by the
+        script. Diff
       
-       Added new 
-        seed targets seed-basic and seed-sample. That closes FOR-253.  Added new
+        seed targets seed-basic and seed-sample. That closes FOR-253. Diff
       
-       Fixed sample 
-        sites from the seedTestBusiness FOR-670: forrest seedTestBusiness; 
-        forrest site fails resume dtd validation  Fixed sample
+        sites from the seedTestBusiness FOR-670: forrest seedTestBusiness;
+        forrest site fails resume dtd validation Diff
       
       
@@ -1023,10 +1023,10 @@
         See FAQ.
       
       
-        Plugins can now define their own *.xconf file to add configuration 
-        information to cocoon.xconf. Simply place your *.xconf file in 
-        PLUGIN_HOME/conf/*.xconf. Note that changes to this configuration 
-        file will not take effect until Forrest has been restarted.  
+        Plugins can now define their own *.xconf file to add configuration
+        information to cocoon.xconf. Simply place your *.xconf file in
+        PLUGIN_HOME/conf/*.xconf. Note that changes to this configuration
+        file will not take effect until Forrest has been restarted.
       
       
         New site seeding mechanism. You can now run "forrest seed" as before, or you can run
@@ -1038,17 +1038,17 @@
       
       
         Added support for Locationmaps. This enables content to be retrieved from a location
-        that is defined in a locationmap file. A project-based file can be located at 
+        that is defined in a locationmap file. A project-based file can be located at
         PROJECT_HOME/src/documentation/content/locationmap.xml while core locationmaps
         are at $FORREST_HOME/main/webapp/locationmap-*.xml files.
The
         advantage of this is that the URL seen by the user need bear no relation to the location
         of the source document, thus Forrest can separate the client URL space from the source
         document URL space. Thus, using the locationmap it is possible to pull together
         documents from many different locations into a single uniform site.

-        
+
         In addition, since the user URL space is now unconnected to the source URL space
         it is possible to move source documents without breaking any existing user links.

-        
+
         See locationmap docs for more information.
         Thanks to Unico Hommes for the original locationmap implementation which
         was added to Forrest long ago.
@@ -1091,7 +1091,7 @@
             in the extra-css-section of skinconfig.
         
       
-            Fixed problems with disappearing of id-attributes in img-element and several others.    
+            Fixed problems with disappearing of id-attributes in img-element and several others.
         
       
         Added new "clean" targets. Doing 'forrest clean-site' will remove
@@ -1116,7 +1116,7 @@
       
       
           Config check for the i8n attribute for i18n transformer
-	  so it is used only when necessary.
+          so it is used only when necessary.
        
       
         Added initial whiteboard input plugin "Daisy".
@@ -1182,7 +1182,7 @@
       
       
         Plugin docs are now upated automatically when a plugin is deployed.
-        Alternatively you can update the docs independantly by running the 
+        Alternatively you can update the docs independantly by running the
         deploy-docs target in the plugin directory.
       
       
       
-        Changed plugin template location to {forrest.plugins.dir}/pluginTemplate 
+        Changed plugin template location to {forrest.plugins.dir}/pluginTemplate
         in the build.xml of plugins/ and whiteboard/plugins/. That allows to create
         new plugins in the whiteboard/plugin/ directory.
       
@@ -1240,7 +1240,7 @@
         Enhanced the documentation of view/viewHelper.
       
       
-        Images group.svg and project.svg were rendered with the shadow effect slightly clipped. 
+        Images group.svg and project.svg were rendered with the shadow effect slightly clipped.
         Needed to add width and height to filter element.
       
       
@@ -1248,7 +1248,7 @@
         and removed the fbits plugin.
       
       
-        Added FAQ about "pageBreakBefore" and "pageBreakAfter" class int PDF 
+        Added FAQ about "pageBreakBefore" and "pageBreakAfter" class int PDF
         documents and describe how to enable the page break behaviour in HTML
         documents.
       
@@ -1258,7 +1258,7 @@
       
       
-      Added 
+      Added
       How to customize
       processing of html source
       
@@ -1305,7 +1305,7 @@
       
         Added WYSIWYG editor as a plugin (only works in dynamic webapps).
       
-      
         Added photoGallery plugin.
       
@@ -1318,12 +1318,12 @@
         can be cached.
       
       
-        Added testing facilities to plugins to facilitate integration testing. 
+        Added testing facilities to plugins to facilitate integration testing.
       
-       
+      
       Merge xdocs and raw files in the same directory src/document/content/xdocs
       
-      
       Added How-To Run Forrest from Maven.
       
@@ -1331,12 +1331,12 @@
       Added How-To Build a plugin.
       
       
-      Split plugin documentation between 
+      Split plugin documentation between
       user and
       developer topics.
       
       
-      LocaleAction changed its API. The "lang" value is "language" now. 
+      LocaleAction changed its API. The "lang" value is "language" now.
       
       
        Ignore directory links for aggregations.
@@ -1351,12 +1351,12 @@
       
       
-        Added 
-        How to modify the color of generated corner images. 
+        Added
+        How to modify the color of generated corner images.
       
       
         Added links to example websites to demonstrate each available
-        default skin. 
+        default skin.
       
       
         Changed Ant build property name "version" to "forrest.version"
@@ -1447,17 +1447,17 @@
       
         Allow forrest to run in a project directory with a space in the name.
       
-       
-        Fixed the domain bug of the searchbox in pelt.  
+      
+        Fixed the domain bug of the searchbox in pelt.
       
-       
-        Fixed the menu in pelt by adding getMenu.js and changing the site2xhtml.xsl. 
+      
+        Fixed the menu in pelt by adding getMenu.js and changing the site2xhtml.xsl.
         Now the chapter image will get expand again.
       
-       
+      
         getMenu.js - fixes a path issue and the double click behaviour of pelt.
       
-       
+      
         Explained the usage of the extra-css element in skinconf.xml of the fresh site.
       
       
@@ -1465,15 +1465,15 @@
         transformation. Source documents use the *.moinwiki filename extension.
       
       
-        Requesting linkmap.html Forrest now renders the site.xml 
+        Requesting linkmap.html Forrest now renders the site.xml
         file as a table of contents.
       
       
-        Now the *.ihtml and *.cwiki extensions are deprecated. 
-        To get the same functionality it is recommended to switch to 
-        *.html and *.jspwiki. With this it's now possible to have a 
-        site in simple html, edited with any html editor. 
-        The *.jspwiki extension was put to make it clear what the 
+        Now the *.ihtml and *.cwiki extensions are deprecated.
+        To get the same functionality it is recommended to switch to
+        *.html and *.jspwiki. With this it's now possible to have a
+        site in simple html, edited with any html editor.
+        The *.jspwiki extension was put to make it clear what the
         format is about.
       
       
@@ -1619,7 +1619,7 @@
         Replace URLs in all docs to be http://forrest.apache.org/
       
       
-        Add missing xdocs from the validate.exclude property. Allowing to exclude files. 
+        Add missing xdocs from the validate.exclude property. Allowing to exclude files.
       
       
         Improved resolving image references in PDFs.
@@ -1668,9 +1668,9 @@
         Repack Jetty without JSP support. Now we can remove org.apache.jasper.jar
       
       
-        Moved forrestbot2 from scratchpad into main.  Uses ant 1.6's 
+        Moved forrestbot2 from scratchpad into main.  Uses ant 1.6's
         'import' task instead of XSLT/ant.  Webapp completely
-        rewritten to use JSTL, Struts, Java utility classes, and 
+        rewritten to use JSTL, Struts, Java utility classes, and
         OpenSymphony's OSUser for flexible authentication.
       
       
@@ -1706,19 +1706,19 @@
         discussion.
       
       
-        Remove misleading error message. Reported a cocoon bug #28939 
+        Remove misleading error message. Reported a cocoon bug #28939
       
       
        Revert the changes to access skinconf using "skinconf//" done on r10259
       
       
-       Information about the new 
+       Information about the new
        forrest-user
        mail list.
       
       
         Jetty jar was mistakenly compiled for jdk 1.4
-        - now re-compiled for jdk 1.3 
+        - now re-compiled for jdk 1.3
       
       
         Forrest-targets with ant proxy is obsolete; use forrestbot now.
@@ -1777,14 +1777,14 @@
       
         Do not create ToC unless it has been defined on the skinconf.
         Change level attribute to max-depth attribute.
-        Add a min-sections attribute to define a minimun number of sections 
+        Add a min-sections attribute to define a minimun number of sections
         before create a toc.
       
       
         Add Language alternatives div. To test it:
         i18n-foo.html
       
-      
         Page size and orientation for pdf.
       
@@ -1798,7 +1798,7 @@
         Add i18n to single file content.
       
       
-       ToC element is optional on skinconf. 
+       ToC element is optional on skinconf.
       
       
         Updated Ant 1.6.1
@@ -1808,7 +1808,7 @@
       
       
         Putting a jettyconf.xml file in your document directory will override
-        the one supplied in the default Forrest context. Also no longer copies 
+        the one supplied in the default Forrest context. Also no longer copies
         jettyconf.xml to build dir (one more file closer to no copying ;-))
       
       
@@ -1846,7 +1846,7 @@
         while documents without DTD are just checked for well-formedness.
       
       
-        Added SkinconfTransformer, that augments the skinconf.xml 
+        Added SkinconfTransformer, that augments the skinconf.xml
         by adding these attributes to colors if not present:
         @highlight, @lowlight, @font, @link, @vlink, @hlink.
       
@@ -1868,11 +1868,11 @@
       
       
         Upgrade to cocoon 2.1.3
-	nekodtd 0.1.9
-	remove excalibur-concurrent-20020820.jar
-	remove excalibur-cli-1.0.jar
-	remove excalibur-datasource-vm12-20021121.jar
-	remove jakarta-oro-2.0.6.jar 
+        nekodtd 0.1.9
+        remove excalibur-concurrent-20020820.jar
+        remove excalibur-cli-1.0.jar
+        remove excalibur-datasource-vm12-20021121.jar
+        remove jakarta-oro-2.0.6.jar
       
       
         Add support for Openoffice Writer 1.1 files.
@@ -1901,7 +1901,7 @@
       
       
         Removed all validation includes and excludes from the fresh site,
-        except the most basic one. This means that the feature is to 
+        except the most basic one. This means that the feature is to
         be considered deprecated.
       
       
@@ -1909,8 +1909,8 @@
         forrest.css, added in the skins by default.
       
       
-        New section in skinconf about colors used by the site. 
-        Enabled for krysalis-site and tigris-style. 
+        New section in skinconf about colors used by the site.
+        Enabled for krysalis-site and tigris-style.
         If a needed color is not specified, the default one is used.
       
       
@@ -1928,10 +1928,10 @@
         can be disabled in skinconf.xml.
       
       
-        Added new 'tigris' skin, by using exactly the same 
+        Added new 'tigris' skin, by using exactly the same
         skin version 1.1. from the project Style at http://style.tigris.org/.
         This will completely replace the avalon-tigris skin in subsequent versions.
-        The avalon-tigris skin is to be considered deprecated and no longer 
+        The avalon-tigris skin is to be considered deprecated and no longer
         developed.
       
       
@@ -1964,7 +1964,7 @@
       
       
         Updated and separated in their directory all the resources
-        needed by Chaperon, and make the pipeline generate the 
+        needed by Chaperon, and make the pipeline generate the
         xml grammar versions if unavailable.
         This fixes some wiki rendering bugs and makes sections
         follow the correct level nesting.
@@ -1989,7 +1989,7 @@
         Updated Jetty to 4.2.14
       
       
-        Removed the deprecated Ant @tag@ substitution method for skins to 
+        Removed the deprecated Ant @tag@ substitution method for skins to
         reduce copying further.
       
       
@@ -1997,11 +1997,11 @@
       
       
          All resources in skins/common/images|scripts are used if the
-         corresponding resource is not found in the skin being used. 
-         Moved under these dirs the images and the scripts that were placed by 
-         default under resources/images or copied in each skin, and added a 
+         corresponding resource is not found in the skin being used.
+         Moved under these dirs the images and the scripts that were placed by
+         default under resources/images or copied in each skin, and added a
          temporary sitemap rule to route the request of the images to the new
-         location. 
+         location.
       
       
           Moved the images of fresh-site to the src/content/xdocs directory,
@@ -2025,11 +2025,11 @@
            property.
       
       
-          Major update to inner working of the krysalis-site skin: 
+          Major update to inner working of the krysalis-site skin:
           - removed all use of the spacer.gif image
           - replaced all visual enhancement icons with css icons
           - fixed CSS and html validation
-          - reduced final output size, 
+          - reduced final output size,
           - removed all font tag usage in favor of css
           - added aural (speech) style in css
           - reduced usage of nested tables
@@ -2040,28 +2040,28 @@
           - made location of minitoc configurable as "page", "menu", or "both"
       
       
-          Removed duplicated copying of files during the creation of the 
+          Removed duplicated copying of files during the creation of the
           distro. Now the command-line context dir is like the webapp context dir.
           This reduces Forrest build time from 53 to 19 seconds on my system.
       
       
-          Fixed bug in the autodownload support for skins that was preventing 
+          Fixed bug in the autodownload support for skins that was preventing
           custom skins in the project source dir from working.
       
       
           Added support for docbook version 4.1.2. Allows importing files
-	  from various editors (Open office, Abiword).
+          from various editors (Open office, Abiword).
       
       
-          Added default translation for menu on fresh-site so it is used 
-	  when the user locale can not be found.
+          Added default translation for menu on fresh-site so it is used
+          when the user locale can not be found.
           Synchronized some I18n labels after a modification on fresh-site.
       
       
           Patch facility to be used by any contributor (From Ant's project).
-	  To use it run "build.[sh|bat] patch".
+          To use it run "build.[sh|bat] patch".
       
       
@@ -2069,7 +2069,7 @@
       
       
-          Patched directory2book.xsl to be able to serve raw documents from the 
+          Patched directory2book.xsl to be able to serve raw documents from the
           side menu (e.g. pdf); previously it always generated .html links.
       
       
@@ -2079,8 +2079,8 @@
       
         Added creation of TOC support on PDF files.
-	Improved so it uses value from skinconfig.xml.
-	Improve algoritm to define font size for section/subsection/...
+        Improved so it uses value from skinconfig.xml.
+        Improve algoritm to define font size for section/subsection/...
       
       
        First I18n integration for menus in forrest.
@@ -2093,15 +2093,15 @@
       
         The 'validate-site' build target will validate the intermediate xdocs.
       
-      
         Integrate Lucene on Forrest. Check the bug report for more info.
       
       
         Added XSP support.
-	For old sitemap.xmap add this tag:
-	<map:generator name="serverpages" 
-	src="org.apache.cocoon.generation.ServerPagesGenerator"/>
+        For old sitemap.xmap add this tag:
+        <map:generator name="serverpages"
+        src="org.apache.cocoon.generation.ServerPagesGenerator"/>
       
     
     
@@ -2179,7 +2179,7 @@
          Support for version, type and notice on html format.
       
       
-        Style information on the common skin. 
+        Style information on the common skin.
       
       
@@ -2187,7 +2187,7 @@
       
       
         On fresh-site:
-        Synchronize size for group and project logo. 
+        Synchronize size for group and project logo.
         Added description on site.xml elements so it displays tooltip.
       
       
@@ -2268,7 +2268,7 @@
       
       
-         Added a text2document.xsl stylesheet. Convert to unix format so it stop  
+         Added a text2document.xsl stylesheet. Convert to unix format so it stop
          EOL character. Simplify so it does not use chaperon format.
          format.
        
@@ -2289,8 +2289,8 @@
         Add a flag for email obfuscation, and turn it off by default.
       
       
-        Fixed bug that showed the krysalis-site skin in IE browsers from 
-        a remote site to start with a font size of 100. 
+        Fixed bug that showed the krysalis-site skin in IE browsers from
+        a remote site to start with a font size of 100.
         Also made the font size script kick in at the start of the
         page rendering, as before it resized only after all the page
         was loaded, which was not nice to say the least.
@@ -2320,7 +2320,7 @@
         (*.xmap, skinconf.xml, xdocs, images, stylesheets, DTDs).
       
       
-        Add a @indexfile attribute to tabs.xml, so that the user can specify 
+        Add a @indexfile attribute to tabs.xml, so that the user can specify
         which file the tab links to.
       
       
@@ -2406,7 +2406,7 @@
       
        On krysalis skin: users can select font size, reworked left-bar inclusion
        of page section titles, made them only one level deep, moved buttons after
-       the left navbar, added publish date on top right navbar. 
+       the left navbar, added publish date on top right navbar.
        For both Forrest and krysalis skins, added single background pixel line below
        unselected tabs and made selected tab more prominent.
       
@@ -2432,7 +2432,7 @@
         Docbook stylesheet improvements.
       
       
-        Forrestbar is now 
+        Forrestbar is now
         Phoenix compatible.
       
       
@@ -2455,7 +2455,7 @@
         the xinclude,  linkrewriter, and idgen steps.
       
       
-        Added XInclude capability  to the documents. Remember to 
+        Added XInclude capability  to the documents. Remember to
         disable validations for files with xincludes as the xinclude is not
         performed during validation.
       
@@ -2493,14 +2493,14 @@
       
       
-        The problem with starting a new forked JVM is that all 
+        The problem with starting a new forked JVM is that all
         properties get lost.  This makes it able to use one forrest.properties
-        for all multiple projects, and just create the docs from there. 
+        for all multiple projects, and just create the docs from there.
       
       
         The menu is now limited to only pages in the current subdirectory and
-        below. 
+        below.
       
       
@@ -2565,17 +2565,17 @@
         On avalon-tigris skin it's now possible to add a mysite.css file
         to customize the style. An example that can be used is from
         chaperon.sf.net.
-        Also added a rounded corner to paragraphs, and many minor fixes. 
+        Also added a rounded corner to paragraphs, and many minor fixes.
       
       
-        Fixed the annoying link highlighting on the krysalis skin 
+        Fixed the annoying link highlighting on the krysalis skin
         due to the border. Removed the border, now it highlights fine.
       
       
         Added <acronym> tag.
       
       
-        Added a means to override the check for existing content: 
+        Added a means to override the check for existing content:
         forrest seed -Dskip.contentcheck=yes
         Thanks to Tom Klaasen.
       
@@ -2641,13 +2641,13 @@
       
         Now files present in the content dir are correctly linked and
         copied verbatim by the CLI. The wellknown files are given with the
-        correct mime-type, and links in html and xml are followed. 
+        correct mime-type, and links in html and xml are followed.
       
       
         Update to 2002-12-26 Cocoon.
       
       
-        Tweaked forrestbar, added a sub-project menu for Jakarta, fixed 
+        Tweaked forrestbar, added a sub-project menu for Jakarta, fixed
         download link and added submenu for tools and gump.
       
       
@@ -2675,7 +2675,7 @@
       
       
         Updated avalon-tigris skin by merging what was in CVS here and
-        what was used in Avalon with its Cocoon-generated site.  
+        what was used in Avalon with its Cocoon-generated site.
         The visual effect is the same to the current framework and Exalibur
         Avalon sites.
       
@@ -2753,7 +2753,7 @@
       
     
     
-      SourceAction or the so-called 
+      SourceAction or the so-called
         'content aware pipelines' enables conditional processing of XML
         documents based on their grammar, being indicated by their DTD,
         XML Schema PI, root element, or a processing instruction (PI)
@@ -2765,9 +2765,9 @@
       
 
       
         Validate project sitemaps and choice of skin
@@ -2809,7 +2809,7 @@
         Put the internal matches in a separate pipeline with internal-only="true".
       
       
-        Now site builds do not delete files in build/site that are included in the 
+        Now site builds do not delete files in build/site that are included in the
         Ant list of default excludes, like CVS info.
       
       
@@ -2920,7 +2920,7 @@
       
         Made forrest-site skin fully generic, usable with any project. Skins are
         configured through an external 'skinconf.xml' file, specified by the
-        project. 
+        project.
       
       
         Fixed bug where multiple copies of the same image where generated, one for
@@ -2952,7 +2952,7 @@
       
       
         Updated Cocoon to 2.1-dev to use xsltc and new CLI status messages.
-        Logs are in the build/work/WEB-INF/logs directory and the 
+        Logs are in the build/work/WEB-INF/logs directory and the
         list of broken links is in the build directory.
       
       
@@ -3053,7 +3053,7 @@
         - Site metadata (what currently lives in skinconf.xml + gump.xml
          stuff)
         - Perhaps site.xml metadata for pages?
-        
+
         This info can then be made public to the sitemap (via XMLFileModule
         attributes) and the stylesheets (through
         document(cocoon:/...) calls or inlined with source XML).
@@ -3128,7 +3128,7 @@
         
       
           Migrate to a decent schema language, primarily so that we can use
-          namespaces in XML docs, allowing things like XInclude, 
+          namespaces in XML docs, allowing things like XInclude,
           in-line metadata,
           in-line SVG, Jelly snippets, or anything else users can make a
           Transformer for.
@@ -3163,14 +3163,14 @@
        ...
      
     
-    
+
     
      
        Make all DTD removals to necessarily need a version change.
        http://marc.theaimsgroup.com/?l=forrest-dev&m=103897161523879&w=2
        http://marc.theaimsgroup.com/?l=forrest-dev&m=103899964318989&w=2
        
-               
+         
          
        
      
@@ -3203,19 +3203,19 @@
           
             The deprecated way of using skinconf.xml values in the skins is
             removed, as we are moving to a build system that copies as little
-            files as possible. Since the new method does not involve copying, 
+            files as possible. Since the new method does not involve copying,
             since the old one did, and since it has been already deprecated for
             at least a release, it has been removed.
           
         
         
-          Use skinconf.xml with the document() function in the XSL. See the 
+          Use skinconf.xml with the document() function in the XSL. See the
           Forrest-provided skins for guidance.
         
       
       
         
-          Sites using the krysalis-site skin will not render the menu minitoc 
+          Sites using the krysalis-site skin will not render the menu minitoc
           by default.
         
         
@@ -3286,7 +3286,7 @@
 
       
         
-          The pdf link on the document pages now appears only if 
+          The pdf link on the document pages now appears only if
           explicitly stated in the skinconf.xml file.
         
         
@@ -3298,13 +3298,13 @@
           
         
         
-          To keep pdf links on each page, add a 'disable-pdf-link' 
-          in skinconf.xml set to false, as for other similar links 
+          To keep pdf links on each page, add a 'disable-pdf-link'
+          in skinconf.xml set to false, as for other similar links
           (consistent behaviour). To make the file validate, please use
-          the page DTD contained in the forrest distro in 
+          the page DTD contained in the forrest distro in
           ./src/resources/conf/skinconf.xml
         
-            
+      
     
   
   -->







svn commit: r882409 - /forrest/trunk/site-author/content/xdocs/zone.xml
2009-11-20T04:34:28Z

Author: crossley
Date: Fri Nov 20 04:34:25 2009
New Revision: 882409

URL: http://svn.apache.org/viewvc?rev=882409&view=rev
Log:
Follow the movement of the PMC zones descriptions doc.
Link to Nagios monitoring for helios.

Modified:
    forrest/trunk/site-author/content/xdocs/zone.xml

Modified: forrest/trunk/site-author/content/xdocs/zone.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/zone.xml?rev=882409&r1=882408&r2=882409&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/zone.xml (original)
+++ forrest/trunk/site-author/content/xdocs/zone.xml Fri Nov 20 04:34:25 2009
@@ -167,7 +167,7 @@
       
       
         As requested by that infra doc, keep our zone info up-to-date (see
-        https://svn.apache.org/repos/asf/infrastructure/trunk/docs/helios/zones.txt).
+        https://svn.apache.org/repos/infra/infrastructure/trunk/docs/machines/helios/zones.txt).
       
       
        We have minimally configured our zone. See some other projects' config ideas, e.g.
@@ -181,6 +181,10 @@
         zones machine.
       
       
+        Keep an eye on the status of 'helios' via the
+        monitoring service.
+      
+      
         Occasionally the "SSL server certificate" will change for svn.apache.org
         server. Monitor the infrastructure and committers mail lists, and see
         infra







svn commit: r882398 - /forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java
2009-11-20T03:25:16Z

Author: twilliams
Date: Fri Nov 20 03:25:14 2009
New Revision: 882398

URL: http://svn.apache.org/viewvc?rev=882398&view=rev
Log:
Fix for FOR-993 add warn message instead of dumping the scary stacktrace.

Modified:
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java?rev=882398&r1=882397&r2=882398&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java Fri Nov 20 03:25:14
2009
@@ -28,6 +28,7 @@
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
 import org.apache.cocoon.sitemap.PatternException;
+import org.apache.excalibur.source.SourceNotFoundException;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.excalibur.source.Source;
@@ -89,7 +90,12 @@
                         m_srcVal = source.getValidity();
                         m_lm = new LocationMap(m_manager);
                         m_lm.enableLogging(getLogger());
-                        m_lm.build(loadConfiguration(source));
+                        try {
+                        	Configuration c = loadConfiguration(source);
+                        	m_lm.build(c);
+                        } catch(ConfigurationException e) {
+                        	getLogger().warn("Failed to mount locationmap at: " + m_src);
+                        }
                     }
                 }
             }
@@ -105,7 +111,12 @@
                             m_lm.dispose();
                             m_lm = new LocationMap(m_manager);
                             m_lm.enableLogging(getLogger());
-                            m_lm.build(loadConfiguration(source));
+                            try {
+                            	Configuration c = loadConfiguration(source);
+                            	m_lm.build(c);
+                            } catch(ConfigurationException e) {
+                            	getLogger().warn("Failed to mount locationmap at: " + m_src);
+                            }
                         }
                     }
                 }







svn commit: r882031 - /forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
2009-11-19T02:28:49Z

Author: crossley
Date: Thu Nov 19 02:28:48 2009
New Revision: 882031

URL: http://svn.apache.org/viewvc?rev=882031&view=rev
Log:
Change "a" to "link" for valid internal xml.
Issue: part FOR-413

Modified:
    forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl

Modified: forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl?rev=882031&r1=882030&r2=882031&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl Thu Nov 19 02:28:48
2009
@@ -48,7 +48,7 @@
     
       
-        
+        

           
             
           
-  ___________________  
+  ___________________  
           
           


svn commit: r834789 - /forrest/trunk/site-author/content/xdocs/gump.xml
2009-11-11T07:20:31Z

Author: crossley
Date: Wed Nov 11 07:20:31 2009
New Revision: 834789

URL: http://svn.apache.org/viewvc?rev=834789&view=rev
Log:
Use Gump to run RAT over Forrest source files to assess license headers.
Issue: FOR-855

Modified:
    forrest/trunk/site-author/content/xdocs/gump.xml

Modified: forrest/trunk/site-author/content/xdocs/gump.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/gump.xml?rev=834789&r1=834788&r2=834789&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/gump.xml (original)
+++ forrest/trunk/site-author/content/xdocs/gump.xml Wed Nov 11 07:20:31 2009
@@ -57,6 +57,7 @@
       forrest
(disabled)
       forrest-test
(disabled)
       forrest-forrestbar
(active)
+      forrest-rat
(active)
     
   
 







svn commit: r834788 - /forrest/trunk/site-author/content/xdocs/gump.xml
2009-11-11T07:16:27Z

Author: crossley
Date: Wed Nov 11 07:16:27 2009
New Revision: 834788

URL: http://svn.apache.org/viewvc?rev=834788&view=rev
Log:
Add a note that the main Gump build is disabled.
Link to Gump Object Model documentation.
Mark "forrest" and "forrest-test" as "disabled".
Mark "forrest-forrestbar" as "active".

Modified:
    forrest/trunk/site-author/content/xdocs/gump.xml

Modified: forrest/trunk/site-author/content/xdocs/gump.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/gump.xml?rev=834788&r1=834787&r2=834788&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/gump.xml (original)
+++ forrest/trunk/site-author/content/xdocs/gump.xml Wed Nov 11 07:16:27 2009
@@ -26,19 +26,37 @@
       Cocoon and certain blocks) fail, then of course the build of Forrest will
       fail.
     
+    
+      The main build of Forrest by Gump is disabled. If Gump would build
+      Cocoon-2.1 branch or use built artefacts, then we could re-instate the
+      build. Some other parts of Forrest are still built, see below.
+    
     
       The
       Gump
       metadata descriptor for Forrest defines a number of different
-      projects. Notifications are sent to the forrest-dev mailing list.
+      projects.
+      All ASF committers have access. Do
+      'svn co https://svn.apache.org/repos/asf/gump/metadata gump-metadata'
+    
+    
+      See the Gump Object Model
+      documentation.
+    
+    
+       Notifications are sent to the forrest-dev mailing list.
+    
+    
+      The top-level module for Forrest is at
+      http://vmgump.apache.org/gump/public/forrest/
     
     
       The results ...
     
     
-      forrest
-      forrest-forrestbar
-      forrest-test
+      forrest
(disabled)
+      forrest-test
(disabled)
+      forrest-forrestbar
(active)
     
   
 







svn commit: r834783 - /forrest/trunk/site-author/content/xdocs/gump.xml
2009-11-11T06:55:21Z

Author: crossley
Date: Wed Nov 11 06:55:21 2009
New Revision: 834783

URL: http://svn.apache.org/viewvc?rev=834783&view=rev
Log:
The "forrestdoc" tool moved to the Maven project.
Issue: FOR-820

Modified:
    forrest/trunk/site-author/content/xdocs/gump.xml

Modified: forrest/trunk/site-author/content/xdocs/gump.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/gump.xml?rev=834783&r1=834782&r2=834783&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/gump.xml (original)
+++ forrest/trunk/site-author/content/xdocs/gump.xml Wed Nov 11 06:55:21 2009
@@ -39,8 +39,6 @@
       forrest
       forrest-forrestbar
       forrest-test
-      forrest-whiteboard-forrestdoc
-      forrest-whiteboard-forrestdoc-autotest
     
   
 







svn commit: r834781 - /forrest/trunk/main/build.xml
2009-11-11T06:41:44Z

Author: crossley
Date: Wed Nov 11 06:41:44 2009
New Revision: 834781

URL: http://svn.apache.org/viewvc?rev=834781&view=rev
Log:
Gump suggests that it does not need this classpath property.

Modified:
    forrest/trunk/main/build.xml

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=834781&r1=834780&r2=834781&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Wed Nov 11 06:41:44 2009
@@ -427,10 +427,8 @@
 
   
-
     
+        uri="antlib:org.apache.rat.anttasks"/>
     
       
         







svn commit: r834348 - /forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml
2009-11-10T05:07:53Z

Author: bdube
Date: Tue Nov 10 05:07:52 2009
New Revision: 834348

URL: http://svn.apache.org/viewvc?rev=834348&view=rev
Log:
Issue FOR-1181, due to Vicent Mas
Clarify documentation

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml?rev=834348&r1=834347&r2=834348&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml
Tue Nov 10 05:07:52 2009
@@ -53,6 +53,13 @@
         
             ]]>
             
+
+            
+              Note that the feedDescriptor file has not
+              xdoc format. A file named feedDescriptor.xml with
exactly the
+              above content should just work.
+            
+
             
               In order to embed the data from the planetApache feed
you
               create a link in the following form:
@@ -66,9 +73,9 @@
               want the feed to be delivered in (i.e. html, pdf etc.)
             
           
-            As RSS
-            As XDoc
-            As HTML
+            As RSS (no EXTENSION)
+            As XDoc (xml EXTENSION)
+            As HTML (html
EXTENSION)
           
         
       







svn commit: r834342 - /forrest/trunk/site-author/content/xdocs/live-sites.xml
2009-11-10T04:59:02Z

Author: bdube
Date: Tue Nov 10 04:59:02 2009
New Revision: 834342

URL: http://svn.apache.org/viewvc?rev=834342&view=rev
Log:
Issue FOR-1182
Due to Vicent Mas
Add example dispatcher site vitables.org

Modified:
    forrest/trunk/site-author/content/xdocs/live-sites.xml

Modified: forrest/trunk/site-author/content/xdocs/live-sites.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/live-sites.xml?rev=834342&r1=834341&r2=834342&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/live-sites.xml (original)
+++ forrest/trunk/site-author/content/xdocs/live-sites.xml Tue Nov 10 04:59:02 2009
@@ -191,6 +191,7 @@
         varietee™
adjustable golf practice platforms
         Simal - an RDF/XML
project registry framework.
         jrds - a cacti like
tools written in java
+        ViTables - a PyTables
and HDF5 browser written in Python
 
       
     







svn commit: r834321 - /forrest/trunk/main/webapp/WEB-INF/ehcache.xml
2009-11-10T03:24:55Z

Author: crossley
Date: Tue Nov 10 03:24:55 2009
New Revision: 834321

URL: http://svn.apache.org/viewvc?rev=834321&view=rev
Log:
Set svn property 'svn:eol-style'.
Please see http://www.apache.org/dev/version-control.html#https-svn-config

Modified:
    forrest/trunk/main/webapp/WEB-INF/ehcache.xml   (props changed)

Propchange: forrest/trunk/main/webapp/WEB-INF/ehcache.xml
------------------------------------------------------------------------------
    svn:eol-style = native







svn commit: r834295 - in /forrest/trunk/main: build.xml java/org/apache/forrest/locationmap/LocationMapModule.java webapp/WEB-INF/ webapp/WEB-INF/cocoon.xconf webapp/WEB-INF/ehcache.xml
2009-11-10T01:40:54Z

Author: twilliams
Date: Tue Nov 10 01:40:54 2009
New Revision: 834295

URL: http://svn.apache.org/viewvc?rev=834295&view=rev
Log:
Add cache config to get rid of failsafe warning.  Finishing up FOR-1031

Added:
    forrest/trunk/main/webapp/WEB-INF/ehcache.xml
Modified:
    forrest/trunk/main/build.xml
    forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java
    forrest/trunk/main/webapp/WEB-INF/   (props changed)
    forrest/trunk/main/webapp/WEB-INF/cocoon.xconf

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=834295&r1=834294&r2=834295&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Tue Nov 10 01:40:54 2009
@@ -456,8 +456,10 @@
 
 
   
-    
+    
+      
+      
+ 
       
         
           

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java?rev=834295&r1=834294&r2=834295&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java Tue Nov
10 01:40:54 2009
@@ -18,11 +18,12 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
 
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Element;
 import org.apache.forrest.locationmap.lm.LocationMap;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.configuration.Configurable;
@@ -60,22 +61,19 @@
  *  </locationmap>

  *  
  *  You can use the same actions and selectors like you can use 
- *  in any othe sitemap.
+ *  in any other sitemap.
  */
 public class LocationMapModule extends AbstractLogEnabled
     implements InputModule, Serviceable, Configurable, Disposable, ThreadSafe {
-
-    private static final Iterator ATTNAMES = Collections.EMPTY_LIST.iterator();
-
+    
     private ServiceManager m_manager;
     private SourceResolver m_resolver;
     private String m_src;
     private SourceValidity m_srcVal;
     private LocationMap m_lm;
-    private boolean m_cacheAll;
-    private int m_cacheTtl;
-    private Date m_cacheLastLoaded;
-    private Map m_locationsCache;
+    private boolean m_cacheAll; 
+    private Cache m_cache;
+    private CacheManager m_cacheManager;
 
     // ---------------------------------------------------- lifecycle
 
@@ -90,20 +88,23 @@
     public void configure(Configuration configuration) throws ConfigurationException {
         m_src = configuration.getChild("file").getAttribute("src");
         m_cacheAll = configuration.getChild("cacheable").getValueAsBoolean(true);
-        m_cacheTtl = configuration.getChild("cache-lifespan").getValueAsInteger();
+        Configuration oldCacheConf = configuration.getChild("cache-lifespan", false);
         
-        debug("LM Configured cache? " + m_cacheAll);
-        debug("LM Configured cache-lifespan: " + m_cacheTtl);
+        if(oldCacheConf != null) {
+          getLogger().warn("Locationmap cache configuration is deprecated through cocoon.xconf.
 " 
+        		 + "Please use ehcache.xml instead.");
+        }
         
-        if (m_cacheAll == true) {
-            m_locationsCache = new HashMap();
-            m_cacheLastLoaded = new Date();
+        if(m_cacheAll == true) {
+            m_cacheManager = new CacheManager();
+            m_cache = m_cacheManager.getCache("lm_Cache");
+            debug("LM caching enabled and configured.");
         }
     }
 
     public void dispose() {
         m_lm.dispose();
-        m_locationsCache = null;
+        m_cacheManager.shutdown();
     }
 
     private LocationMap getLocationMap() throws Exception {
@@ -146,7 +147,6 @@
                 m_resolver.release(source);
             }
         }
-        m_cacheLastLoaded = new Date();
         
         return m_lm;
     }
@@ -195,26 +195,14 @@
     	
         try {
         	if (this.m_cacheAll == true) {
-                  Date now = new Date();
-                  long cacheAge = now.getTime() - m_cacheLastLoaded.getTime();
-                  debug("LM Cache current age is: " + cacheAge + "ms");
-                 
-                  if (cacheAge > m_cacheTtl) {
-                    debug("LM Cache has expiring - contains " + m_locationsCache.size() +
" objects.");
-                    synchronized (this) {
-                      m_locationsCache.clear(); 
-                      debug("LM Cache has expired - now contains " + m_locationsCache.size()
+ " objects.");
-                  }
-                }
-                  
-        		hasBeenCached = m_locationsCache.containsKey(name);
-        		if (hasBeenCached == true && m_locationsCache.get(name)!=null) {
-        			result =  m_locationsCache.get(name);
+        		hasBeenCached = m_cache.isKeyInCache(name);
+        		if (hasBeenCached == true && m_cache.get(name)!=null) {
+        			result =  m_cache.get(name).getObjectValue();
         			if (getLogger().isDebugEnabled()) {
         				getLogger().debug("Locationmap cached location returned for hint: " + name +
" value: " + result);
         			}
-        		}else{
-                    result = getFreshResult(name, objectModel);
+        		} else{
+                            result = getFreshResult(name, objectModel);
                   }
         	}
         	
@@ -254,10 +242,12 @@
       result = getLocationMap().locate(name,objectModel);
       
       if (m_cacheAll == true) {
-      	m_locationsCache.put(name,result);
-      	if (getLogger().isDebugEnabled()) {
+          Element elem = new Element(name, result);
+          m_cache.put(elem);
+          
+          if (getLogger().isDebugEnabled()) {
       		getLogger().debug("Locationmap caching hint: " + name + " value: " + result);
-      	}
+          }
       }
       return result;
     }

Propchange: forrest/trunk/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 10 01:40:54 2009
@@ -0,0 +1 @@
+.cocoon.xconf.swp

Modified: forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/cocoon.xconf?rev=834295&r1=834294&r2=834295&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/cocoon.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/cocoon.xconf Tue Nov 10 01:40:54 2009
@@ -264,7 +264,6 @@
       logger="core.modules.mapper.lm" name="lm">
       
       true
-      100000
     
 
 

Added: forrest/trunk/main/webapp/WEB-INF/ehcache.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/ehcache.xml?rev=834295&view=auto
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/ehcache.xml (added)
+++ forrest/trunk/main/webapp/WEB-INF/ehcache.xml Tue Nov 10 01:40:54 2009
@@ -0,0 +1,79 @@
+
+
+
+
+    
+    
+
+    
+
+    
+   
+   
+







svn commit: r833969 - /forrest/trunk/main/build.xml
2009-11-09T04:19:42Z

Author: crossley
Date: Mon Nov  9 04:19:41 2009
New Revision: 833969

URL: http://svn.apache.org/viewvc?rev=833969&view=rev
Log:
Locate the Gump-built "rat-tasks" jar.

Modified:
    forrest/trunk/main/build.xml

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=833969&r1=833968&r2=833969&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Mon Nov  9 04:19:41 2009
@@ -427,8 +427,10 @@
 
   
+
     
+        uri="antlib:org.apache.rat.anttasks"
+        classpath="${rat-tasks.jar}"/>
     
       
         







svn commit: r832303 - /forrest/trunk/main/build.xml
2009-11-03T05:37:54Z

Author: crossley
Date: Tue Nov  3 05:37:54 2009
New Revision: 832303

URL: http://svn.apache.org/viewvc?rev=832303&view=rev
Log:
Add target "gump-rat" used by Gump to run RAT on Forrest sources, via its target "forrest-rat"
defined in our Gump project descriptor.

Modified:
    forrest/trunk/main/build.xml

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=832303&r1=832302&r2=832303&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Tue Nov  3 05:37:54 2009
@@ -424,6 +424,17 @@
   
     
   
+
+  
+    
+    
+      
+        
+      
+    
+  
 
 
 







svn commit: r831227 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs: Meeting_2009-10-21.jspwiki memos/Meeting_2009-10-21.jspwiki
2009-10-30T08:44:02Z

Author: sjur
Date: Fri Oct 30 08:44:01 2009
New Revision: 831227

URL: http://svn.apache.org/viewvc?rev=831227&view=rev
Log:
Converted files to ISO Latin 1, to avoid strange UTF-8 sequences in non-UTF-8 environments.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki?rev=831227&r1=831226&r2=831227&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki
Fri Oct 30 08:44:01 2009
@@ -7,12 +7,12 @@
 !!!Tasks
 
 !!Joe
-[iCal tasks|Tasks_2009-10-21_Joe.ics]Â  - click this link to download the
+[iCal tasks|Tasks_2009-10-21_Joe.ics]  - click this link to download the
 following tasks as iCal entries.
 * move default deadline into a property
 * extend the conventions for todo items to include an explicit deadline
 * allow more flexible naming conventions for the meeting documents and the
   related iCal file
 * this task also contains a URL
-  [iCal info|http://en.wikipedia.org/wiki/ICalendar]Â - it should be rendered
+  [iCal info|http://en.wikipedia.org/wiki/ICalendar] - it should be rendered
   properly in your iCal client

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki?rev=831227&r1=831226&r2=831227&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki
Fri Oct 30 08:44:01 2009
@@ -7,12 +7,12 @@
 !!!Tasks
 
 !!Joe
-[iCal tasks|Tasks_2009-10-21_Joe.ics]Â  - click this link to download the
+[iCal tasks|Tasks_2009-10-21_Joe.ics]  - click this link to download the
 following tasks as iCal entries.
 * move default deadline into a property
 * extend the conventions for todo items to include an explicit deadline
 * allow more flexible naming conventions for the meeting documents and the
   related iCal file
 * this task also contains a URL
-  [iCal info|http://en.wikipedia.org/wiki/ICalendar]Â - it should be rendered
+  [iCal info|http://en.wikipedia.org/wiki/ICalendar] - it should be rendered
   properly in your iCal client







svn commit: r831197 - /forrest/trunk/site-author/status.xml
2009-10-30T04:25:05Z

Author: crossley
Date: Fri Oct 30 04:25:05 2009
New Revision: 831197

URL: http://svn.apache.org/viewvc?rev=831197&view=rev
Log:
Add a note about initial "iCal" plugin contributed by Sjur.

Modified:
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=831197&r1=831196&r2=831197&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Fri Oct 30 04:25:05 2009
@@ -154,6 +154,9 @@
         upgrading to v0.9
       
 
+      
+        Added initial output plugin "iCal" to the whiteboard.
+      
       
         Enabled use of EXSLT extensions via exslt.org stylesheets.
         See example "EXSLT" in the 'forrest seed-sample' site.







svn commit: r831195 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project-logo.gif
2009-10-30T04:10:54Z

Author: crossley
Date: Fri Oct 30 04:10:54 2009
New Revision: 831195

URL: http://svn.apache.org/viewvc?rev=831195&view=rev
Log:
As this is a Forrest hosted plugin, add the standard project-logo.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project-logo.gif

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project-logo.gif
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project-logo.gif?rev=831195&r1=831194&r2=831195&view=diff
==============================================================================
Binary files - no diff available.







svn commit: r831191 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal: ./ resources/stylesheets/ src/documentation/classes/ src/documentation/content/xdocs/ src/documentation/content/xdocs/images/ src/documentation/content/xd...
2009-10-30T04:05:58Z

Author: crossley
Date: Fri Oct 30 04:05:58 2009
New Revision: 831191

URL: http://svn.apache.org/viewvc?rev=831191&view=rev
Log:
Set missing 'svn:eol-style native' property.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/forrest.properties
  (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/output.xmap   (props
changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/resources/stylesheets/document-to-ics.xsl
  (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/classes/CatalogManager.properties
  (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki
  (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/group.svg
  (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project.svg
  (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki
  (props changed)

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/forrest.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/output.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/resources/stylesheets/document-to-ics.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/classes/CatalogManager.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/Meeting_2009-10-21.jspwiki
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/group.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project.svg
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/memos/Meeting_2009-10-21.jspwiki
------------------------------------------------------------------------------
    svn:eol-style = native

svn@forrest.apache.org Archives

svn commit: r887796 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/xml/document-to-toc.xsl

svn commit: r887646 - /forrest/trunk/site-author/content/xdocs/docs_0_90/your-project.xml

svn commit: r887615 - in /forrest/trunk: main/fresh-site/ main/template-sites/basic/ main/template-sites/business/ whiteboard/plugins/ whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/

svn commit: r887433 - in /forrest/trunk/site-author: content/xdocs/docs_0_90/your-project.xml status.xml

svn commit: r887050 - in /forrest/trunk/main/webapp: ./ skins/coat/css/ skins/coat/xslt/fo/ skins/coat/xslt/html/ skins/forrest-site/xslt/fo/ skins/forrest-site/xslt/html/ skins/krysalis-site/css/ skins/krysalis-site/xslt/fo/ skins/krysalis-site/xslt/h...

svn commit: r886758 - /forrest/branches/dispatcher_rewrite/STATUS.txt

svn commit: r886753 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/

svn commit: r886750 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib: axiom-LICENSE.txt axiom-api-LICENSE.txt axiom-impl-LICENSE.txt geronimo-stax-api.license.txt geronimo-stax-api_1.0_spec.license.txt

svn commit: r886749 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src: cocoon-2.2-block/ cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/ cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/ ...

svn commit: r886734 - /forrest/trunk/main/fresh-site/forrest.properties.dispatcher.properties

svn commit: r886147 [6/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...

svn commit: r886147 [3/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...

svn commit: r886147 [4/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...

svn commit: r886147 [1/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...

svn commit: r886147 [2/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...

- + + + - - + + +

+

- +

- +

- +

- +

- +

- +

- +

svn commit: r886147 [5/6] - in /forrest/trunk/whiteboard: ./ FOR-1157/ cocoon-2.2-blocks/dispatcher/ dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/ plugins/org.apache.forrest.plugin.internal.dispatcher/lib/ plugins/org.apache.forres...

svn commit: r886081 - /forrest/trunk/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js

svn commit: r883944 - /forrest/trunk/site-author/content/xdocs/tasks.xml

svn commit: r882421 - /forrest/trunk/site-author/status.xml

svn commit: r882420 - /forrest/trunk/site-author/status.xml

svn commit: r882409 - /forrest/trunk/site-author/content/xdocs/zone.xml

svn commit: r882398 - /forrest/trunk/main/java/org/apache/forrest/locationmap/lm/MountNode.java

svn commit: r882031 - /forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl

svn commit: r834789 - /forrest/trunk/site-author/content/xdocs/gump.xml

svn commit: r834788 - /forrest/trunk/site-author/content/xdocs/gump.xml

svn commit: r834783 - /forrest/trunk/site-author/content/xdocs/gump.xml

svn commit: r834781 - /forrest/trunk/main/build.xml

svn commit: r834348 - /forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/src/documentation/content/xdocs/index.xml

svn commit: r834342 - /forrest/trunk/site-author/content/xdocs/live-sites.xml

svn commit: r834321 - /forrest/trunk/main/webapp/WEB-INF/ehcache.xml

svn commit: r834295 - in /forrest/trunk/main: build.xml java/org/apache/forrest/locationmap/LocationMapModule.java webapp/WEB-INF/ webapp/WEB-INF/cocoon.xconf webapp/WEB-INF/ehcache.xml

svn commit: r833969 - /forrest/trunk/main/build.xml

svn commit: r832303 - /forrest/trunk/main/build.xml

svn commit: r831227 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs: Meeting_2009-10-21.jspwiki memos/Meeting_2009-10-21.jspwiki

svn commit: r831197 - /forrest/trunk/site-author/status.xml

svn commit: r831195 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal/src/documentation/content/xdocs/images/project-logo.gif

svn commit: r831191 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.iCal: ./ resources/stylesheets/ src/documentation/classes/ src/documentation/content/xdocs/ src/documentation/content/xdocs/images/ src/documentation/content/xd...

- +
+
+

- -
+ + +